diff --git a/libavcodec/aacsbrdata.h b/libavcodec/aacsbrdata.h
index f0bd26799d..c8afeee06c 100644
--- a/libavcodec/aacsbrdata.h
+++ b/libavcodec/aacsbrdata.h
@@ -29,6 +29,7 @@
 #define AVCODEC_AACSBRDATA_H
 
 #include <stdint.h>
+#include "libavutil/mem.h"
 
 ///< Huffman tables for SBR
 
diff --git a/libavcodec/binkdata.h b/libavcodec/binkdata.h
index 47b00d21f7..1ca34a6843 100644
--- a/libavcodec/binkdata.h
+++ b/libavcodec/binkdata.h
@@ -22,6 +22,8 @@
 #ifndef AVCODEC_BINKDATA_H
 #define AVCODEC_BINKDATA_H
 
+#include <stdint.h>
+
 /** Bink DCT and residue 8x8 block scan order */
 static const uint8_t bink_scan[64] = {
      0,  1,  8,  9,  2,  3, 10, 11,
diff --git a/libavcodec/flv.h b/libavcodec/flv.h
index e12b3b0268..eb10f22608 100644
--- a/libavcodec/flv.h
+++ b/libavcodec/flv.h
@@ -20,6 +20,10 @@
 #ifndef AVCODEC_FLV_H
 #define AVCODEC_FLV_H
 
+#include "mpegvideo.h"
+#include "get_bits.h"
+#include "put_bits.h"
+
 void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number);
 void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last);
 
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index ec6e617ae3..678588a171 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -20,6 +20,12 @@
 #ifndef AVCODEC_H263_H
 #define AVCODEC_H263_H
 
+#include <stdint.h>
+#include "libavutil/rational.h"
+#include "get_bits.h"
+#include "mpegvideo.h"
+#include "rl.h"
+
 // The defines below define the number of bits that are read at once for
 // reading vlc values. Changing these may improve speed and data cache needs
 // be aware though that decreasing them may need the number of stages that is
diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index 304ba2d1dd..d7690cc71b 100644
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -30,6 +30,8 @@
 #ifndef AVCODEC_LZW_H
 #define AVCODEC_LZW_H
 
+#include <stdint.h>
+
 struct PutBitContext;
 
 enum FF_LZW_MODES{
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index bf87626571..aab32364e5 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -23,6 +23,11 @@
 #ifndef AVCODEC_MPEG4VIDEO_H
 #define AVCODEC_MPEG4VIDEO_H
 
+#include <stdint.h>
+#include "get_bits.h"
+#include "mpegvideo.h"
+#include "rl.h"
+
 // shapes
 #define RECT_SHAPE       0
 #define BIN_SHAPE        1
diff --git a/libavcodec/synth_filter.h b/libavcodec/synth_filter.h
index bb5e47cd35..701394ca0a 100644
--- a/libavcodec/synth_filter.h
+++ b/libavcodec/synth_filter.h
@@ -21,7 +21,7 @@
 #ifndef AVCODEC_SYNTH_FILTER_H
 #define AVCODEC_SYNTH_FILTER_H
 
-#include "dsputil.h"
+#include "fft.h"
 
 void ff_synth_filter_float(FFTContext *imdct,
                            float *synth_buf_ptr, int *synth_buf_offset,
diff --git a/libavutil/x86/intreadwrite.h b/libavutil/x86/intreadwrite.h
index 4621f064d1..ff3e836c9a 100644
--- a/libavutil/x86/intreadwrite.h
+++ b/libavutil/x86/intreadwrite.h
@@ -23,6 +23,7 @@
 
 #include <stdint.h>
 #include "config.h"
+#include "libavutil/common.h"
 
 #if HAVE_MMX