diff --git a/common/mc.c b/common/mc.c
index 6f772afa2ec67187ea4c677bdee691a378b03ff6..314c6f962884ad17f949ba39eec9a9ddfeaee468 100644
--- a/common/mc.c
+++ b/common/mc.c
@@ -304,9 +304,9 @@ void x264_plane_copy_interleave_c( pixel *dst, int i_dst,
         }
 }
 
-void x264_plane_copy_deinterleave_c( pixel *dstu, int i_dstu,
-                                     pixel *dstv, int i_dstv,
-                                     pixel *src, int i_src, int w, int h )
+static void x264_plane_copy_deinterleave_c( pixel *dstu, int i_dstu,
+                                            pixel *dstv, int i_dstv,
+                                            pixel *src, int i_src, int w, int h )
 {
     for( int y=0; y<h; y++, dstu+=i_dstu, dstv+=i_dstv, src+=i_src )
         for( int x=0; x<w; x++ )
@@ -316,10 +316,10 @@ void x264_plane_copy_deinterleave_c( pixel *dstu, int i_dstu,
         }
 }
 
-void x264_plane_copy_deinterleave_rgb_c( pixel *dsta, int i_dsta,
-                                         pixel *dstb, int i_dstb,
-                                         pixel *dstc, int i_dstc,
-                                         pixel *src, int i_src, int pw, int w, int h )
+static void x264_plane_copy_deinterleave_rgb_c( pixel *dsta, int i_dsta,
+                                                pixel *dstb, int i_dstb,
+                                                pixel *dstc, int i_dstc,
+                                                pixel *src, int i_src, int pw, int w, int h )
 {
     for( int y=0; y<h; y++, dsta+=i_dsta, dstb+=i_dstb, dstc+=i_dstc, src+=i_src )
     {
diff --git a/common/rectangle.c b/common/rectangle.c
index 0a84a129f2c4820d564e035ad36d340b230ae75f..1c9aa2bbac931d96de528800a59aae197c8c1213 100644
--- a/common/rectangle.c
+++ b/common/rectangle.c
@@ -26,7 +26,7 @@
 #include "common.h"
 
 #define CACHE_FUNC(name,size,width,height)\
-void x264_macroblock_cache_##name##_##width##_##height( void *target, uint32_t val )\
+static void x264_macroblock_cache_##name##_##width##_##height( void *target, uint32_t val )\
 {\
     x264_macroblock_cache_rect( target, width*size, height, size, val );\
 }
diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 44c276d4636dc4d0b40af2ba77af046461b341e6..7e77accf9774ec8c0317b1c8a73a77f4ac9d359d 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -2385,7 +2385,7 @@ static float rate_estimate_qscale( x264_t *h )
     }
 }
 
-void x264_threads_normalize_predictors( x264_t *h )
+static void x264_threads_normalize_predictors( x264_t *h )
 {
     double totalsize = 0;
     for( int i = 0; i < h->param.i_threads; i++ )
diff --git a/encoder/slicetype.c b/encoder/slicetype.c
index b344e513c6ac93940fbb6270f563248ba52146a2..35f4b1ad17772f64ca4090aff3edc0fa3baa293b 100644
--- a/encoder/slicetype.c
+++ b/encoder/slicetype.c
@@ -283,7 +283,7 @@ static NOINLINE unsigned int x264_weight_cost_chroma444( x264_t *h, x264_frame_t
     return cost;
 }
 
-void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int b_lookahead )
+static void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int b_lookahead )
 {
     int i_delta_index = fenc->i_frame - ref->i_frame - 1;
     /* epsilon is chosen to require at least a numerator of 127 (with denominator = 128) */
diff --git a/x264.c b/x264.c
index 7e93809d2e888f87915cf8c29d050df9d7ba6057..50b71fa56571f862f72f4f74a35598ca872f5f30 100644
--- a/x264.c
+++ b/x264.c
@@ -53,6 +53,7 @@
 #endif
 
 #if HAVE_SWSCALE
+#undef DECLARE_ALIGNED
 #include <libswscale/swscale.h>
 #endif