diff --git a/cmdutils.h b/cmdutils.h
index 2cc2ee26c7..beba333236 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -23,6 +23,9 @@
 #define FFMPEG_CMDUTILS_H
 
 #include <inttypes.h>
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
 
 /**
  * program name, defined by the program for show_version().
diff --git a/libavcodec/aacpsy.h b/libavcodec/aacpsy.h
index f0142677ee..05c93cddeb 100644
--- a/libavcodec/aacpsy.h
+++ b/libavcodec/aacpsy.h
@@ -24,7 +24,7 @@
 
 #include "avcodec.h"
 #include "aac.h"
-#include "lowpass.h"
+//#include "lowpass.h"
 
 enum AACPsyModelType{
     AAC_PSY_TEST,              ///< a sample model to exercise encoder
diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h
index df96b40299..d7fd4b54f9 100644
--- a/libavcodec/ra288.h
+++ b/libavcodec/ra288.h
@@ -22,6 +22,8 @@
 #ifndef AVCODEC_RA288_H
 #define AVCODEC_RA288_H
 
+#include <stdint.h>
+
 static const float amptable[8]={
      0.515625,  0.90234375,  1.57910156,  2.76342773,
     -0.515625, -0.90234375, -1.57910156, -2.76342773
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 4397b53260..a96f365e34 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -21,6 +21,8 @@
 #ifndef AVFORMAT_INTERNAL_H
 #define AVFORMAT_INTERNAL_H
 
+#include <stdint.h>
+
 char *ff_data_to_hex(char *buf, const uint8_t *src, int size);
 
 #endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/rdt.h b/libavformat/rdt.h
index 9f5d1c9c51..aa6cbaac3c 100644
--- a/libavformat/rdt.h
+++ b/libavformat/rdt.h
@@ -22,6 +22,10 @@
 #ifndef AVFORMAT_RDT_H
 #define AVFORMAT_RDT_H
 
+#include <stdint.h>
+#include "avformat.h"
+#include "rtp.h"
+
 typedef struct RDTDemuxContext RDTDemuxContext;
 
 RDTDemuxContext *ff_rdt_parse_open(AVFormatContext *ic, AVStream *st,