7 files changed, 7 insertions, 8 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 20e6b8a15e..b1c1e28128 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 #include "common/tags.h"
 #include "packet.h"
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index bfca04dcad..2f2e6fca46 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "demux.h"
 #include "stream/stream.h"
 
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 79565993a4..988c3da4e4 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -39,13 +39,12 @@
 # include <libavutil/display.h>
 #endif
 #include <libavutil/opt.h>
-#include "compat/libav.h"
 
 #include "options/options.h"
 #include "common/msg.h"
 #include "common/tags.h"
 #include "common/av_common.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index dff08ec894..5e2e0f904f 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -44,7 +44,7 @@
 #include "talloc.h"
 #include "common/av_common.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
diff --git a/demux/ebml.c b/demux/ebml.c
index 7e79ee04c8..fdebc4a8ed 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -34,7 +34,7 @@
 #include "talloc.h"
 #include "ebml.h"
 #include "stream/stream.h"
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 #include "common/msg.h"
 
 // Whether the id is a known Matroska level 1 element (allowed as element on
diff --git a/demux/ebml.h b/demux/ebml.h
index a544ad41cf..9d7a0cc924 100644
--- a/demux/ebml.h
+++ b/demux/ebml.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "stream/stream.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct mp_log;
 
diff --git a/demux/ms_hdr.h b/demux/ms_hdr.h
index e44f3589ad..795b070cef 100644
--- a/demux/ms_hdr.h
+++ b/demux/ms_hdr.h
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_MS_HDR_H
 #define MPLAYER_MS_HDR_H
 
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 #include "video/img_fourcc.h"
 
 // These structs must be binary-compatible to the native win32 types,