diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index 52a84094a8..1ede49a285 100644
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -22,7 +22,9 @@
 #ifndef FFMPEG_FFM_H
 #define FFMPEG_FFM_H
 
+#include <stdint.h>
 #include "avformat.h"
+#include "avio.h"
 
 /* The FFM file is made of blocks of fixed size */
 #define FFM_HEADER_SIZE 14
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 8249f7ddf9..4ae2b90ef3 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -25,6 +25,7 @@
 
 #include "libavutil/fifo.h"
 #include "avformat.h"
+#include "avio.h"
 #include "riff.h"    /* for CodecTag */
 
 /* should have a generic way to indicate probable size */