diff --git a/src/mixer/plugins/WasapiMixerPlugin.cxx b/src/mixer/plugins/WasapiMixerPlugin.cxx
index bc2604633..d4d7626ff 100644
--- a/src/mixer/plugins/WasapiMixerPlugin.cxx
+++ b/src/mixer/plugins/WasapiMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "mixer/MixerInternal.hxx"
-#include "output/plugins/WasapiOutputPlugin.hxx"
+#include "output/plugins/wasapi/WasapiOutputPlugin.hxx"
 #include "win32/ComWorker.hxx"
 #include "win32/HResult.hxx"
 
diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx
index 7252aa47c..f0f999895 100644
--- a/src/output/Registry.cxx
+++ b/src/output/Registry.cxx
@@ -42,7 +42,7 @@
 #include "plugins/WinmmOutputPlugin.hxx"
 #endif
 #ifdef ENABLE_WASAPI_OUTPUT
-#include "plugins/WasapiOutputPlugin.hxx"
+#include "plugins/wasapi/WasapiOutputPlugin.hxx"
 #endif
 #include "util/StringAPI.hxx"
 
diff --git a/src/output/plugins/meson.build b/src/output/plugins/meson.build
index 53c92b9f4..0f420d8d0 100644
--- a/src/output/plugins/meson.build
+++ b/src/output/plugins/meson.build
@@ -136,7 +136,7 @@ endif
 output_features.set('ENABLE_WASAPI_OUTPUT', is_windows)
 if is_windows
   output_plugins_sources += [
-    'WasapiOutputPlugin.cxx',
+    'wasapi/WasapiOutputPlugin.cxx',
   ]
   wasapi_dep = [
     c_compiler.find_library('ksuser', required: true),
diff --git a/src/output/plugins/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
similarity index 100%
rename from src/output/plugins/WasapiOutputPlugin.cxx
rename to src/output/plugins/wasapi/WasapiOutputPlugin.cxx
diff --git a/src/output/plugins/WasapiOutputPlugin.hxx b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
similarity index 97%
rename from src/output/plugins/WasapiOutputPlugin.hxx
rename to src/output/plugins/wasapi/WasapiOutputPlugin.hxx
index 3b17bcb9f..904caeba0 100644
--- a/src/output/plugins/WasapiOutputPlugin.hxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
@@ -22,7 +22,7 @@
 
 #include "output/Features.h"
 
-#include "../OutputAPI.hxx"
+#include "output/OutputAPI.hxx"
 #include "util/Compiler.h"
 #include "win32/ComPtr.hxx"