15 files changed, 12 insertions, 20 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 350f5f16b2..1d33742bc5 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -28,17 +28,15 @@
 #include <libavutil/intreadwrite.h>
 #include <libavutil/pixdesc.h>
 
-#include "compat/libav.h"
-
 #include "talloc.h"
 #include "config.h"
 #include "common/msg.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/av_common.h"
 #include "common/codecs.h"
 
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 #include "video/fmt-conversion.h"
 
 #include "vd.h"
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index 093aa2883b..79abd94065 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "common/msg.h"
 #include "options/m_option.h"
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 11c4044483..eac1aa79a9 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -32,7 +32,6 @@
 #include "video/mp_image.h"
 #include "vf.h"
 #include "video/fmt-conversion.h"
-#include "compat/mpbswap.h"
 
 #include "video/sws_utils.h"
 
diff --git a/video/image_writer.c b/video/image_writer.c
index c6da4ff7e5..122379f725 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -23,8 +23,6 @@
 #include <libavcodec/avcodec.h>
 #include <libavutil/mem.h>
 
-#include "compat/libav.h"
-
 #include "config.h"
 
 #if HAVE_JPEG
diff --git a/video/img_format.c b/video/img_format.c
index 9290a598bb..e838b5ca55 100644
--- a/video/img_format.c
+++ b/video/img_format.c
@@ -22,8 +22,6 @@
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
 
-#include "compat/libav.h"
-
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "video/fmt-conversion.h"
diff --git a/video/img_format.h b/video/img_format.h
index 03ae1e91d3..3eb6ba16a8 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "osdep/endian.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #if BYTE_ORDER == BIG_ENDIAN
 #define MP_SELECT_LE_BE(LE, BE) BE
diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index 2c6ae92224..21c276fb85 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include "common/msg.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #include "vo.h"
 #include "video/csputils.h"
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index b8416bea30..71fe66eb0a 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -28,7 +28,7 @@
 
 #include "stream/stream.h"
 #include "common/common.h"
-#include "bstr/bstr.h"
+#include "misc/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 359013a6e6..5cf832d201 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -30,7 +30,7 @@
 
 #include "gl_video.h"
 
-#include "bstr/bstr.h"
+#include "misc/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 5b63f3cfc2..f7f0f1664a 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -36,7 +36,7 @@
 #include "misc/dispatch.h"
 #include "misc/rendezvous.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "vo.h"
 #include "aspect.h"
 #include "input/input.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index da6d78f3d8..991265da23 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -25,7 +25,7 @@
 #include <libswscale/swscale.h>
 
 #include "config.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "osdep/io.h"
 #include "options/path.h"
 #include "talloc.h"
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index aa42bc6e1b..da6817d0ca 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "compat/libav.h"
 #include "common/common.h"
 #include "options/options.h"
 #include "video/fmt-conversion.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index a3be9bb1e7..3b6e3a2e43 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -36,7 +36,7 @@
 
 #include "talloc.h"
 #include "common/common.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/msg.h"
 #include "options/m_config.h"
 #include "vo.h"
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index e560faccd2..c7cbf2fb2f 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -31,7 +31,7 @@
 #include <linux/input.h>
 
 #include "config.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "options/options.h"
 #include "common/msg.h"
 #include "talloc.h"
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 6d5485edf2..e9389c5f38 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -23,7 +23,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "options/options.h"
 #include "common/common.h"
 #include "common/msg.h"