Split mpvcore/ into common/, misc/, bstr/

235 files changed, 380 insertions, 376 deletions

diff --git a/audio/audio.c b/audio/audio.c
index a5cf52f5b3..950d25be75 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -20,7 +20,7 @@
 #include <libavutil/mem.h>
 
 #include "talloc.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "audio.h"
 
 static void update_redundant_info(struct mp_audio *mpa)
diff --git a/audio/audio_buffer.c b/audio/audio_buffer.c
index 53563f90c6..2bd546a532 100644
--- a/audio/audio_buffer.c
+++ b/audio/audio_buffer.c
@@ -19,7 +19,7 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "audio_buffer.h"
 #include "audio.h"
diff --git a/audio/chmap.c b/audio/chmap.c
index 0e714f3c83..ce301b6565 100644
--- a/audio/chmap.c
+++ b/audio/chmap.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "chmap.h"
 
 // Names taken from libavutil/channel_layout.c (Not accessible by API.)
diff --git a/audio/chmap.h b/audio/chmap.h
index cd6c49f716..ca1e6c2508 100644
--- a/audio/chmap.h
+++ b/audio/chmap.h
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 #define MP_NUM_CHANNELS 8
 
diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 56f8944120..2ac9fb21f6 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_AD_H
 #define MPLAYER_AD_H
 
-#include "mpvcore/codecs.h"
+#include "common/codecs.h"
 #include "demux/stheader.h"
 #include "demux/demux.h"
 
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 8b2c2d1727..9e1ba49fc1 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -29,11 +29,11 @@
 #include "talloc.h"
 
 #include "config.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/codecs.h"
-#include "mpvcore/mp_msg.h"
+#include "common/av_common.h"
+#include "common/codecs.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/av_opts.h"
+#include "common/av_opts.h"
 
 #include "ad.h"
 #include "audio/fmt-conversion.h"
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c
index f65553bd77..57f84e136f 100644
--- a/audio/decode/ad_mpg123.c
+++ b/audio/decode/ad_mpg123.c
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "ad.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include <mpg123.h>
 
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index fdc12772b8..5532d6b5a8 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -26,8 +26,8 @@
 #include <libavutil/opt.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_common.h"
+#include "common/msg.h"
+#include "common/av_common.h"
 #include "options/options.h"
 #include "ad.h"
 
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index 1c34c6abe9..51966a7cc6 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -26,9 +26,9 @@
 #include "demux/codec_tags.h"
 
 #include "config.h"
-#include "mpvcore/codecs.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/codecs.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
 
 #include "stream/stream.h"
 #include "demux/demux.h"
diff --git a/audio/filter/af.h b/audio/filter/af.h
index 260d4dae7e..1e78c01718 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -29,7 +29,7 @@
 #include "audio/format.h"
 #include "audio/chmap.h"
 #include "audio/audio.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 struct af_instance;
 
diff --git a/audio/filter/af_center.c b/audio/filter/af_center.c
index d1095e611c..2e626bffb6 100644
--- a/audio/filter/af_center.c
+++ b/audio/filter/af_center.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 // Data for specific instances of this filter
diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c
index 8edaa4285a..7bbf952ffe 100644
--- a/audio/filter/af_channels.c
+++ b/audio/filter/af_channels.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 #define FR 0
diff --git a/audio/filter/af_delay.c b/audio/filter/af_delay.c
index b2c03697fd..f29d065427 100644
--- a/audio/filter/af_delay.c
+++ b/audio/filter/af_delay.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 #define L 65536
diff --git a/audio/filter/af_drc.c b/audio/filter/af_drc.c
index 0edb99f469..fad34ba500 100644
--- a/audio/filter/af_drc.c
+++ b/audio/filter/af_drc.c
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <limits.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 // Methods:
diff --git a/audio/filter/af_equalizer.c b/audio/filter/af_equalizer.c
index c14fc8451d..7f79dab8ca 100644
--- a/audio/filter/af_equalizer.c
+++ b/audio/filter/af_equalizer.c
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 #define L   	2      // Storage for filter taps
diff --git a/audio/filter/af_extrastereo.c b/audio/filter/af_extrastereo.c
index 92cc4dd216..1e814e8351 100644
--- a/audio/filter/af_extrastereo.c
+++ b/audio/filter/af_extrastereo.c
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <limits.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 // Data for specific instances of this filter
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index e764d4fae8..6fee39afea 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -39,7 +39,7 @@
 #include "af.h"
 
 #include "options/m_option.h"
-#include "mpvcore/av_opts.h"
+#include "common/av_opts.h"
 
 #define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100)
 
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 65d380e873..ee453cc1de 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -54,9 +54,9 @@
 #error "config.h broken or no resampler found"
 #endif
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
-#include "mpvcore/av_opts.h"
+#include "common/av_opts.h"
 #include "audio/filter/af.h"
 #include "audio/fmt-conversion.h"
 #include "audio/reorder_ch.h"
diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c
index 800221e4bf..accea8026d 100644
--- a/audio/filter/af_pan.c
+++ b/audio/filter/af_pan.c
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <limits.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 // Data for specific instances of this filter
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index c54fe44e36..5b93914851 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -36,7 +36,7 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "af.h"
 #include "options/m_option.h"
diff --git a/audio/filter/af_sub.c b/audio/filter/af_sub.c
index ff88272b34..7012e1e129 100644
--- a/audio/filter/af_sub.c
+++ b/audio/filter/af_sub.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 #include "dsp.h"
 
diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c
index 06a1f7dd3c..6a27081b28 100644
--- a/audio/filter/af_volume.c
+++ b/audio/filter/af_volume.c
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <limits.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 struct priv {
diff --git a/audio/filter/tools.c b/audio/filter/tools.c
index c5f423ebf9..217224150e 100644
--- a/audio/filter/tools.c
+++ b/audio/filter/tools.c
@@ -19,7 +19,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "af.h"
 
 /* Convert to gain value from dB. Returns AF_OK if of and AF_ERROR if
diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c
index da770a8eda..65f84945c1 100644
--- a/audio/fmt-conversion.c
+++ b/audio/fmt-conversion.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */ 
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include <libavutil/avutil.h>
 #include <libavutil/samplefmt.h>
 #include "format.h"
diff --git a/audio/format.c b/audio/format.c
index 1f6b0cac20..e343ca36db 100644
--- a/audio/format.c
+++ b/audio/format.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "audio/filter/af.h"
 
 int af_fmt2bits(int format)
diff --git a/audio/format.h b/audio/format.h
index b318d4cdca..d21707e677 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include "config.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 #if BYTE_ORDER == BIG_ENDIAN
 #define AF_SELECT_LE_BE(LE, BE) BE
diff --git a/audio/mixer.c b/audio/mixer.c
index 0972b80533..b3ba9c3a58 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "audio/out/ao.h"
 #include "audio/filter/af.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "talloc.h"
 #include "mixer.h"
 
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 6434949cd9..ddd177400d 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -29,8 +29,8 @@
 
 #include "options/options.h"
 #include "options/m_config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mpv_global.h"
+#include "common/msg.h"
+#include "common/global.h"
 
 extern const struct ao_driver audio_out_oss;
 extern const struct ao_driver audio_out_coreaudio;
diff --git a/audio/out/ao.h b/audio/out/ao.h
index dff9ad6a8b..81737e094d 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
 #include "audio/chmap.h"
 #include "audio/chmap_sel.h"
 
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 372b490e9f..a65b9b05ec 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -38,7 +38,7 @@
 #include "config.h"
 #include "options/options.h"
 #include "options/m_option.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 2fb7976c67..4a4091daf9 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -40,8 +40,8 @@
 #include "audio/format.h"
 #include "osdep/timer.h"
 #include "options/m_option.h"
-#include "mpvcore/mp_ring.h"
-#include "mpvcore/mp_msg.h"
+#include "misc/ring.h"
+#include "common/msg.h"
 #include "audio/out/ao_coreaudio_properties.h"
 #include "audio/out/ao_coreaudio_utils.h"
 
diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h
index 296f1d2497..cf69248b47 100644
--- a/audio/out/ao_coreaudio_utils.h
+++ b/audio/out/ao_coreaudio_utils.h
@@ -22,7 +22,7 @@
 #include <AudioToolbox/AudioToolbox.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "audio/out/ao.h"
 
 #define CA_CFSTR_ENCODING kCFStringEncodingASCII
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index 1ace4093b4..26c7bb83ed 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -39,7 +39,7 @@
 #include "audio/format.h"
 #include "ao.h"
 #include "audio/reorder_ch.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "osdep/timer.h"
 #include "options/m_option.h"
 
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 8c54796e2b..f4cb5c475e 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -29,14 +29,14 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
 #include "options/m_option.h"
 
-#include "mpvcore/mp_ring.h"
+#include "misc/ring.h"
 
 #include <jack/jack.h>
 
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 713b952229..3e4ba01105 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -31,14 +31,14 @@
 #include "compat/libav.h"
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "audio/format.h"
 #include "audio/fmt-conversion.h"
 #include "talloc.h"
 #include "ao.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
-#include "mpvcore/encode_lavc.h"
+#include "common/encode_lavc.h"
 
 struct priv {
     uint8_t *buffer;
diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 282511ae40..7c912d94a4 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "osdep/timer.h"
 #include "options/m_option.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "audio/format.h"
 #include "ao.h"
 
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index c6c2e9e8b8..d613b74208 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -35,7 +35,7 @@
 #include <AL/alext.h>
 #endif
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "ao.h"
 #include "audio/format.h"
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index 9ff7d1a165..574fcf6beb 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -36,7 +36,7 @@
 
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #if HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 2a086c549f..14548d3be3 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -34,7 +34,7 @@
 #include "audio/format.h"
 #include "audio/reorder_ch.h"
 #include "ao.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #ifdef __MINGW32__
 // for GetFileType to detect pipes
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c
index 6e3d9680fd..8b4efe7944 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -28,8 +28,8 @@
 #include "config.h"
 #include "options/m_option.h"
 #include "audio/format.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_ring.h"
+#include "common/msg.h"
+#include "misc/ring.h"
 #include "ao.h"
 
 struct priv {
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 651589c34f..f3bce40574 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include "audio/format.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "ao.h"
 #include "input/input.h"
 
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index dd2fb894be..ac1fd6febb 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -23,7 +23,7 @@
 #include "audio/format.h"
 #include "talloc.h"
 #include "ao.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "osdep/timer.h"
 
diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c
index 6cf08cd095..75ea5d095b 100644
--- a/audio/out/ao_sndio.c
+++ b/audio/out/ao_sndio.c
@@ -23,7 +23,7 @@
 #include <sndio.h>
 
 #include "options/m_option.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "audio/format.h"
 #include "ao.h"
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index b2ac1f2343..d70b66a493 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -31,10 +31,10 @@
 
 #include "config.h"
 #include "options/m_option.h"
-#include "mpvcore/m_config.h"
+#include "common/m_config.h"
 #include "audio/format.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_ring.h"
+#include "common/msg.h"
+#include "common/mp_ring.h"
 #include "ao.h"
 
 #ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE
diff --git a/mpvcore/bstr.c b/bstr/bstr.c
index 996edb7dfe..65ae928d31 100644
--- a/mpvcore/bstr.c
+++ b/bstr/bstr.c
@@ -25,7 +25,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 int bstrcmp(struct bstr str1, struct bstr str2)
 {
diff --git a/mpvcore/bstr.h b/bstr/bstr.h
index 67e85655c4..67e85655c4 100644
--- a/mpvcore/bstr.h
+++ b/bstr/bstr.h
diff --git a/mpvcore/asxparser.c b/common/asxparser.c
index 16646b9347..5b1d5652a3 100644
--- a/mpvcore/asxparser.c
+++ b/common/asxparser.c
@@ -28,7 +28,7 @@
 #include "playlist_parser.h"
 #include "stream/stream.h"
 #include "asxparser.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 
 typedef struct ASX_Parser_t ASX_Parser_t;
diff --git a/mpvcore/asxparser.h b/common/asxparser.h
index e49a2cedc0..e49a2cedc0 100644
--- a/mpvcore/asxparser.h
+++ b/common/asxparser.h
diff --git a/mpvcore/av_common.c b/common/av_common.c
index 823c825517..cccb0f755e 100644
--- a/mpvcore/av_common.c
+++ b/common/av_common.c
@@ -20,8 +20,8 @@
 #include <libavutil/common.h>
 #include <libavcodec/avcodec.h>
 
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
 #include "demux/packet.h"
 #include "av_common.h"
 #include "codecs.h"
diff --git a/mpvcore/av_common.h b/common/av_common.h
index 7bf2d64d9e..7bf2d64d9e 100644
--- a/mpvcore/av_common.h
+++ b/common/av_common.h
diff --git a/mpvcore/av_log.c b/common/av_log.c
index ca3ef70747..ba47500572 100644
--- a/mpvcore/av_log.c
+++ b/common/av_log.c
@@ -25,7 +25,7 @@
 
 #include "av_log.h"
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include <libavutil/avutil.h>
 #include <libavutil/log.h>
 
diff --git a/mpvcore/av_log.h b/common/av_log.h
index d5c57b0aeb..d5c57b0aeb 100644
--- a/mpvcore/av_log.h
+++ b/common/av_log.h
diff --git a/mpvcore/av_opts.c b/common/av_opts.c
index 777a1eec5a..777a1eec5a 100644
--- a/mpvcore/av_opts.c
+++ b/common/av_opts.c
diff --git a/mpvcore/av_opts.h b/common/av_opts.h
index 640443a352..640443a352 100644
--- a/mpvcore/av_opts.h
+++ b/common/av_opts.h
diff --git a/mpvcore/codecs.c b/common/codecs.c
index b5a07cf999..b7639a4576 100644
--- a/mpvcore/codecs.c
+++ b/common/codecs.c
@@ -17,8 +17,8 @@
 
 #include <assert.h>
 #include "talloc.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_msg.h"
+#include "bstr/bstr.h"
+#include "common/msg.h"
 #include "codecs.h"
 
 void mp_add_decoder(struct mp_decoder_list *list, const char *family,
diff --git a/mpvcore/codecs.h b/common/codecs.h
index 21ff284617..21ff284617 100644
--- a/mpvcore/codecs.h
+++ b/common/codecs.h
diff --git a/mpvcore/mp_common.c b/common/common.c
index d4947f442f..365a369425 100644
--- a/mpvcore/mp_common.c
+++ b/common/common.c
@@ -19,8 +19,8 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
 
 #define appendf(ptr, ...) \
     do {(*(ptr)) = talloc_asprintf_append_buffer(*(ptr), __VA_ARGS__);} while(0)
diff --git a/mpvcore/mp_common.h b/common/common.h
index 9e751ee851..9e751ee851 100644
--- a/mpvcore/mp_common.h
+++ b/common/common.h
diff --git a/mpvcore/cpudetect.c b/common/cpudetect.c
index d670de0f98..ea28cf4dd4 100644
--- a/mpvcore/cpudetect.c
+++ b/common/cpudetect.c
@@ -24,8 +24,8 @@
 #include "compat/libav.h"
 
 #include "config.h"
-#include "mpvcore/cpudetect.h"
-#include "mpvcore/mp_msg.h"
+#include "common/cpudetect.h"
+#include "common/msg.h"
 
 CpuCaps gCpuCaps;
 
diff --git a/mpvcore/cpudetect.h b/common/cpudetect.h
index d3d9206c65..d3d9206c65 100644
--- a/mpvcore/cpudetect.h
+++ b/common/cpudetect.h
diff --git a/mpvcore/encode.h b/common/encode.h
index fec14045ed..fec14045ed 100644
--- a/mpvcore/encode.h
+++ b/common/encode.h
diff --git a/mpvcore/encode_lavc.c b/common/encode_lavc.c
index 0ea4be486a..97a45ccbbe 100644
--- a/mpvcore/encode_lavc.c
+++ b/common/encode_lavc.c
@@ -23,7 +23,7 @@
 #include <libavutil/avutil.h>
 
 #include "encode_lavc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/vfcap.h"
 #include "options/options.h"
 #include "osdep/timer.h"
diff --git a/mpvcore/encode_lavc.h b/common/encode_lavc.h
index 15e0a5c7f2..15e0a5c7f2 100644
--- a/mpvcore/encode_lavc.h
+++ b/common/encode_lavc.h
diff --git a/mpvcore/mpv_global.h b/common/global.h
index 546c585294..546c585294 100644
--- a/mpvcore/mpv_global.h
+++ b/common/global.h
diff --git a/mpvcore/mp_msg.c b/common/msg.c
index 0284f2a2cb..dd03be0f73 100644
--- a/mpvcore/mp_msg.c
+++ b/common/msg.c
@@ -26,7 +26,7 @@
 #include "talloc.h"
 
 #include "config.h"
-#include "mpvcore/mpv_global.h"
+#include "common/global.h"
 #include "osdep/getch2.h"
 #include "osdep/io.h"
 
@@ -34,7 +34,7 @@
 #include <signal.h>
 #endif
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 bool mp_msg_stdout_in_use = 0;
 
diff --git a/mpvcore/mp_msg.h b/common/msg.h
index 976ed5e3f8..889d99ae62 100644
--- a/mpvcore/mp_msg.h
+++ b/common/msg.h
@@ -135,7 +135,7 @@ int mp_msg_test(int mod, int lev);
 bool mp_msg_test_log(struct mp_log *log, int lev);
 
 #include "config.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 // Note: using mp_msg_log or the MP_ERR/... macros is preferred.
 void mp_msg_va(int mod, int lev, const char *format, va_list va);
diff --git a/mpvcore/playlist.c b/common/playlist.c
index e88838fde2..297cb4d379 100644
--- a/mpvcore/playlist.c
+++ b/common/playlist.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 #include "config.h"
 #include "playlist.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "talloc.h"
 #include "options/path.h"
 
diff --git a/mpvcore/playlist.h b/common/playlist.h
index 35d9dab701..f383a85fea 100644
--- a/mpvcore/playlist.h
+++ b/common/playlist.h
@@ -19,7 +19,7 @@
 #define MPLAYER_PLAYLIST_H
 
 #include <stdbool.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 struct playlist_param {
     bstr name, value;
diff --git a/mpvcore/playlist_parser.c b/common/playlist_parser.c
index 17679ddf1f..af249f4aa5 100644
--- a/mpvcore/playlist_parser.c
+++ b/common/playlist_parser.c
@@ -40,7 +40,7 @@
 #include "playlist_parser.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/path.h"
 
 
diff --git a/mpvcore/playlist_parser.h b/common/playlist_parser.h
index a541aa2cb4..a541aa2cb4 100644
--- a/mpvcore/playlist_parser.h
+++ b/common/playlist_parser.h
diff --git a/mpvcore/version.c b/common/version.c
index 23a0c59bc3..23a0c59bc3 100644
--- a/mpvcore/version.c
+++ b/common/version.c
diff --git a/mpvcore/mp_memory_barrier.h b/compat/atomics.h
index e27825de8f..e27825de8f 100644
--- a/mpvcore/mp_memory_barrier.h
+++ b/compat/atomics.h
diff --git a/demux/codec_tags.c b/demux/codec_tags.c
index e63f1e7134..299249a2cf 100644
--- a/demux/codec_tags.c
+++ b/demux/codec_tags.c
@@ -20,7 +20,7 @@
 #include <libavutil/common.h>
 #include "codec_tags.h"
 #include "stheader.h"
-#include "mpvcore/av_common.h"
+#include "common/av_common.h"
 
 /* The following tables map FourCCs to codec names (as defined by libavcodec).
  * However, this includes only names that are not defined by libavformat's
diff --git a/demux/demux.c b/demux/demux.c
index 626804fcef..c5cbe392af 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -30,9 +30,9 @@
 
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/av_common.h"
+#include "common/av_common.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux.h b/demux/demux.h
index 6b08b84e4c..6d5253786f 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
 #include "packet.h"
 #include "stheader.h"
 
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index 7c94850899..bfca04dcad 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "demux.h"
 #include "stream/stream.h"
 
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index c541f345e1..9057284c1e 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -36,10 +36,10 @@
 
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_opts.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "common/av_opts.h"
+#include "common/av_common.h"
+#include "bstr/bstr.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_libass.c b/demux/demux_libass.c
index 15e149212b..f01b999d9e 100644
--- a/demux/demux_libass.c
+++ b/demux/demux_libass.c
@@ -22,8 +22,8 @@
 #include <ass/ass_types.h>
 
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/charset_conv.h"
+#include "common/msg.h"
+#include "misc/charset_conv.h"
 #include "stream/stream.h"
 #include "demux.h"
 
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 1eea59a058..876b17a025 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -27,7 +27,7 @@
 
 #include "talloc.h"
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index b3cf253be5..52ab592eb0 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -43,7 +43,7 @@
 
 #include "talloc.h"
 #include "options/options.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
@@ -51,7 +51,7 @@
 #include "matroska.h"
 #include "codec_tags.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 static const unsigned char sipr_swaps[38][2] = {
     {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68},
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c
index 1a4882f92b..38011f80b7 100644
--- a/demux/demux_playlist.c
+++ b/demux/demux_playlist.c
@@ -15,10 +15,10 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/playlist.h"
+#include "common/msg.h"
+#include "common/playlist.h"
 #include "options/path.h"
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index a3cee1794b..e2b4c1cac4 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -32,8 +32,8 @@
 #include <libavutil/avstring.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_common.h"
+#include "common/msg.h"
+#include "common/common.h"
 #include "options/options.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
diff --git a/demux/ebml.c b/demux/ebml.c
index 06ef85b742..dabdebb9ea 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -35,7 +35,7 @@
 #include "ebml.h"
 #include "stream/stream.h"
 #include "compat/mpbswap.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #ifndef SIZE_MAX
 #define SIZE_MAX ((size_t)-1)
diff --git a/demux/ebml.h b/demux/ebml.h
index 715e9ff85d..8652746e48 100644
--- a/demux/ebml.h
+++ b/demux/ebml.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "stream/stream.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 
 /* EBML version supported */
diff --git a/demux/mf.c b/demux/mf.c
index e50e10b43c..02a576c51d 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -37,7 +37,7 @@
 #endif
 
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream/stream.h"
 #include "options/path.h"
 
diff --git a/demux/stheader.h b/demux/stheader.h
index 92bb404b6d..25f60ba032 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "audio/chmap.h"
 #include "ms_hdr.h"
 struct MPOpts;
diff --git a/input/input.c b/input/input.c
index 4d2c873211..16f3b3c71a 100644
--- a/input/input.c
+++ b/input/input.c
@@ -41,15 +41,15 @@
 #include "input.h"
 #include "keycodes.h"
 #include "osdep/timer.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mpv_global.h"
+#include "common/msg.h"
+#include "common/global.h"
 #include "options/m_option.h"
 #include "options/path.h"
 #include "talloc.h"
 #include "options/options.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "stream/stream.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "joystick.h"
 
diff --git a/input/input.h b/input/input.h
index 43c5742cf6..4020c3d276 100644
--- a/input/input.h
+++ b/input/input.h
@@ -20,7 +20,7 @@
 #define MPLAYER_INPUT_H
 
 #include <stdbool.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "options/m_option.h"
 
 // All command IDs
diff --git a/input/joystick.c b/input/joystick.c
index d8e9d13423..f2be6c3f93 100644
--- a/input/joystick.c
+++ b/input/joystick.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "keycodes.h"
 
 #ifndef JOY_AXIS_DELTA
diff --git a/input/lirc.c b/input/lirc.c
index 052fffbd74..f3b63468e0 100644
--- a/input/lirc.c
+++ b/input/lirc.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "input.h"
 #include "lirc.h"
 
diff --git a/mpvcore/charset_conv.c b/misc/charset_conv.c
index 3a6ff67330..fe396e8ef5 100644
--- a/mpvcore/charset_conv.c
+++ b/misc/charset_conv.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #if HAVE_ENCA
 #include <enca.h>
diff --git a/mpvcore/charset_conv.h b/misc/charset_conv.h
index 0b2874f0ec..c216ede2be 100644
--- a/mpvcore/charset_conv.h
+++ b/misc/charset_conv.h
@@ -2,7 +2,7 @@
 #define MP_CHARSET_CONV_H
 
 #include <stdbool.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 enum {
     MP_ICONV_VERBOSE = 1,       // print errors instead of failing silently
diff --git a/mpvcore/mp_ring.c b/misc/ring.c
index d310aa4f46..eb139c2cab 100644
--- a/mpvcore/mp_ring.c
+++ b/misc/ring.c
@@ -21,8 +21,8 @@
 #include <libavutil/common.h>
 #include <assert.h>
 #include "talloc.h"
-#include "mpvcore/mp_memory_barrier.h"
-#include "mpvcore/mp_ring.h"
+#include "compat/atomics.h"
+#include "ring.h"
 
 struct mp_ring {
     uint8_t  *buffer;
diff --git a/mpvcore/mp_ring.h b/misc/ring.h
index e93baea97e..e93baea97e 100644
--- a/mpvcore/mp_ring.h
+++ b/misc/ring.h
diff --git a/old-makefile b/old-makefile
index 4241955581..6756a18e18 100644
--- a/old-makefile
+++ b/old-makefile
@@ -95,7 +95,7 @@ SOURCES-$(GL)                   += video/out/gl_common.c video/out/gl_osd.c \
                                    video/out/pnm_loader.c
 
 SOURCES-$(ENCODING)             += video/out/vo_lavc.c audio/out/ao_lavc.c \
-                                   mpvcore/encode_lavc.c
+                                   common/encode_lavc.c
 
 SOURCES-$(GL_WIN32)             += video/out/w32_common.c video/out/gl_w32.c
 SOURCES-$(GL_X11)               += video/out/x11_common.c video/out/gl_x11.c
@@ -180,6 +180,18 @@ SOURCES = audio/audio.c \
           audio/out/ao.c \
           audio/out/ao_null.c \
           audio/out/ao_pcm.c \
+          bstr/bstr.c \
+          common/asxparser.c \
+          common/av_common.c \
+          common/av_log.c \
+          common/av_opts.c \
+          common/codecs.c \
+          common/cpudetect.c \
+          common/common.c \
+          common/msg.c \
+          common/playlist.c \
+          common/playlist_parser.c \
+          common/version.c \
           demux/codec_tags.c \
           demux/demux.c \
           demux/demux_edl.c \
@@ -193,20 +205,8 @@ SOURCES = audio/audio.c \
           demux/ebml.c \
           demux/mf.c \
           input/input.c \
-          mpvcore/asxparser.c \
-          mpvcore/av_common.c \
-          mpvcore/av_log.c \
-          mpvcore/av_opts.c \
-          mpvcore/bstr.c \
-          mpvcore/charset_conv.c \
-          mpvcore/codecs.c \
-          mpvcore/cpudetect.c \
-          mpvcore/mp_common.c \
-          mpvcore/mp_msg.c \
-          mpvcore/mp_ring.c \
-          mpvcore/playlist.c \
-          mpvcore/playlist_parser.c \
-          mpvcore/version.c \
+          misc/charset_conv.c \
+          misc/ring.c \
           options/m_config.c \
           options/m_option.c \
           options/m_property.c \
diff --git a/options/m_config.c b/options/m_config.c
index 5040482c84..d9a3343ab7 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -32,7 +32,7 @@
 
 #include "m_config.h"
 #include "options/m_option.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 static const union m_option_value default_value;
 
diff --git a/options/m_config.h b/options/m_config.h
index 8a8865d68e..1f03a9abea 100644
--- a/options/m_config.h
+++ b/options/m_config.h
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 // m_config provides an API to manipulate the config variables in MPlayer.
 // It makes use of the Options API to provide a context stack that
diff --git a/options/m_option.c b/options/m_option.c
index b4bd50a23f..d93c18ee52 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -36,8 +36,8 @@
 #include <libavutil/avstring.h>
 
 #include "talloc.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
 #include "m_option.h"
 #include "m_config.h"
 
diff --git a/options/m_option.h b/options/m_option.h
index dfc9e28a9b..041915bbc1 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "config.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "audio/chmap.h"
 
 // m_option allows to parse, print and copy data of various types.
diff --git a/options/m_property.c b/options/m_property.c
index 38f6a742c9..d01a2cabd7 100644
--- a/options/m_property.c
+++ b/options/m_property.c
@@ -32,8 +32,8 @@
 #include "talloc.h"
 #include "m_option.h"
 #include "m_property.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_common.h"
+#include "common/msg.h"
+#include "common/common.h"
 
 const struct m_option_type m_option_type_dummy = {
     .name = "Unknown",
diff --git a/options/parse_commandline.c b/options/parse_commandline.c
index a6feee82c3..182844ccc9 100644
--- a/options/parse_commandline.c
+++ b/options/parse_commandline.c
@@ -25,11 +25,11 @@
 #include <assert.h>
 #include <stdbool.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "m_option.h"
 #include "m_config.h"
-#include "mpvcore/playlist.h"
-#include "mpvcore/playlist_parser.h"
+#include "common/playlist.h"
+#include "common/playlist_parser.h"
 #include "parse_commandline.h"
 
 #define GLOBAL 0
diff --git a/options/parse_configfile.c b/options/parse_configfile.c
index f82e740df9..af88d1aa62 100644
--- a/options/parse_configfile.c
+++ b/options/parse_configfile.c
@@ -28,7 +28,7 @@
 #include "osdep/io.h"
 
 #include "parse_configfile.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "m_option.h"
 #include "m_config.h"
 
diff --git a/options/path.c b/options/path.c
index a2b2f135c5..43c2c0fb80 100644
--- a/options/path.c
+++ b/options/path.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/path.h"
 #include "talloc.h"
 #include "osdep/io.h"
diff --git a/options/path.h b/options/path.h
index e0c61321d2..e3de212ef3 100644
--- a/options/path.h
+++ b/options/path.h
@@ -22,7 +22,7 @@
 #define MPLAYER_PATH_H
 
 #include <stdbool.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 
 // Search for the input filename in several paths. These include user and global
diff --git a/osdep/getch2.c b/osdep/getch2.c
index e07594170a..054b9bf63f 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -41,8 +41,8 @@
 
 #include <unistd.h>
 
-#include "mpvcore/mp_common.h"
-#include "mpvcore/bstr.h"
+#include "common/common.h"
+#include "bstr/bstr.h"
 #include "input/input.h"
 #include "input/keycodes.h"
 #include "getch2.h"
diff --git a/osdep/priority.c b/osdep/priority.c
index 211ab8bd31..3868f09078 100644
--- a/osdep/priority.c
+++ b/osdep/priority.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "priority.h"
 
diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c
index 72b96675c7..802e0e52a1 100644
--- a/osdep/timer-darwin.c
+++ b/osdep/timer-darwin.c
@@ -24,7 +24,7 @@
 #include <mach/mach_time.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "timer.h"
 
 static double timebase_ratio;
diff --git a/player/audio.c b/player/audio.c
index 32f93d869a..ab91834aa8 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -25,9 +25,9 @@
 #include "config.h"
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "audio/mixer.h"
 #include "audio/audio.h"
diff --git a/player/command.c b/player/command.c
index 532372e3ca..3199bd4137 100644
--- a/player/command.c
+++ b/player/command.c
@@ -32,14 +32,14 @@
 #include "talloc.h"
 #include "command.h"
 #include "osdep/timer.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "input/input.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
 #include "demux/stheader.h"
 #include "stream/resolve/resolve.h"
-#include "mpvcore/playlist.h"
-#include "mpvcore/playlist_parser.h"
+#include "common/playlist.h"
+#include "common/playlist_parser.h"
 #include "sub/osd.h"
 #include "sub/dec_sub.h"
 #include "options/m_option.h"
diff --git a/player/configfiles.c b/player/configfiles.c
index 01b05ec6bc..37d081b953 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -31,11 +31,11 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/path.h"
 #include "options/m_config.h"
 #include "options/parse_configfile.h"
-#include "mpvcore/playlist.h"
+#include "common/playlist.h"
 #include "options/options.h"
 #include "options/m_property.h"
 
diff --git a/player/core.h b/player/core.h
index 551b902f9d..a344b92ac3 100644
--- a/player/core.h
+++ b/player/core.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/options.h"
 
 // definitions used internally by the core player code
diff --git a/player/dvdnav.c b/player/dvdnav.c
index 6aad6f77ac..e90a65e035 100644
--- a/player/dvdnav.c
+++ b/player/dvdnav.c
@@ -20,8 +20,8 @@
 
 #include "core.h"
 
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_common.h"
+#include "common/msg.h"
+#include "common/common.h"
 #include "input/input.h"
 
 #include "stream/stream_dvdnav.h"
diff --git a/player/loadfile.c b/player/loadfile.c
index 7132ca972e..12a8568973 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -30,15 +30,15 @@
 #include "osdep/io.h"
 #include "osdep/timer.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/path.h"
 #include "options/m_config.h"
 #include "options/parse_configfile.h"
-#include "mpvcore/playlist.h"
+#include "common/playlist.h"
 #include "options/options.h"
 #include "options/m_property.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/encode.h"
+#include "common/common.h"
+#include "common/encode.h"
 #include "input/input.h"
 
 #include "audio/mixer.h"
diff --git a/player/lua.c b/player/lua.c
index 56a9d74332..f75bc96531 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -7,13 +7,13 @@
 
 #include "talloc.h"
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/m_property.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "input/input.h"
 #include "options/path.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "osdep/timer.h"
 #include "sub/osd.h"
 #include "core.h"
diff --git a/player/main.c b/player/main.c
index dfab92eefc..b421f2791a 100644
--- a/player/main.c
+++ b/player/main.c
@@ -32,20 +32,20 @@
 #include "osdep/priority.h"
 #include "osdep/timer.h"
 
-#include "mpvcore/av_log.h"
-#include "mpvcore/codecs.h"
-#include "mpvcore/cpudetect.h"
-#include "mpvcore/encode.h"
+#include "common/av_log.h"
+#include "common/codecs.h"
+#include "common/cpudetect.h"
+#include "common/encode.h"
 #include "options/m_config.h"
 #include "options/m_option.h"
 #include "options/m_property.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mpv_global.h"
+#include "common/common.h"
+#include "common/msg.h"
+#include "common/global.h"
 #include "options/parse_configfile.h"
 #include "options/parse_commandline.h"
-#include "mpvcore/playlist.h"
-#include "mpvcore/playlist_parser.h"
+#include "common/playlist.h"
+#include "common/playlist_parser.h"
 #include "options/options.h"
 #include "input/input.h"
 
diff --git a/player/misc.c b/player/misc.c
index f57695dae1..eb8c0c147e 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -26,12 +26,12 @@
 #include "osdep/io.h"
 #include "osdep/timer.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 #include "options/m_property.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/encode.h"
-#include "mpvcore/playlist.h"
+#include "common/common.h"
+#include "common/encode.h"
+#include "common/playlist.h"
 #include "input/input.h"
 
 #include "audio/out/ao.h"
diff --git a/player/osd.c b/player/osd.c
index 1ee8c52aa5..6f73ea9bc3 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -26,11 +26,11 @@
 #include "config.h"
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/m_property.h"
-#include "mpvcore/encode.h"
+#include "common/encode.h"
 
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
diff --git a/player/playloop.c b/player/playloop.c
index cb6b72f710..777d86e974 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -25,12 +25,12 @@
 #include "config.h"
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/encode.h"
+#include "common/common.h"
+#include "common/encode.h"
 #include "options/m_property.h"
-#include "mpvcore/playlist.h"
+#include "common/playlist.h"
 #include "input/input.h"
 
 #include "osdep/timer.h"
diff --git a/player/screenshot.c b/player/screenshot.c
index fd09474904..94fc25f563 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -28,8 +28,8 @@
 #include "screenshot.h"
 #include "core.h"
 #include "command.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_msg.h"
+#include "bstr/bstr.h"
+#include "common/msg.h"
 #include "options/path.h"
 #include "video/mp_image.h"
 #include "video/decode/dec_video.h"
diff --git a/player/sub.c b/player/sub.c
index ea6eaee89a..69ab7e3584 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -25,9 +25,9 @@
 #include "config.h"
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "stream/stream.h"
 #include "sub/dec_sub.h"
diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c
index 48336ed467..48b35d5b04 100644
--- a/player/timeline/tl_cue.c
+++ b/player/timeline/tl_cue.c
@@ -25,11 +25,11 @@
 #include "talloc.h"
 
 #include "player/core.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "demux/demux.h"
 #include "options/path.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
 #include "stream/stream.h"
 
 // used by demuxer_cue.c
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c
index 4b52ad834f..8f793006d6 100644
--- a/player/timeline/tl_matroska.c
+++ b/player/timeline/tl_matroska.c
@@ -31,13 +31,13 @@
 #include "talloc.h"
 
 #include "player/core.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "demux/demux.h"
 #include "options/path.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/playlist.h"
-#include "mpvcore/playlist_parser.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
+#include "common/playlist.h"
+#include "common/playlist_parser.h"
 #include "stream/stream.h"
 
 struct find_entry {
diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c
index 6a41bcb3c3..95bb03e2d8 100644
--- a/player/timeline/tl_mpv_edl.c
+++ b/player/timeline/tl_mpv_edl.c
@@ -25,11 +25,11 @@
 #include "talloc.h"
 
 #include "player/core.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "demux/demux.h"
 #include "options/path.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
 #include "stream/stream.h"
 
 struct tl_part {
diff --git a/player/video.c b/player/video.c
index fd3f4ed658..7f4f7a6795 100644
--- a/player/video.c
+++ b/player/video.c
@@ -25,10 +25,10 @@
 #include "config.h"
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/encode.h"
+#include "common/common.h"
+#include "common/encode.h"
 #include "options/m_property.h"
 
 #include "audio/out/ao.h"
diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c
index 2cf0382150..880817a94e 100644
--- a/stream/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
@@ -24,7 +24,7 @@
 
 #include <alsa/asoundlib.h>
 #include "audio_in.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 int ai_alsa_setup(audio_in_t *ai)
 {
diff --git a/stream/ai_oss.c b/stream/ai_oss.c
index b5829ea07a..bf57ec4198 100644
--- a/stream/ai_oss.c
+++ b/stream/ai_oss.c
@@ -39,7 +39,7 @@
 #include "osdep/io.h"
 
 #include "audio_in.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 int ai_oss_set_samplerate(audio_in_t *ai)
 {
diff --git a/stream/ai_sndio.c b/stream/ai_sndio.c
index b486bb9210..08ddac1e03 100644
--- a/stream/ai_sndio.c
+++ b/stream/ai_sndio.c
@@ -5,7 +5,7 @@
 
 #include <sndio.h>
 #include "audio_in.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 int ai_sndio_setup(audio_in_t *ai)
 {
diff --git a/stream/audio_in.c b/stream/audio_in.c
index 605e144f71..1d80ab762b 100644
--- a/stream/audio_in.c
+++ b/stream/audio_in.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include "audio_in.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include <string.h>
 #include <errno.h>
 
diff --git a/stream/cache.c b/stream/cache.c
index 1884dcfb18..5f01275674 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -52,10 +52,10 @@
 #include "osdep/timer.h"
 #include "osdep/threads.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 
 // Note: (struct priv*)(cache->priv)->cache == cache
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 43180448a3..6398809a0a 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "cdd.h"
 
 /*******************************************************************************************************************
diff --git a/stream/cookies.c b/stream/cookies.c
index f4d5b863f4..3fcf11b68f 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -35,7 +35,7 @@
 
 #include "options/options.h"
 #include "cookies.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #define MAX_COOKIES 20
 
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index ddeabd2385..0e40ea088f 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -39,7 +39,7 @@
 #include "osdep/io.h"
 #include "dvbin.h"
 #include "dvb_tune.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 
 
diff --git a/stream/rar.c b/stream/rar.c
index 00c5c16725..cb54c6ebbb 100644
--- a/stream/rar.c
+++ b/stream/rar.c
@@ -32,7 +32,7 @@
 #include <libavutil/intreadwrite.h>
 
 #include "talloc.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "stream.h"
 #include "rar.h"
 
diff --git a/stream/resolve/resolve_quvi.c b/stream/resolve/resolve_quvi.c
index b45995dad8..4baaca2528 100644
--- a/stream/resolve/resolve_quvi.c
+++ b/stream/resolve/resolve_quvi.c
@@ -19,7 +19,7 @@
 #include <quvi/quvi.h>
 
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 #include "resolve.h"
 
diff --git a/stream/resolve/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c
index 62464be0b5..ed8a95502c 100644
--- a/stream/resolve/resolve_quvi9.c
+++ b/stream/resolve/resolve_quvi9.c
@@ -22,9 +22,9 @@
 #include <quvi.h>
 
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/playlist.h"
+#include "common/playlist.h"
 #include "resolve.h"
 
 static bool mp_quvi_ok(quvi_t q)
diff --git a/stream/stream.c b/stream/stream.c
index 7ceecf390e..e0694d8f3c 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -37,9 +37,9 @@
 
 #include "config.h"
 
-#include "mpvcore/mp_common.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "bstr/bstr.h"
+#include "common/msg.h"
 #include "options/path.h"
 #include "osdep/timer.h"
 #include "stream.h"
diff --git a/stream/stream.h b/stream/stream.h
index cea45c5285..e1dc2a91d0 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -20,7 +20,7 @@
 #define MPLAYER_STREAM_H
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index 9f11a917d2..be7a846e56 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -37,7 +37,7 @@
 
 #include "config.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "stream.h"
 
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 48f5a7b465..bc026843c8 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -48,7 +48,7 @@
 
 #include "cdd.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 typedef struct {
     cdrom_drive_t *cd;
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index b3be35fd27..b57e4d9e7e 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include <libgen.h>
 #include <errno.h>
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index 8cf3f5e4b1..31d045ae5b 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -41,7 +41,7 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/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_dvdnav.c b/stream/stream_dvdnav.c
index 168091155d..b9339e70e0 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -29,7 +29,7 @@
 #include <dvdnav/dvdnav.h>
 
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "input/input.h"
 #include "options/m_option.h"
 #include "osdep/timer.h"
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 73de4c266d..9f88e5bf6e 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -29,7 +29,7 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 #include "options/m_option.h"
 
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index d3aaf52d85..5a14cbdeb5 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -22,13 +22,13 @@
 
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 #include "options/m_option.h"
 
 #include "cookies.h"
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "talloc.h"
 
 static int open_f(stream_t *stream, int mode);
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index a89e70b2c6..29ea354293 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -44,7 +44,7 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream.h"
 #include "pvr.h"
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index b3fd501e33..754b217720 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -43,7 +43,7 @@
 
 #include "stream.h"
 #include "options/m_option.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream_radio.h"
 
 #include "osdep/io.h"
diff --git a/stream/stream_rar.c b/stream/stream_rar.c
index 1cab4a8f48..5b6880fbe1 100644
--- a/stream/stream_rar.c
+++ b/stream/stream_rar.c
@@ -33,7 +33,7 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 #include "options/m_option.h"
 #include "rar.h"
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index 2ec3c83d8d..804c5e9df4 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -23,7 +23,7 @@
 #include <libsmbclient.h>
 #include <unistd.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 #include "options/m_option.h"
 
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 4b591aba46..2460bc65b6 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -24,7 +24,7 @@
 #include <windows.h>
 #endif
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 #include "options/m_option.h"
 
diff --git a/stream/tv.c b/stream/tv.c
index 49d69b7865..594af4fd30 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -35,7 +35,7 @@
 #include "config.h"
 
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream.h"
 #include "demux/demux.h"
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 88c78b7965..6132ad7708 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -57,7 +57,7 @@ known issues:
 #if HAVE_LIBV4L2
 #include <libv4l2.h>
 #endif
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/img_fourcc.h"
 #include "audio/format.h"
 #include "tv.h"
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index 9a1965e459..85a58fcf61 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -26,7 +26,7 @@
 
 #include <libavutil/intreadwrite.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 //=================== VideoCD ==========================
 
diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 795e0567b5..a81d9c481d 100644
--- a/stream/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
@@ -33,7 +33,7 @@
 #include <IOKit/storage/IOCDMedia.h>
 #include <IOKit/storage/IOCDMediaBSDClient.h>
 #include "compat/mpbswap.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream.h"
 
 //=================== VideoCD ==========================
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index 489c969505..0765163b35 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 "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 //=================== VideoCD ==========================
 #define	CDROM_LEADOUT	0xAA
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h
index 10ca833574..d5d4032050 100644
--- a/stream/vcd_read_win32.h
+++ b/stream/vcd_read_win32.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ntddcdrm.h>
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 typedef struct mp_vcd_priv_st mp_vcd_priv_t;
 
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 75178d804d..cdf302f959 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -30,7 +30,7 @@
 #include <libavutil/common.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/path.h"
 #include "ass_mp.h"
 #include "osd.h"
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index c5d45f81df..9a948cd036 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -27,8 +27,8 @@
 #include "sd.h"
 #include "dec_sub.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/charset_conv.h"
+#include "common/msg.h"
+#include "misc/charset_conv.h"
 
 extern const struct sd_functions sd_ass;
 extern const struct sd_functions sd_lavc;
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c
index 2b91befe50..2e92bdaaa5 100644
--- a/sub/draw_bmp.c
+++ b/sub/draw_bmp.c
@@ -25,7 +25,7 @@
 #include <libswscale/swscale.h>
 #include <libavutil/common.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "draw_bmp.h"
 #include "img_convert.h"
 #include "video/mp_image.h"
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index ce23bd50c4..d5f3078793 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -6,10 +6,10 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 #include "options/path.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "sub/find_subfiles.h"
 
 static const char *sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt",
diff --git a/sub/osd.c b/sub/osd.c
index 2432859782..ac2b40499a 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -23,7 +23,7 @@
 
 #include <libavutil/common.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "stream/stream.h"
 
@@ -31,7 +31,7 @@
 
 #include "talloc.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "osd.h"
 #include "dec_sub.h"
 #include "img_convert.h"
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 16e90eea1e..3e6efe6667 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -25,8 +25,8 @@
 #include "config.h"
 
 #include "talloc.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
 #include "osd.h"
 
 static const char osd_font_pfb[] =
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index a8d5be633d..93a3c7e380 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -26,8 +26,8 @@
 #include "talloc.h"
 
 #include "options/options.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
 #include "video/csputils.h"
 #include "video/mp_image.h"
 #include "dec_sub.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 0e7121a279..1977ca3fff 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -22,8 +22,8 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_common.h"
+#include "common/msg.h"
+#include "common/av_common.h"
 #include "options/options.h"
 #include "video/mp_image.h"
 #include "sd.h"
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c
index 24ea2c10c6..0fa3986e3d 100644
--- a/sub/sd_lavc_conv.c
+++ b/sub/sd_lavc_conv.c
@@ -25,9 +25,9 @@
 #include "config.h"
 
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "common/av_common.h"
+#include "bstr/bstr.h"
 #include "sd.h"
 
 #if LIBAVCODEC_VERSION_MICRO >= 100
diff --git a/sub/sd_lavf_srt.c b/sub/sd_lavf_srt.c
index 3e2ebefab2..0a48afa990 100644
--- a/sub/sd_lavf_srt.c
+++ b/sub/sd_lavf_srt.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "sd.h"
 
 /*
diff --git a/sub/sd_microdvd.c b/sub/sd_microdvd.c
index c0e9fa1d61..e9c7a788bc 100644
--- a/sub/sd_microdvd.c
+++ b/sub/sd_microdvd.c
@@ -27,8 +27,8 @@
 #include <ctype.h>
 #include <libavutil/common.h>
 
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
 #include "sd.h"
 
 struct line {
diff --git a/sub/sd_srt.c b/sub/sd_srt.c
index 343f218190..c08f927c4a 100644
--- a/sub/sd_srt.c
+++ b/sub/sd_srt.c
@@ -27,8 +27,8 @@
 #include <ctype.h>
 #include <libavutil/common.h>
 
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
 #include "sd.h"
 
 struct line {
diff --git a/sub/spudec.c b/sub/spudec.c
index 5a2c094be9..79b0b2eb93 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -40,11 +40,11 @@
 #include <libavutil/intreadwrite.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "spudec.h"
 #include "osd.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "video/csputils.h"
 
 typedef struct spu_packet_t packet_t;
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 06b00be84f..b150816a90 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -24,14 +24,14 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "osdep/timer.h"
 
 #include "stream/stream.h"
 #include "demux/packet.h"
 
-#include "mpvcore/codecs.h"
+#include "common/codecs.h"
 
 #include "video/out/vo.h"
 #include "video/csputils.h"
diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c
index f1a270a7c7..8a9ff4ae50 100644
--- a/video/decode/vaapi.c
+++ b/video/decode/vaapi.c
@@ -28,8 +28,8 @@
 #include <X11/Xlib.h>
 
 #include "lavc.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/av_common.h"
+#include "common/common.h"
+#include "common/av_common.h"
 #include "video/fmt-conversion.h"
 #include "video/vaapi.h"
 #include "video/mp_image_pool.h"
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 506481cf1c..8a8d2b6abc 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -32,12 +32,12 @@
 
 #include "talloc.h"
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/av_opts.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/codecs.h"
+#include "bstr/bstr.h"
+#include "common/av_opts.h"
+#include "common/av_common.h"
+#include "common/codecs.h"
 
 #include "compat/mpbswap.h"
 #include "video/fmt-conversion.h"
diff --git a/video/decode/vda.c b/video/decode/vda.c
index c20bdc9b5f..7a21c5e10a 100644
--- a/video/decode/vda.c
+++ b/video/decode/vda.c
@@ -20,8 +20,8 @@
 #include <libavcodec/version.h>
 #include <libavcodec/vda.h>
 
-#include "mpvcore/av_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/av_common.h"
+#include "common/msg.h"
 #include "video/mp_image.h"
 #include "video/decode/lavc.h"
 #include "config.h"
diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c
index 02eab84a0c..c7a5361c15 100644
--- a/video/decode/vdpau.c
+++ b/video/decode/vdpau.c
@@ -23,8 +23,8 @@
 #include <libavutil/common.h>
 
 #include "lavc.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/av_common.h"
+#include "common/common.h"
+#include "common/av_common.h"
 #include "video/fmt-conversion.h"
 #include "video/vdpau.h"
 #include "video/hwdec.h"
diff --git a/video/filter/pullup.c b/video/filter/pullup.c
index 2421720d70..14c31dc365 100644
--- a/video/filter/pullup.c
+++ b/video/filter/pullup.c
@@ -21,8 +21,8 @@
 #include <string.h>
 #include "config.h"
 #include "pullup.h"
-#include "mpvcore/cpudetect.h"
-#include "mpvcore/mp_common.h"
+#include "common/cpudetect.h"
+#include "common/common.h"
 
 
 
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 4143a835b1..77a86501ad 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "options/m_config.h"
 
diff --git a/video/filter/vf.h b/video/filter/vf.h
index 5892247556..96f4aaef7e 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 
 #include "video/mp_image.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 
 #include "video/vfcap.h"
 
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index dde297f910..cd286910ab 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index 0c80bec057..d1e7ea1c4a 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -28,8 +28,8 @@
 #include <errno.h>
 #include <math.h>
 
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "vf.h"
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index 6c8574039d..bf0b7426b4 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -23,8 +23,8 @@
 #include <math.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 #include "libavutil/common.h"
 #include "compat/mpbswap.h"
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 4b7551167b..dedafda85c 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c
index ed4d3ef871..158b1825cc 100644
--- a/video/filter/vf_dsize.c
+++ b/video/filter/vf_dsize.c
@@ -23,7 +23,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c
index 542627cb3b..b5a898a58f 100644
--- a/video/filter/vf_eq.c
+++ b/video/filter/vf_eq.c
@@ -30,8 +30,8 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index fe4b8baccb..e4d9f2dd33 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -24,7 +24,7 @@
 #include <libavutil/common.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c
index 7c652e1138..2dde098c51 100644
--- a/video/filter/vf_flip.c
+++ b/video/filter/vf_flip.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "video/mp_image.h"
 #include "vf.h"
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index bdbefec542..9ac6fa9119 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c
index ea3b615caa..87464d5bb6 100644
--- a/video/filter/vf_gradfun.c
+++ b/video/filter/vf_gradfun.c
@@ -36,7 +36,7 @@
 #include <libavutil/common.h>
 
 #include "config.h"
-#include "mpvcore/cpudetect.h"
+#include "common/cpudetect.h"
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "vf.h"
diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c
index 07cea5ad28..883c495f22 100644
--- a/video/filter/vf_hqdn3d.c
+++ b/video/filter/vf_hqdn3d.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c
index d79f557652..2ae129f6de 100644
--- a/video/filter/vf_ilpack.c
+++ b/video/filter/vf_ilpack.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c
index 98216c08e4..b20383881a 100644
--- a/video/filter/vf_lavfi.c
+++ b/video/filter/vf_lavfi.c
@@ -36,9 +36,9 @@
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
-#include "mpvcore/av_opts.h"
+#include "common/av_opts.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_lavfi.h b/video/filter/vf_lavfi.h
index aef8a93448..48b658041d 100644
--- a/video/filter/vf_lavfi.h
+++ b/video/filter/vf_lavfi.h
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "vf.h"
 
 struct vf_lw_opts;
diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c
index 36232f7f2b..2cf9e4a78d 100644
--- a/video/filter/vf_mirror.c
+++ b/video/filter/vf_mirror.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c
index 50f9f7f26f..1529cfadfc 100644
--- a/video/filter/vf_noformat.c
+++ b/video/filter/vf_noformat.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 0f20cfc353..72c02b22ad 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -25,8 +25,8 @@
 #include <math.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c
index 2a8b9dfc61..38668f6d8e 100644
--- a/video/filter/vf_phase.c
+++ b/video/filter/vf_phase.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index c49ed218b5..111ab798ef 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -24,8 +24,8 @@
 #include <assert.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index a0d2c7da26..4fb51fe9d0 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -21,8 +21,8 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c
index bbb02647d1..b767d37c4b 100644
--- a/video/filter/vf_rotate.c
+++ b/video/filter/vf_rotate.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index c80113f6fd..7d935462a0 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -25,7 +25,7 @@
 #include <libswscale/swscale.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c
index 4e713bd47f..f2dbba29bf 100644
--- a/video/filter/vf_softpulldown.c
+++ b/video/filter/vf_softpulldown.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index b9d97756fe..c896b4a73b 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index e9f056e113..d2b97d8e30 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -28,7 +28,7 @@
 #include <libavutil/common.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c
index 8233d6cab5..eabc5f1ed3 100644
--- a/video/filter/vf_swapuv.c
+++ b/video/filter/vf_swapuv.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "vf.h"
diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c
index 582449ad53..179e9b78ae 100644
--- a/video/filter/vf_unsharp.c
+++ b/video/filter/vf_unsharp.c
@@ -25,8 +25,8 @@
 #include <math.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/cpudetect.h"
+#include "common/msg.h"
+#include "common/cpudetect.h"
 #include "options/m_option.h"
 
 #include "video/img_format.h"
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index 46e59bf741..3eeca30021 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -25,10 +25,10 @@
 #include <math.h>
 
 #include "config.h"
-#include "mpvcore/cpudetect.h"
+#include "common/cpudetect.h"
 #include "options/options.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "vf.h"
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index ab115b0010..2dbbd026bc 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "libavutil/avutil.h"
 #include <libavutil/pixdesc.h>
 #include "video/img_format.h"
diff --git a/video/img_format.h b/video/img_format.h
index e7b6fc5566..10268febaa 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -21,7 +21,7 @@
 
 #include <inttypes.h>
 #include <sys/types.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 #if BYTE_ORDER == BIG_ENDIAN
 #define MP_SELECT_LE_BE(LE, BE) BE
diff --git a/video/mp_image.h b/video/mp_image.h
index f7e7353475..dfb83b3bb1 100644
--- a/video/mp_image.h
+++ b/video/mp_image.h
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "csputils.h"
 #include "video/img_format.h"
 
diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c
index d7f992483e..07cbc94e45 100644
--- a/video/mp_image_pool.c
+++ b/video/mp_image_pool.c
@@ -25,7 +25,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "video/mp_image.h"
 
 #include "mp_image_pool.h"
diff --git a/video/out/aspect.c b/video/out/aspect.c
index 33cf5ebfef..e7167dacde 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -21,7 +21,7 @@
 /* Stuff for correct aspect scaling. */
 #include "aspect.h"
 #include "vo.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "vo.h"
diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
index ff76e70315..35e4f4c176 100644
--- a/video/out/bitmap_packer.c
+++ b/video/out/bitmap_packer.c
@@ -26,8 +26,8 @@
 
 #include "talloc.h"
 #include "bitmap_packer.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_common.h"
+#include "common/msg.h"
+#include "common/common.h"
 #include "sub/dec_sub.h"
 #include "video/memcpy_pic.h"
 
diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index f9d4685a6b..45ff9a0110 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -29,8 +29,8 @@
 #include <stdbool.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
 
 #include "vo.h"
 #include "video/csputils.h"
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index 919ab2e657..f6d01948e8 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -27,9 +27,9 @@
 #include "config.h"
 
 #include "stream/stream.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "bstr/bstr.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "options/path.h"
 
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index b3728eef44..b27638b904 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -30,7 +30,7 @@
 
 #include "gl_video.h"
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "gl_common.h"
 #include "gl_osd.h"
 #include "filter_kernels.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index ab8a92fd9e..5b29becbef 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -33,13 +33,13 @@
 #include "config.h"
 #include "osdep/timer.h"
 #include "options/options.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "vo.h"
 #include "aspect.h"
 #include "input/input.h"
 #include "options/m_config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mpv_global.h"
+#include "common/msg.h"
+#include "common/global.h"
 #include "video/mp_image.h"
 #include "video/vfcap.h"
 #include "sub/osd.h"
diff --git a/video/out/vo.h b/video/out/vo.h
index 2c9eec4849..e2881155df 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 
 #include "video/img_format.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/options.h"
 
 #define VO_EVENT_EXPOSE 1
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index 89f52a8937..13885b510e 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -42,7 +42,7 @@
 
 #include "input/keycodes.h"
 #include "input/input.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "input/input.h"
 
 /* caca stuff */
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 52627d3d32..6e189bc660 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -37,7 +37,7 @@
 #include "video/mp_image.h"
 #include "video/img_format.h"
 #include "video/memcpy_pic.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "w32_common.h"
 #include "libavutil/common.h"
 #include "sub/osd.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index b08f3018b0..2bbdbcd543 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -25,11 +25,11 @@
 #include <libswscale/swscale.h>
 
 #include "config.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "osdep/io.h"
 #include "options/path.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/out/vo.h"
 #include "video/csputils.h"
 #include "video/vfcap.h"
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index 81a4280def..56933e2309 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "compat/libav.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/options.h"
 #include "video/fmt-conversion.h"
 #include "video/mp_image.h"
@@ -31,7 +31,7 @@
 #include "talloc.h"
 #include "vo.h"
 
-#include "mpvcore/encode_lavc.h"
+#include "common/encode_lavc.h"
 
 #include "sub/osd.h"
 
diff --git a/video/out/vo_null.c b/video/out/vo_null.c
index bb20945728..b59eb13e81 100644
--- a/video/out/vo_null.c
+++ b/video/out/vo_null.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "vo.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index d1e0f3d2f0..5f24c7d65e 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -35,9 +35,9 @@
 #include "config.h"
 
 #include "talloc.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "bstr/bstr.h"
+#include "common/msg.h"
 #include "options/m_config.h"
 #include "vo.h"
 #include "video/vfcap.h"
diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c
index 9e39a6197c..351ac05417 100644
--- a/video/out/vo_opengl_old.c
+++ b/video/out/vo_opengl_old.c
@@ -33,7 +33,7 @@
 
 #include "config.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/m_option.h"
 #include "vo.h"
 #include "video/vfcap.h"
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 574b453a6f..cff02731cb 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -33,7 +33,7 @@
 #include "input/input.h"
 #include "input/keycodes.h"
 #include "input/input.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 
 #include "osdep/timer.h"
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index c2d2bb9602..de5e05e4ec 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -29,7 +29,7 @@
 #include <va/va_x11.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/out/vo.h"
 #include "video/memcpy_pic.h"
 #include "sub/osd.h"
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index 1343b54b65..07bb151e88 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #include "video/vdpau.h"
 #include "video/hwdec.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 #include "talloc.h"
 #include "vo.h"
diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c
index 293b3081eb..db73d79a74 100644
--- a/video/out/vo_wayland.c
+++ b/video/out/vo_wayland.c
@@ -33,7 +33,7 @@
 #include "sub/osd.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/sws_utils.h"
 
 #include "wayland_common.h"
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index ead41c51c8..35ca4cda0e 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -52,7 +52,7 @@
 #include "video/sws_utils.h"
 #include "video/fmt-conversion.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "options/options.h"
 #include "osdep/timer.h"
 
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index 1fa4323beb..7cd63fe965 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -45,7 +45,7 @@
 
 #include "options/options.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "vo.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index b8fe0309af..c4fb227601 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -25,8 +25,8 @@
 #include "options/options.h"
 #include "input/keycodes.h"
 #include "input/input.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_common.h"
+#include "common/msg.h"
+#include "common/common.h"
 #include "vo.h"
 #include "aspect.h"
 #include "w32_common.h"
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 5a078b775e..e45483c5f2 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -31,9 +31,9 @@
 #include <linux/input.h>
 
 #include "config.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "libavutil/common.h"
 #include "talloc.h"
 
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index adc5ac1b21..a042bd0968 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -23,9 +23,9 @@
 #include <limits.h>
 
 #include "config.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "input/input.h"
 #include "libavutil/common.h"
 #include "x11_common.h"
diff --git a/video/sws_utils.c b/video/sws_utils.c
index 3bc6bc4910..5455c7d51b 100644
--- a/video/sws_utils.c
+++ b/video/sws_utils.c
@@ -24,12 +24,12 @@
 
 #include "sws_utils.h"
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "video/mp_image.h"
 #include "video/img_format.h"
 #include "fmt-conversion.h"
 #include "csputils.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "video/filter/vf.h"
 
 //global sws_flags from the command line
diff --git a/video/vaapi.c b/video/vaapi.c
index 4607be9052..3bc54b69db 100644
--- a/video/vaapi.c
+++ b/video/vaapi.c
@@ -18,8 +18,8 @@
 #include <assert.h>
 
 #include "vaapi.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
 #include "mp_image.h"
 #include "img_format.h"
 #include "mp_image_pool.h"
diff --git a/video/vdpau.h b/video/vdpau.h
index 9b67025347..069b9a0f55 100644
--- a/video/vdpau.h
+++ b/video/vdpau.h
@@ -7,7 +7,7 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #define CHECK_ST_ERROR(message) \
     do { \
diff --git a/wscript_build.py b/wscript_build.py
index 16668f8c36..d2495d3b68 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -162,22 +162,22 @@ def build(ctx):
         ( "audio/out/ao_sndio.c",                "sndio" ),
         ( "audio/out/ao_wasapi.c",               "wasapi" ),
 
+        ## Bstr
+        ( "bstr/bstr.c" ),
+
         ## Core
-        ( "mpvcore/asxparser.c" ),
-        ( "mpvcore/av_common.c" ),
-        ( "mpvcore/av_log.c" ),
-        ( "mpvcore/av_opts.c" ),
-        ( "mpvcore/bstr.c" ),
-        ( "mpvcore/charset_conv.c" ),
-        ( "mpvcore/codecs.c" ),
-        ( "mpvcore/cpudetect.c" ),
-        ( "mpvcore/encode_lavc.c",               "encoding" ),
-        ( "mpvcore/mp_common.c" ),
-        ( "mpvcore/mp_msg.c" ),
-        ( "mpvcore/mp_ring.c" ),
-        ( "mpvcore/playlist.c" ),
-        ( "mpvcore/playlist_parser.c" ),
-        ( "mpvcore/version.c" ),
+        ( "common/asxparser.c" ),
+        ( "common/av_common.c" ),
+        ( "common/av_log.c" ),
+        ( "common/av_opts.c" ),
+        ( "common/codecs.c" ),
+        ( "common/cpudetect.c" ),
+        ( "common/encode_lavc.c",                "encoding" ),
+        ( "common/common.c" ),
+        ( "common/msg.c" ),
+        ( "common/playlist.c" ),
+        ( "common/playlist_parser.c" ),
+        ( "common/version.c" ),
 
         ## Demuxers
         ( "demux/codec_tags.c" ),
@@ -199,6 +199,10 @@ def build(ctx):
         ( "input/joystick.c",                    "joystick" ),
         ( "input/lirc.c",                        "lirc" ),
 
+        ## Misc
+        ( "misc/ring.c" ),
+        ( "misc/charset_conv.c" ),
+
         ## Options
         ( "options/m_config.c" ),
         ( "options/m_option.c" ),