diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx
index 2f01badc3..a5493a70e 100644
--- a/src/filter/plugins/ReplayGainFilterPlugin.cxx
+++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx
@@ -22,8 +22,8 @@
 #include "filter/Prepared.hxx"
 #include "tag/ReplayGainInfo.hxx"
 #include "config/ReplayGainConfig.hxx"
-#include "mixer/MixerControl.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Control.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "pcm/AudioFormat.hxx"
 #include "pcm/Volume.hxx"
diff --git a/src/mixer/MixerAll.cxx b/src/mixer/All.cxx
similarity index 98%
rename from src/mixer/MixerAll.cxx
rename to src/mixer/All.cxx
index 0f20c05f1..2fe9d7d37 100644
--- a/src/mixer/MixerAll.cxx
+++ b/src/mixer/All.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "output/MultipleOutputs.hxx"
-#include "MixerControl.hxx"
-#include "MixerInternal.hxx"
+#include "Control.hxx"
+#include "Mixer.hxx"
 #include "plugins/NullMixerPlugin.hxx"
 #include "plugins/SoftwareMixerPlugin.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
diff --git a/src/mixer/MixerControl.cxx b/src/mixer/Control.cxx
similarity index 97%
rename from src/mixer/MixerControl.cxx
rename to src/mixer/Control.cxx
index aefd8312f..70e0ff41b 100644
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/Control.cxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "MixerControl.hxx"
-#include "MixerInternal.hxx"
+#include "Control.hxx"
+#include "Mixer.hxx"
 
 #include <cassert>
 
diff --git a/src/mixer/MixerControl.hxx b/src/mixer/Control.hxx
similarity index 100%
rename from src/mixer/MixerControl.hxx
rename to src/mixer/Control.hxx
diff --git a/src/mixer/MixerInternal.hxx b/src/mixer/Mixer.hxx
similarity index 100%
rename from src/mixer/MixerInternal.hxx
rename to src/mixer/Mixer.hxx
diff --git a/src/mixer/MixerType.cxx b/src/mixer/Type.cxx
similarity index 98%
rename from src/mixer/MixerType.cxx
rename to src/mixer/Type.cxx
index 8ac82d075..007586c27 100644
--- a/src/mixer/MixerType.cxx
+++ b/src/mixer/Type.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "MixerType.hxx"
+#include "Type.hxx"
 
 #include <cassert>
 #include <stdexcept>
