12 files changed, 16 insertions, 10 deletions
diff --git a/libavformat/caf.c b/libavformat/caf.c
index a814ab0d3c..96fb8474d2 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -25,7 +25,7 @@
  */
 
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 #include "caf.h"
 
 /**
diff --git a/libavformat/caf.h b/libavformat/caf.h
index e1f93a6b31..9c25f2c683 100644
--- a/libavformat/caf.h
+++ b/libavformat/caf.h
@@ -27,7 +27,7 @@
 #ifndef AVFORMAT_CAF_H
 #define AVFORMAT_CAF_H
 
-#include "riff.h"
+#include "internal.h"
 
 extern const AVCodecTag ff_codec_caf_tags[];
 
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index c351117132..709ef0762b 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -20,7 +20,7 @@
  */
 #include "avformat.h"
 #include "flv.h"
-#include "riff.h"
+#include "internal.h"
 #include "avc.h"
 
 #undef NDEBUG
diff --git a/libavformat/internal.h b/libavformat/internal.h
index db2a7c20d3..358959ce70 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -24,6 +24,11 @@
 #include <stdint.h>
 #include "avformat.h"
 
+typedef struct AVCodecTag {
+    enum CodecID id;
+    unsigned int tag;
+} AVCodecTag;
+
 void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
 
 #ifdef __GNUC__
diff --git a/libavformat/isom.c b/libavformat/isom.c
index a6e67e2267..c02ab33fea 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -22,7 +22,7 @@
  */
 
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 #include "isom.h"
 
 /* http://www.mp4ra.org */
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 92997a7962..ccfbd16534 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -25,7 +25,7 @@
 #define AVFORMAT_ISOM_H
 
 #include "avio.h"
-#include "riff.h"
+#include "internal.h"
 #include "dv.h"
 
 /* isom.c */
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 9a6a41b21f..01e0501a4b 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/tree.h"
 #include "nut.h"
+#include "internal.h"
 
 const AVCodecTag ff_nut_subtitle_tags[] = {
     { CODEC_ID_TEXT        , MKTAG('U', 'T', 'F', '8') },
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index dfda3cae88..b076eb19d9 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -23,6 +23,7 @@
 #include "libavutil/tree.h"
 #include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
+#include "internal.h"
 
 static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
     int sample_rate= c->sample_rate;
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 69146a8834..64d9eb6e3d 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -30,15 +30,11 @@
 
 #include "libavcodec/avcodec.h"
 #include "avio.h"
+#include "internal.h"
 
 int64_t ff_start_tag(ByteIOContext *pb, const char *tag);
 void ff_end_tag(ByteIOContext *pb, int64_t start);
 
-typedef struct AVCodecTag {
-    enum CodecID id;
-    unsigned int tag;
-} AVCodecTag;
-
 void ff_put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
 int ff_put_wav_header(ByteIOContext *pb, AVCodecContext *enc);
 enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps);
diff --git a/libavformat/voc.c b/libavformat/voc.c
index eed8db8cc7..53e02f9464 100644
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -20,6 +20,7 @@
  */
 
 #include "voc.h"
+#include "internal.h"
 
 const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A";
 
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 13d48f7397..909520c5e5 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "voc.h"
+#include "internal.h"
 
 
 static int voc_probe(AVProbeData *p)
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c
index f127c7e826..2d3472e31f 100644
--- a/libavformat/vocenc.c
+++ b/libavformat/vocenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "voc.h"
+#include "internal.h"
 
 
 typedef struct voc_enc_context {