diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 6f1d9cd191..ea98554654 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 #include "intfloat_readwrite.h"
 
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index b991a93186..0a783ba6c4 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -20,6 +20,7 @@
  */
 #include "avformat.h"
 #include "allformats.h"
+#include "rtp_internal.h"
 
 #define REGISTER_MUXER(X,x) \
           if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer)
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 88da77bf34..eb51c9620c 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -195,13 +195,4 @@ extern URLProtocol rtp_protocol;
 extern URLProtocol tcp_protocol;
 extern URLProtocol udp_protocol;
 
-/* raw.c */
-int pcm_read_seek(AVFormatContext *s,
-                  int stream_index, int64_t timestamp, int flags);
-
-/* rtsp.c */
-int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
-/* rtp.c */
-void av_register_rtp_dynamic_payload_handlers(void);
-
 #endif
diff --git a/libavformat/au.c b/libavformat/au.c
index bd26e54d6f..dd9d708ff5 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -28,7 +28,7 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 
 /* if we don't know the size in advance */
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 7fcbde9e7f..be4c6e3cca 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 
 typedef struct {
diff --git a/libavformat/raw.c b/libavformat/raw.c
index bf0a11146d..bd9380315c 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -21,6 +21,7 @@
  */
 #include "avformat.h"
 #include "ac3_parser.h"
+#include "raw.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */
diff --git a/libavformat/raw.h b/libavformat/raw.h
new file mode 100644
index 0000000000..ce3e45c932
--- /dev/null
+++ b/libavformat/raw.h
@@ -0,0 +1,30 @@
+/*
+ * RAW muxer and demuxer
+ * Copyright (C) 2007  Aurelien Jacobs <aurel@gnuage.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_RAW_H
+#define AVFORMAT_RAW_H
+
+#include "avformat.h"
+
+int pcm_read_seek(AVFormatContext *s,
+                  int stream_index, int64_t timestamp, int flags);
+
+#endif /* AVFORMAT_RAW_H */
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index b03f74e861..96477620b3 100644
--- a/libavformat/rtp_internal.h
+++ b/libavformat/rtp_internal.h
@@ -112,5 +112,8 @@ extern RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler;
 int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); ///< from rtsp.c, but used by rtp dynamic protocol handlers.
 
 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
+
+void av_register_rtp_dynamic_payload_handlers(void);
+
 #endif /* RTP_INTERNAL_H */
 
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 6ab70eef04..3d2456d663 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -24,7 +24,7 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 #include "bswap.h"
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 47ac5c0de9..e80e57966e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -469,6 +469,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) {
+        int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
         err = redir_open(ic_ptr, pb);
         url_fclose(pb);
         return err;
diff --git a/libavformat/wav.c b/libavformat/wav.c
index cb748a9dcb..9fccf64295 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 
 typedef struct {