diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 47c0e98a48..699c043996 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -29,6 +29,7 @@
 #include "avformat.h"
 /* For codec_get_bmp_id and codec_get_wav_id. */
 #include "avi.h"
+#include "intfloat_readwrite.h"
 
 /* EBML version supported */
 #define EBML_VERSION 1
diff --git a/libavutil/intfloat_readwrite.c b/libavutil/intfloat_readwrite.c
index d2a2ee490b..0d27cb8f39 100644
--- a/libavutil/intfloat_readwrite.c
+++ b/libavutil/intfloat_readwrite.c
@@ -24,6 +24,7 @@
  */
 
 #include "common.h"
+#include "intfloat_readwrite.h"
 
 double av_int2dbl(int64_t v){
     if(v+v > 0xFFELLU<<52)
diff --git a/vhook/watermark.c b/vhook/watermark.c
index e4a4685a14..f61f3a1242 100644
--- a/vhook/watermark.c
+++ b/vhook/watermark.c
@@ -46,6 +46,7 @@
 #include "avformat.h"
 
 #include "framehook.h"
+#include "cmdutils.h"
 
 typedef struct {
     char            filename[2000];