diff --git a/src/mixer/MixerType.hxx b/src/mixer/Type.hxx
similarity index 100%
rename from src/mixer/MixerType.hxx
rename to src/mixer/Type.hxx
diff --git a/src/mixer/meson.build b/src/mixer/meson.build
index 748895b7b..2d83630fa 100644
--- a/src/mixer/meson.build
+++ b/src/mixer/meson.build
@@ -4,9 +4,9 @@ subdir('plugins')
 
 mixer_glue = static_library(
   'mixer_glue',
-  'MixerControl.cxx',
-  'MixerType.cxx',
-  'MixerAll.cxx',
+  'Control.cxx',
+  'Type.cxx',
+  'All.cxx',
   include_directories: inc,
   dependencies: [
     log_dep,
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index e665449e4..f09b27fc1 100644
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -20,7 +20,7 @@
 #include "AlsaMixerPlugin.hxx"
 #include "lib/alsa/NonBlock.hxx"
 #include "lib/alsa/Error.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "output/OutputAPI.hxx"
 #include "event/MultiSocketMonitor.hxx"
diff --git a/src/mixer/plugins/AndroidMixerPlugin.cxx b/src/mixer/plugins/AndroidMixerPlugin.cxx
index 3be74eecd..0c3c405b6 100644
--- a/src/mixer/plugins/AndroidMixerPlugin.cxx
+++ b/src/mixer/plugins/AndroidMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "AndroidMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"
 #include "android/Context.hxx"
diff --git a/src/mixer/plugins/NullMixerPlugin.cxx b/src/mixer/plugins/NullMixerPlugin.cxx
index 0deaeffe0..5a2b49c3d 100644
--- a/src/mixer/plugins/NullMixerPlugin.cxx
+++ b/src/mixer/plugins/NullMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "NullMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 
 class NullMixer final : public Mixer {
 	/**
diff --git a/src/mixer/plugins/OSXMixerPlugin.cxx b/src/mixer/plugins/OSXMixerPlugin.cxx
index ac7b653a3..a72159988 100644
--- a/src/mixer/plugins/OSXMixerPlugin.cxx
+++ b/src/mixer/plugins/OSXMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "OSXMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "output/plugins/OSXOutputPlugin.hxx"
 
 class OSXMixer final : public Mixer {
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 5bf166649..685079677 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "OssMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "config/Block.hxx"
 #include "io/FileDescriptor.hxx"
 #include "system/Error.hxx"
diff --git a/src/mixer/plugins/PipeWireMixerPlugin.cxx b/src/mixer/plugins/PipeWireMixerPlugin.cxx
index 5851fd777..1b69c951b 100644
--- a/src/mixer/plugins/PipeWireMixerPlugin.cxx
+++ b/src/mixer/plugins/PipeWireMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "PipeWireMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "output/plugins/PipeWireOutputPlugin.hxx"
 
diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx
index 2926ba320..e5713db83 100644
--- a/src/mixer/plugins/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
@@ -20,7 +20,7 @@
 #include "PulseMixerPlugin.hxx"
 #include "lib/pulse/LogError.hxx"
 #include "lib/pulse/LockGuard.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "output/plugins/PulseOutputPlugin.hxx"
 #include "util/NumberParser.hxx"
diff --git a/src/mixer/plugins/SndioMixerPlugin.cxx b/src/mixer/plugins/SndioMixerPlugin.cxx
index 7e966b47c..968e16c9d 100644
--- a/src/mixer/plugins/SndioMixerPlugin.cxx
+++ b/src/mixer/plugins/SndioMixerPlugin.cxx
@@ -17,7 +17,7 @@
  */
 
 #include "SndioMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "output/plugins/SndioOutputPlugin.hxx"
 
 class SndioMixer final : public Mixer {
diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index af0cfe860..e18475b13 100644
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "SoftwareMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"
 
diff --git a/src/mixer/plugins/WasapiMixerPlugin.cxx b/src/mixer/plugins/WasapiMixerPlugin.cxx
index 928e2eee9..f7b2314bb 100644
--- a/src/mixer/plugins/WasapiMixerPlugin.cxx
+++ b/src/mixer/plugins/WasapiMixerPlugin.cxx
@@ -23,7 +23,7 @@
 #include "output/plugins/wasapi/ForMixer.hxx"
 #include "output/plugins/wasapi/AudioClient.hxx"
 #include "output/plugins/wasapi/Device.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "win32/ComPtr.hxx"
 #include "win32/ComWorker.hxx"
 #include "win32/HResult.hxx"
diff --git a/src/mixer/plugins/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx
index dc47649ae..cb460f5eb 100644
--- a/src/mixer/plugins/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "WinmmMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "output/Features.h"
 #include "output/OutputAPI.hxx"
 #include "output/plugins/WinmmOutputPlugin.hxx"
diff --git a/src/output/Control.cxx b/src/output/Control.cxx
index 49aa7a5e9..c46715cb8 100644
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@@ -22,7 +22,7 @@
 #include "Client.hxx"
 #include "Domain.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "config/Block.hxx"
 #include "Log.hxx"
 
diff --git a/src/output/Defaults.cxx b/src/output/Defaults.cxx
index 6e4114645..c561a3d9e 100644
--- a/src/output/Defaults.cxx
+++ b/src/output/Defaults.cxx
@@ -19,7 +19,6 @@
 
 #include "Defaults.hxx"
 #include "config/Data.hxx"
-#include "mixer/MixerType.hxx"
 
 AudioOutputDefaults::AudioOutputDefaults(const ConfigData &config)
 	:normalize(config.GetBool(ConfigOption::VOLUME_NORMALIZATION, false)),
diff --git a/src/output/Defaults.hxx b/src/output/Defaults.hxx
index 84318231c..19d30a07f 100644
--- a/src/output/Defaults.hxx
+++ b/src/output/Defaults.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_AUDIO_OUTPUT_DEFAULTS_HXX
 #define MPD_AUDIO_OUTPUT_DEFAULTS_HXX
 
-#include "mixer/MixerType.hxx"
+#include "mixer/Type.hxx"
 
 struct ConfigData;
 
diff --git a/src/output/Filtered.cxx b/src/output/Filtered.cxx
index 523d44075..ed5402cea 100644
--- a/src/output/Filtered.cxx
+++ b/src/output/Filtered.cxx
@@ -22,7 +22,7 @@
 #include "Domain.hxx"
 #include "lib/fmt/AudioFormatFormatter.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/plugins/ConvertFilterPlugin.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/output/Finish.cxx b/src/output/Finish.cxx
index 24b513b1d..029b4e147 100644
--- a/src/output/Finish.cxx
+++ b/src/output/Finish.cxx
@@ -19,7 +19,7 @@
 
 #include "Filtered.hxx"
 #include "Interface.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "filter/Prepared.hxx"
 
 FilteredAudioOutput::~FilteredAudioOutput()
diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index 29b1c8c6a..535be4e18 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -24,8 +24,8 @@
 #include "Defaults.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
 #include "pcm/AudioParser.hxx"
-#include "mixer/MixerType.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Type.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/plugins/NullMixerPlugin.hxx"
 #include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/LoadChain.hxx"
diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx
index 67269a45d..e59b4b0e1 100644
--- a/src/output/OutputCommand.cxx
+++ b/src/output/OutputCommand.cxx
@@ -27,7 +27,7 @@
 #include "OutputCommand.hxx"
 #include "MultipleOutputs.hxx"
 #include "Client.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/Memento.hxx"
 #include "Idle.hxx"
 
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 5887d14f0..b9329491a 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "NullMixerListener.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/plugins/AlsaMixerPlugin.hxx"
 #include "filter/Registry.hxx"
 #include "event/Loop.hxx"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index 580493981..b82181be2 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -27,7 +27,7 @@
 #include "pcm/AudioParser.hxx"
 #include "pcm/AudioFormat.hxx"
 #include "pcm/Volume.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "system/Error.hxx"
 #include "io/FileDescriptor.hxx"
 #include "util/StringBuffer.hxx"