8 files changed, 29 insertions, 21 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 73197f4f54..8c747abfdf 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -23,6 +23,8 @@
 #include <errno.h>
 #include <limits.h>
 
+#include <libavutil/intreadwrite.h>
+
 #include "config.h"
 #include "mp_msg.h"
 #include "options.h"
@@ -41,8 +43,6 @@
 #include "network.h"
 #include "tcp.h"
 
-#include "ffmpeg_files/intreadwrite.h"
-
 #include "libmpdemux/asfguid.h"
 
 extern int network_bandwidth;
diff --git a/stream/pnm.c b/stream/pnm.c
index 46c22361d9..b1baad70a3 100644
--- a/stream/pnm.c
+++ b/stream/pnm.c
@@ -23,8 +23,6 @@
  * based upon code from joschka
  */
 
-#include "config.h"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
@@ -35,6 +33,10 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <inttypes.h>
+
+#include <libavutil/intreadwrite.h>
+
+#include "config.h"
 #if !HAVE_WINSOCK2_H
 #include <sys/socket.h>
 //#include <netinet/in.h>
@@ -43,8 +45,6 @@
 #include <winsock2.h>
 #endif
 
-#include "ffmpeg_files/intreadwrite.h"
-
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
 #include "osdep/timer.h"
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index 3d06b4d667..daee0cd34a 100644
--- a/stream/realrtsp/real.c
+++ b/stream/realrtsp/real.c
@@ -30,18 +30,18 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <libavutil/common.h>
+#include <libavutil/attributes.h>
+#include <libavutil/md5.h>
+#include <libavutil/intreadwrite.h>
+#include <libavutil/base64.h>
+#include <libavutil/avutil.h>
+
 #include "config.h"
-#include "libavutil/common.h"
-#include "libavutil/attributes.h"
 #include "real.h"
 #include "asmrp.h"
 #include "sdpplin.h"
 #include "xbuffer.h"
-#include "libavutil/md5.h"
-#include "ffmpeg_files/intreadwrite.h"
-#include "libavutil/base64.h"
-
-#include <libavutil/avutil.h>
 
 #include "stream/http.h"
 #include "mp_msg.h"
diff --git a/stream/realrtsp/rmff.c b/stream/realrtsp/rmff.c
index d538222141..d85e696727 100644
--- a/stream/realrtsp/rmff.c
+++ b/stream/realrtsp/rmff.c
@@ -26,10 +26,11 @@
  * adopted from joschkas real tools
  */
 
+#include <libavutil/intreadwrite.h>
+
 #include "rmff.h"
 #include "xbuffer.h"
 #include "mp_msg.h"
-#include "ffmpeg_files/intreadwrite.h"
 
 /*
 #define LOG
diff --git a/stream/stream.c b/stream/stream.c
index 99225ca3b4..772c87dd9c 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -30,6 +30,9 @@
 #include <strings.h>
 #include <assert.h>
 
+#include <libavutil/intreadwrite.h>
+#include <libavutil/common.h>
+
 #include "talloc.h"
 
 #include "config.h"
@@ -38,15 +41,12 @@
 #include <winsock2.h>
 #endif
 
-#include <libavutil/common.h>
-
 #include "mp_msg.h"
 #include "osdep/shmem.h"
 #include "osdep/timer.h"
 #include "network.h"
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
-#include "ffmpeg_files/intreadwrite.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index b2f3a14fee..db566e5136 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -16,13 +16,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <fcntl.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
+#include <libavutil/intreadwrite.h>
+
+#include "config.h"
+
 #include <dvdread/ifo_types.h>
+
 #ifdef __FreeBSD__
 #include <sys/cdrio.h>
 #endif
@@ -37,7 +41,6 @@
 
 #include "mp_msg.h"
 #include "stream_dvd_common.h"
-#include "ffmpeg_files/intreadwrite.h"
 
 const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
 const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" };
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index 8b8d2ab817..ed435e3317 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -23,9 +23,11 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+
+#include <libavutil/intreadwrite.h>
+
 #include "mp_msg.h"
 #include "stream.h"
-#include "ffmpeg_files/intreadwrite.h"
 //=================== VideoCD ==========================
 #if	defined(__linux__) || defined(sun) || defined(__bsdi__)
 
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index 8a59a2a8ee..406cb902da 100644
--- a/stream/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
@@ -24,9 +24,11 @@
 #include <sys/types.h>
 #include <inttypes.h>
 #include <unistd.h>
-#include "ffmpeg_files/intreadwrite.h"
 #include <sys/cdio.h>
 #include <sys/ioctl.h>
+
+#include <libavutil/intreadwrite.h>
+
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #define VCD_NETBSD 1
 #endif