9 files changed, 13 insertions, 13 deletions
diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx
index 839e9bd88..d82b7c696 100644
--- a/src/output/OutputCommand.cxx
+++ b/src/output/OutputCommand.cxx
@@ -29,7 +29,7 @@
 #include "OutputAll.hxx"
 #include "OutputInternal.hxx"
 #include "PlayerControl.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "Idle.hxx"
 
 extern unsigned audio_output_state_version;
diff --git a/src/output/OutputControl.cxx b/src/output/OutputControl.cxx
index 234980a52..1532dbd83 100644
--- a/src/output/OutputControl.cxx
+++ b/src/output/OutputControl.cxx
@@ -24,7 +24,7 @@
 #include "OutputInternal.hxx"
 #include "OutputPlugin.hxx"
 #include "OutputError.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "notify.hxx"
 #include "filter/plugins/ReplayGainFilterPlugin.hxx"
 #include "util/Error.hxx"
diff --git a/src/output/OutputFinish.cxx b/src/output/OutputFinish.cxx
index 109662fb0..16b16f5ce 100644
--- a/src/output/OutputFinish.cxx
+++ b/src/output/OutputFinish.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OutputInternal.hxx"
 #include "OutputPlugin.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "filter/FilterInternal.hxx"
 
 #include <assert.h>
diff --git a/src/output/OutputInit.cxx b/src/output/OutputInit.cxx
index 7815dc921..16180a415 100644
--- a/src/output/OutputInit.cxx
+++ b/src/output/OutputInit.cxx
@@ -24,10 +24,10 @@
 #include "OutputAPI.hxx"
 #include "filter/FilterConfig.hxx"
 #include "AudioParser.hxx"
-#include "MixerList.hxx"
-#include "MixerType.hxx"
-#include "MixerControl.hxx"
-#include "mixer/SoftwareMixerPlugin.hxx"
+#include "mixer/MixerList.hxx"
+#include "mixer/MixerType.hxx"
+#include "mixer/MixerControl.hxx"
+#include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/FilterRegistry.hxx"
 #include "filter/plugins/AutoConvertFilterPlugin.hxx"
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index f2e4fc643..f2d6916a5 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "AlsaOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "pcm/PcmExport.hxx"
 #include "util/Manual.hxx"
 #include "util/Error.hxx"
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index cdf055df9..2157a9476 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OssOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "system/fd_util.h"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx
index c133d9796..6bb66450e 100644
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "PulseOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
-#include "mixer/PulseMixerPlugin.hxx"
+#include "mixer/MixerList.hxx"
+#include "mixer/plugins/PulseMixerPlugin.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/src/output/plugins/RoarOutputPlugin.cxx b/src/output/plugins/RoarOutputPlugin.cxx
index 7c1c41b47..1192b2625 100644
--- a/src/output/plugins/RoarOutputPlugin.cxx
+++ b/src/output/plugins/RoarOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "RoarOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/output/plugins/WinmmOutputPlugin.cxx b/src/output/plugins/WinmmOutputPlugin.cxx
index 87861180f..66d49eb9a 100644
--- a/src/output/plugins/WinmmOutputPlugin.cxx
+++ b/src/output/plugins/WinmmOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "WinmmOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "pcm/PcmBuffer.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "util/Macros.hxx"