summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-09 01:06:43 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:08:18 +0100
commit4873b32c5959c988af1769529ff72e3fd62fba82 (patch)
treee18fbd7eef54de6071969689aa5c31d6ea1f0963 /stream
parentd4bdd0473d6f43132257c9fb3848d829755167a3 (diff)
downloadmpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2
mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz
Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.)
Diffstat (limited to 'stream')
-rw-r--r--stream/ai_alsa1x.c2
-rw-r--r--stream/ai_oss.c2
-rw-r--r--stream/asf_mmst_streaming.c6
-rw-r--r--stream/asf_streaming.c10
-rw-r--r--stream/audio_in.c2
-rw-r--r--stream/cache2.c4
-rw-r--r--stream/cdinfo.c2
-rw-r--r--stream/cookies.c2
-rw-r--r--stream/dvb_tune.c2
-rw-r--r--stream/http.c4
-rw-r--r--stream/network.c9
-rw-r--r--stream/stream.c8
-rw-r--r--stream/stream.h4
-rw-r--r--stream/stream_bluray.c8
-rw-r--r--stream/stream_cdda.c10
-rw-r--r--stream/stream_cddb.c8
-rw-r--r--stream/stream_dvb.c8
-rw-r--r--stream/stream_dvd.c8
-rw-r--r--stream/stream_dvd.h2
-rw-r--r--stream/stream_dvd_common.c2
-rw-r--r--stream/stream_file.c6
-rw-r--r--stream/stream_ftp.c6
-rw-r--r--stream/stream_lavf.c8
-rw-r--r--stream/stream_mf.c2
-rw-r--r--stream/stream_netstream.c8
-rw-r--r--stream/stream_netstream.h4
-rw-r--r--stream/stream_pvr.c2
-rw-r--r--stream/stream_radio.c8
-rw-r--r--stream/stream_smb.c6
-rw-r--r--stream/stream_tv.c6
-rw-r--r--stream/stream_vcd.c8
-rw-r--r--stream/stream_vstream.c6
-rw-r--r--stream/tcp.c2
-rw-r--r--stream/tv.c10
-rw-r--r--stream/tv.h2
-rw-r--r--stream/tvi_bsdbt848.c6
-rw-r--r--stream/tvi_def.h2
-rw-r--r--stream/tvi_dummy.c2
-rw-r--r--stream/tvi_v4l2.c6
-rw-r--r--stream/udp.c2
-rw-r--r--stream/url.c2
-rw-r--r--stream/vcd_read.h2
-rw-r--r--stream/vcd_read_darwin.h4
-rw-r--r--stream/vcd_read_fbsd.h2
-rw-r--r--stream/vcd_read_win32.h2
45 files changed, 108 insertions, 109 deletions
diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c
index 412e87ce05..12ffa133f2 100644
--- a/stream/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
@@ -25,7 +25,7 @@
#include <alsa/asoundlib.h>
#include "audio_in.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
int ai_alsa_setup(audio_in_t *ai)
{
diff --git a/stream/ai_oss.c b/stream/ai_oss.c
index 656b45b5ac..be55358288 100644
--- a/stream/ai_oss.c
+++ b/stream/ai_oss.c
@@ -37,7 +37,7 @@
#endif
#include "audio_in.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
int ai_oss_set_samplerate(audio_in_t *ai)
{
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c
index 3af97b148b..26dd8aeddf 100644
--- a/stream/asf_mmst_streaming.c
+++ b/stream/asf_mmst_streaming.c
@@ -35,8 +35,8 @@
#include <inttypes.h>
#include "config.h"
-#include "options.h"
-#include "mp_msg.h"
+#include "core/options.h"
+#include "core/mp_msg.h"
#if HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -47,7 +47,7 @@
#endif
#include "url.h"
-#include "libmpdemux/asf.h"
+#include "demux/asf.h"
#include "stream.h"
#include "asf_mmst_streaming.h"
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 8c747abfdf..f81b5dd983 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -26,8 +26,8 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#if HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -35,15 +35,15 @@
#include "url.h"
#include "http.h"
-#include "libmpdemux/asf.h"
+#include "demux/asf.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "asf_mmst_streaming.h"
#include "network.h"
#include "tcp.h"
-#include "libmpdemux/asfguid.h"
+#include "demux/asfguid.h"
extern int network_bandwidth;
diff --git a/stream/audio_in.c b/stream/audio_in.c
index b7d388d89d..7f6a43fa2e 100644
--- a/stream/audio_in.c
+++ b/stream/audio_in.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "audio_in.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include <string.h>
#include <errno.h>
diff --git a/stream/cache2.c b/stream/cache2.c
index d9c4fbb09d..b6df32821e 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -57,11 +57,11 @@ static void *ThreadProc(void *s);
#define FORKED_CACHE 0
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
#include "cache2.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
typedef struct {
// constats:
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 3ec5560a24..82ff6d4169 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "cdd.h"
/*******************************************************************************************************************
diff --git a/stream/cookies.c b/stream/cookies.c
index 6a1ad4466d..d4ae1afab0 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -35,7 +35,7 @@
#include "cookies.h"
#include "http.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#define MAX_COOKIES 20
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index 8730c582a0..d5ea8c7b1a 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -37,7 +37,7 @@
#include "config.h"
#include "dvbin.h"
#include "dvb_tune.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
diff --git a/stream/http.c b/stream/http.c
index e88b0bd468..a6d977c10a 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -35,10 +35,10 @@
#include "http.h"
#include "url.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "network.h"
#include "libavutil/base64.h"
diff --git a/stream/network.c b/stream/network.c
index 572114a806..f80017e75b 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -29,9 +29,9 @@
#include <ctype.h>
#include "config.h"
-#include "options.h"
+#include "core/options.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#if HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -39,9 +39,8 @@
#endif
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_config.h"
-#include "mpcommon.h"
+#include "demux/demux.h"
+#include "core/mp_common.h"
#include "network.h"
#include "tcp.h"
#include "http.h"
diff --git a/stream/stream.c b/stream/stream.c
index 8ae334880b..d1dcc11dc0 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -41,15 +41,15 @@
#include <winsock2.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "osdep/shmem.h"
#include "osdep/timer.h"
#include "network.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "cache2.h"
diff --git a/stream/stream.h b/stream/stream.h
index 9416e42ca8..ace35abd9a 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -20,7 +20,7 @@
#define MPLAYER_STREAM_H
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "url.h"
#include <stdio.h>
#include <string.h>
@@ -28,7 +28,7 @@
#include <sys/types.h>
#include <fcntl.h>
-#include "bstr.h"
+#include "core/bstr.h"
#ifndef O_BINARY
#define O_BINARY 0
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index a126661e30..432216e20e 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -33,11 +33,11 @@
#include "config.h"
#include "libavutil/common.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "talloc.h"
-#include "mp_msg.h"
-#include "m_struct.h"
-#include "m_option.h"
+#include "core/mp_msg.h"
+#include "core/m_struct.h"
+#include "core/m_option.h"
#include "stream.h"
#define BLURAY_SECTOR_SIZE 6144
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index a014ad14c4..31e29a343f 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -29,15 +29,15 @@
#include "talloc.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "libavutil/common.h"
-#include "mpbswap.h"
-#include "libmpdemux/demuxer.h"
+#include "compat/mpbswap.h"
+#include "demux/demux.h"
#include "cdd.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
extern char *cdrom_device;
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index 76fdaa95b8..2fc4335b68 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -49,8 +49,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#if defined(__linux__)
#include <linux/cdrom.h>
@@ -63,11 +63,11 @@
#elif defined(__APPLE__) || defined(__DARWIN__)
#include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IOCDMediaBSDClient.h>
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#endif
#include "cdd.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "stream.h"
#include "network.h"
#include "libavutil/common.h"
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 13f32c29a8..6a73e5db42 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <errno.h>
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_option.h"
-#include "m_struct.h"
-#include "path.h"
+#include "demux/demux.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
+#include "core/path.h"
#include "libavutil/avstring.h"
#include "dvbin.h"
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 689e773c9d..a45fa4e432 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "talloc.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include <libgen.h>
#include <errno.h>
@@ -36,12 +36,12 @@
#define FIRST_PCM_AID 160
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "stream_dvd.h"
#include "stream_dvd_common.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
static char* dvd_device_current;
int dvd_angle=1;
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index ff6cb771d2..984d545467 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -26,7 +26,7 @@
#include <dvdread/ifo_read.h>
#include <dvdread/nav_read.h>
#include "stream.h"
-#include "m_option.h"
+#include "core/m_option.h"
typedef struct {
dvd_reader_t *dvd;
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index db566e5136..bc4c600c36 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -39,7 +39,7 @@
#include <sys/ioctl.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream_dvd_common.h"
const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 20d2a85497..abf0b37855 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -27,10 +27,10 @@
#include "osdep/io.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct stream_priv_s {
char* filename;
diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c
index 53b9e945d1..90ccc7b13a 100644
--- a/stream/stream_ftp.c
+++ b/stream/stream_ftp.c
@@ -32,11 +32,11 @@
#include <winsock2.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "network.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "tcp.h"
static struct stream_priv_s {
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index d62d9c9e57..d21e35e6a3 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -20,11 +20,11 @@
#include "libavformat/avformat.h"
#include "libavformat/avio.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
-#include "libmpdemux/demuxer.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
+#include "demux/demux.h"
static int fill_buffer(stream_t *s, char *buffer, int max_len)
{
diff --git a/stream/stream_mf.c b/stream/stream_mf.c
index 17fcf344f8..9b8b47188a 100644
--- a/stream/stream_mf.c
+++ b/stream/stream_mf.c
@@ -26,7 +26,7 @@
#include <string.h>
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
static int
mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index 6240aa7044..bbc8c85cbf 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -50,12 +50,12 @@
#include <winsock2.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "libavutil/common.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#include "network.h"
#include "stream_netstream.h"
diff --git a/stream/stream_netstream.h b/stream/stream_netstream.h
index 3843ee938d..5d219e3a7e 100644
--- a/stream/stream_netstream.h
+++ b/stream/stream_netstream.h
@@ -33,8 +33,8 @@
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#endif
-#include "mp_msg.h"
-#include "mpbswap.h"
+#include "core/mp_msg.h"
+#include "compat/mpbswap.h"
typedef struct mp_net_stream_packet_st {
uint16_t len;
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 7991395854..aeea46cf62 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -40,7 +40,7 @@
#include <linux/types.h>
#include <linux/videodev2.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
#include "pvr.h"
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 245f889bbe..c126aba170 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -53,10 +53,10 @@
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_struct.h"
-#include "m_option.h"
-#include "mp_msg.h"
+#include "demux/demux.h"
+#include "core/m_struct.h"
+#include "core/m_option.h"
+#include "core/mp_msg.h"
#include "stream_radio.h"
#include "libavutil/avstring.h"
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index f176bc7518..e2f77ce3a1 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -21,10 +21,10 @@
#include <libsmbclient.h>
#include <unistd.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct stream_priv_s {
} stream_priv_dflts = {
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 0f454663ca..0a519efb25 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -26,9 +26,9 @@
#include <string.h>
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "demux/demux.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "tv.h"
#include <stdio.h>
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 0dae3731fb..8093088456 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -22,10 +22,10 @@
#include <windows.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include <fcntl.h>
#include <stdlib.h>
@@ -47,7 +47,7 @@
#include "vcd_read.h"
#endif
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
extern char *cdrom_device;
diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c
index 380b682c46..790ba1b83f 100644
--- a/stream/stream_vstream.c
+++ b/stream/stream_vstream.c
@@ -42,10 +42,10 @@
#include <inttypes.h>
#include <errno.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "tcp.h"
#include <vstream-client.h>
diff --git a/stream/tcp.c b/stream/tcp.c
index 1f93571b55..54ebf33e61 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -33,7 +33,7 @@
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#if !HAVE_WINSOCK2_H
#include <netdb.h>
diff --git a/stream/tv.c b/stream/tv.c
index b0abad6e6d..922fa5f008 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -35,14 +35,14 @@
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
-#include "libaf/format.h"
-#include "libmpcodecs/img_format.h"
+#include "audio/format.h"
+#include "video/img_format.h"
#include "libavutil/avstring.h"
#include "osdep/timer.h"
diff --git a/stream/tv.h b/stream/tv.h
index 699033664b..178c23563c 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -25,7 +25,7 @@
#ifndef MPLAYER_TV_H
#define MPLAYER_TV_H
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
typedef struct tv_param_s {
char *freq;
diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c
index 0286c0ed05..19d68dd899 100644
--- a/stream/tvi_bsdbt848.c
+++ b/stream/tvi_bsdbt848.c
@@ -78,10 +78,10 @@
#endif
#endif
-#include "libaf/format.h"
-#include "libmpcodecs/img_format.h"
+#include "audio/format.h"
+#include "video/img_format.h"
#include "tv.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
static tvi_handle_t *tvi_init_bsdbt848(tv_param_t* tv_param);
/* information about this file */
diff --git a/stream/tvi_def.h b/stream/tvi_def.h
index b0fd24e130..367f2adb35 100644
--- a/stream/tvi_def.h
+++ b/stream/tvi_def.h
@@ -21,7 +21,7 @@
#include <stdlib.h> /* malloc */
#include <string.h> /* memset */
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
#include "tv.h"
static int init(priv_t *priv);
diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c
index 95c9489070..48a745450e 100644
--- a/stream/tvi_dummy.c
+++ b/stream/tvi_dummy.c
@@ -21,7 +21,7 @@
#include "config.h"
#include <stdio.h>
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
#include "tv.h"
static tvi_handle_t *tvi_init_dummy(tv_param_t* tv_param);
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 4a5a2d4141..14313d0966 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -55,9 +55,9 @@ known issues:
#include <linux/types.h>
#include <linux/videodev2.h>
#endif
-#include "mp_msg.h"
-#include "libmpcodecs/img_format.h"
-#include "libaf/format.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
+#include "audio/format.h"
#include "tv.h"
#include "audio_in.h"
diff --git a/stream/udp.c b/stream/udp.c
index e27808b4c2..53a581e332 100644
--- a/stream/udp.c
+++ b/stream/udp.c
@@ -41,7 +41,7 @@
#include <ws2tcpip.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "network.h"
#include "url.h"
#include "udp.h"
diff --git a/stream/url.c b/stream/url.c
index 9114468388..7919a356f1 100644
--- a/stream/url.c
+++ b/stream/url.c
@@ -28,7 +28,7 @@
#include <inttypes.h>
#include "url.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index ed435e3317..9d0f68ea66 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -26,7 +26,7 @@
#include <libavutil/intreadwrite.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
//=================== VideoCD ==========================
#if defined(__linux__) || defined(sun) || defined(__bsdi__)
diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 71fc093984..87087e3107 100644
--- a/stream/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
@@ -32,8 +32,8 @@
#include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IOCDMediaBSDClient.h>
-#include "mpbswap.h"
-#include "mp_msg.h"
+#include "compat/mpbswap.h"
+#include "core/mp_msg.h"
#include "stream.h"
//=================== VideoCD ==========================
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index 406cb902da..29dae1762a 100644
--- a/stream/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
@@ -41,7 +41,7 @@
#define TOCADDR(te) ((te).entry.addr)
#define READ_TOC CDIOREADTOCENTRY
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
//=================== VideoCD ==========================
#define CDROM_LEADOUT 0xAA
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h
index 2e13232606..30679d707e 100644
--- a/stream/vcd_read_win32.h
+++ b/stream/vcd_read_win32.h
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <ddk/ntddcdrm.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
typedef struct mp_vcd_priv_st mp_vcd_priv_t;