6 files changed, 8 insertions, 9 deletions
diff --git a/audio/filter/af.h b/audio/filter/af.h
index edce49a978..31abe1edee 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -23,11 +23,10 @@
 
 #include "config.h"
 
-#include "options.h"
-#include "libaf/format.h"
+#include "core/options.h"
+#include "audio/format.h"
 #include "control.h"
-#include "cpudetect.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
 
 struct af_instance;
 
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index ccbf3794c5..aebcc3b201 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "af.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
 
 /// Internal specific data of the filter
 struct af_bs2b {
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index 441ec31ac3..2e25d8a642 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 
 #include "af.h"
-#include "path.h"
+#include "core/path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mpv-af_export" /* default file name
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c
index 4ac9caaa85..6192091f5a 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include "af.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
 
 /* Functions used by play to convert the input audio to the correct
    format */
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index ad78266ad3..b54f5bf61e 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -32,7 +32,7 @@
 
 #include "config.h"
 #include "af.h"
-#include "reorder_ch.h"
+#include "audio/reorder_ch.h"
 
 
 #define AC3_MAX_CHANNELS 6
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index 0bbc220997..cf326fedfb 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -38,7 +38,7 @@
 
 #include "af.h"
 #include "libavutil/common.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
 
 // Data for specific instances of this filter
 typedef struct af_scaletempo_s