diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h
index 8234f27739..7f8579d507 100644
--- a/libavcodec/arm/dsputil_arm.h
+++ b/libavcodec/arm/dsputil_arm.h
@@ -21,6 +21,9 @@
 #ifndef AVCODEC_ARM_DSPUTIL_H
 #define AVCODEC_ARM_DSPUTIL_H
 
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+
 void ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx);
diff --git a/libavcodec/arm/mpegvideo_arm.h b/libavcodec/arm/mpegvideo_arm.h
index 4874c86e0c..4cc25fdd36 100644
--- a/libavcodec/arm/mpegvideo_arm.h
+++ b/libavcodec/arm/mpegvideo_arm.h
@@ -19,6 +19,8 @@
 #ifndef AVCODEC_ARM_MPEGVIDEO_H
 #define AVCODEC_ARM_MPEGVIDEO_H
 
+#include "libavcodec/mpegvideo.h"
+
 void MPV_common_init_iwmmxt(MpegEncContext *s);
 void MPV_common_init_armv5te(MpegEncContext *s);
 
diff --git a/libavutil/arm/timer.h b/libavutil/arm/timer.h
index 0455d6af33..5e8bc8edd0 100644
--- a/libavutil/arm/timer.h
+++ b/libavutil/arm/timer.h
@@ -22,6 +22,7 @@
 #define AVUTIL_ARM_TIMER_H
 
 #include <stdint.h>
+#include "config.h"
 
 #if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)