diff --git a/av_opts.c b/av_opts.c
index 2d708ebddc..452253b4de 100644
--- a/av_opts.c
+++ b/av_opts.c
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "av_opts.h"
 #include "libavcodec/opt.h"
 
 int parse_avopts(void *v, char *str){
diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c
index cb59878466..568b67fec0 100644
--- a/libmpdemux/mp3_hdr.c
+++ b/libmpdemux/mp3_hdr.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 
 #include "config.h"
+#include "mp3_hdr.h"
 #include "mp_msg.h"
 
 //----------------------- mp3 audio frame header parser -----------------------
diff --git a/mpcommon.c b/mpcommon.c
index c6a8559013..d07e4eb27c 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include "mpcommon.h"
 #include "options.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index 972049ac5f..6e066711d5 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -8,6 +8,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include "config.h"
+#include "timer.h"
 
 const char timer_name[] =
 #ifdef HAVE_NANOSLEEP
diff --git a/stream/cache2.c b/stream/cache2.c
index c90bf09e72..59d6e0aacb 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "cache2.h"
 #include "osdep/timer.h"
 #ifdef WIN32
 #include <windows.h>
diff --git a/vidix/drivers.c b/vidix/drivers.c
index 483428ff3b..d809e89332 100644
--- a/vidix/drivers.c
+++ b/vidix/drivers.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include "drivers.h"
 #include "config.h"
 #include "vidix.h"
 #include "libavutil/common.h"