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

66 files changed, 100 insertions, 100 deletions

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 { \