diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 28d7b1c128b..aa2d7f9720c 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -170,6 +170,15 @@ SUBDIRS = \
 	wineps \
 	wininet \
 	winmm \
+	winmm/joystick \
+	winmm/mcianim \
+	winmm/mciavi \
+	winmm/mcicda \
+	winmm/mciseq \
+	winmm/mciwave \
+	winmm/midimap \
+	winmm/wavemap \
+	winmm/wineoss \
 	winsock \
 	winspool \
 	wow32 \
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 96ca8fd7ff8..449ef6f113a 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -23,17 +23,6 @@ GLUE =  lolvldrv.c \
 RC_SRCS= \
 	winmm_res.rc
 
-SUBDIRS = \
-	joystick \
-	mcianim \
-	mciavi \
-	mcicda \
-	mciseq \
-	mciwave \
-	midimap \
-	wavemap \
-	wineoss
-
 @MAKE_DLL_RULES@
 
 ### Dependencies:
diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec
index d5bf906074c..89ba4633869 100644
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
@@ -7,8 +7,7 @@ import user32.dll
 import kernel32.dll
 import	ntdll.dll
 
-debug_channels (joystick mci mcianim mciavi mcicda mcimidi mciwave midi mmaux
-                mmio mmsys mmtime msacm sound wave)
+debug_channels (mci mmio mmsys mmtime sound)
 
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA