diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 53c7deba520f7e0db69cdb32bc299e6bee4782dd..046e4c676bf0475b35cfd36fa93bc543b9f6f82f 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -26,6 +26,7 @@
 #include "mathops.h"
 
 #include "mpegvideo.h"
+#include "h263.h"
 
 #undef NDEBUG
 #include <assert.h>
diff --git a/libavcodec/x86/idct_mmx_xvid.c b/libavcodec/x86/idct_mmx_xvid.c
index f955bd82214bf847672802d238212a15e960708b..466cf75bc447d1ca6bc986a57abdc6f9ad1bfca3 100644
--- a/libavcodec/x86/idct_mmx_xvid.c
+++ b/libavcodec/x86/idct_mmx_xvid.c
@@ -41,6 +41,7 @@
 
 #include <inttypes.h>
 #include "libavcodec/avcodec.h"
+#include "idct_xvid.h"
 
 //=============================================================================
 // Macros and other preprocessor constants
diff --git a/libavcodec/x86/snowdsp_mmx.c b/libavcodec/x86/snowdsp_mmx.c
index 0e1259ff64f0892eb1e72d52645ce4ef18e130e4..1e1d2e22d8be819225ace6eb7743849cc9c337ec 100644
--- a/libavcodec/x86/snowdsp_mmx.c
+++ b/libavcodec/x86/snowdsp_mmx.c
@@ -22,6 +22,7 @@
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/snow.h"
+#include "dsputil_mmx.h"
 
 void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
     const int w2= (width+1)>>1;
diff --git a/libavcodec/x86/vp3dsp_mmx.c b/libavcodec/x86/vp3dsp_mmx.c
index 27d4640217fe50a503f6b9fdcca3699fbf5fb4e7..fead8e8cefed96893688a37ad16c6f802cc8d702 100644
--- a/libavcodec/x86/vp3dsp_mmx.c
+++ b/libavcodec/x86/vp3dsp_mmx.c
@@ -26,6 +26,7 @@
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
+#include "vp3dsp_mmx.h"
 
 extern const uint16_t ff_vp3_idct_data[];
 
diff --git a/libavcodec/x86/vp3dsp_sse2.c b/libavcodec/x86/vp3dsp_sse2.c
index f3db6da56fe4c52a70d7641e09d9663ae1a532c9..3de3e472723dd9497cc9474718f279540437bf29 100644
--- a/libavcodec/x86/vp3dsp_sse2.c
+++ b/libavcodec/x86/vp3dsp_sse2.c
@@ -25,6 +25,7 @@
 
 #include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
+#include "vp3dsp_sse2.h"
 
 DECLARE_ALIGNED(16, const uint16_t, ff_vp3_idct_data)[7 * 8] =
 {
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 91c062beb4e538f2124155d7621df6c040c47474..e7a9a5e6fa3a10504a237e97bbed037f93e4093d 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libavformat/avformat.h"
+#include "avdevice.h"
 
 #define REGISTER_OUTDEV(X,x) { \
           extern AVOutputFormat x##_muxer; \
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2317fe77e5cd082db9a07dec755611e149966f18..080f4bddedbd351c900db6c75ac311be909508ca 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -24,6 +24,7 @@
 #include "metadata.h"
 #include "libavutil/avstring.h"
 #include "riff.h"
+#include "audiointerleave.h"
 #include <sys/time.h>
 #include <time.h>
 #include <strings.h>