diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 2c304da94a..36b4cf1676 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
 #include "bitstream.h"
 #include "fifo.h"
 #include "mpeg.h"
@@ -77,6 +76,11 @@ typedef struct {
 
 } MpegMuxContext;
 
+extern AVOutputFormat mpeg1vcd_muxer;
+extern AVOutputFormat mpeg2dvd_muxer;
+extern AVOutputFormat mpeg2svcd_muxer;
+extern AVOutputFormat mpeg2vob_muxer;
+
 static int put_pack_header(AVFormatContext *ctx,
                            uint8_t *buf, int64_t timestamp)
 {
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index de38221b9c..d4e40b2adc 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -21,7 +21,6 @@
 #include "avformat.h"
 #include "crc.h"
 #include "mpegts.h"
-#include "allformats.h"
 
 //#define DEBUG_SI
 //#define DEBUG_SEEK
@@ -145,6 +144,8 @@ struct PESContext {
     uint8_t header[MAX_PES_HEADER_SIZE];
 };
 
+extern AVInputFormat mpegts_demuxer;
+
 /**
  *  Assembles PES packets out of TS packets, and then calls the "section_cb"
  *  function when they are complete.
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 4ad732daba..bcc19b272c 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -22,7 +22,6 @@
 #include "avformat.h"
 #include "avcodec.h"
 #include "riff.h"
-#include "allformats.h" // for asf_muxer
 
 /* Note: when encoding, the first matching tag is used, so order is
    important if multiple tags possible for a given codec. */
diff --git a/libavformat/thp.c b/libavformat/thp.c
index 2b7533c6e2..f1cc8ae26b 100644
--- a/libavformat/thp.c
+++ b/libavformat/thp.c
@@ -21,7 +21,6 @@
 
 
 #include "avformat.h"
-#include "allformats.h"
 
 typedef struct ThpDemuxContext {
     int              version;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index e80e57966e..1e04bd217c 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
 #include "opt.h"
 #include "avstring.h"
 #include "riff.h"
@@ -468,7 +467,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
 
     /* XXX: suppress this hack for redirectors */
 #ifdef CONFIG_REDIR_DEMUXER
-    if (fmt == &redir_demuxer) {
+    if (!strcmp(fmt->name, "redir")) {
         int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
         err = redir_open(ic_ptr, pb);
         url_fclose(pb);
diff --git a/libavformat/wv.c b/libavformat/wv.c
index 14579db92a..c8e4a40f24 100644
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
 #include "bswap.h"
 
 // specs say that maximum block size is 1Mb