diff --git a/Makefile.in b/Makefile.in
index 5f90d1b5944..a268e97a80d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,6 +37,7 @@ LIBSUBDIRS = \
 	dlls/crtdll \
 	dlls/dciman32 \
 	dlls/dplayx \
+	dlls/dsound \
 	dlls/imagehlp \
 	dlls/imm32 \
 	dlls/lzexpand \
@@ -63,9 +64,14 @@ LIBSUBDIRS = \
 	dlls/win87em \
 	dlls/winaspi \
 	dlls/windebug \
-	dlls/winmm \
-	dlls/winmm/wineoss \
 	dlls/wing \
+	dlls/winmm \
+	dlls/winmm/mcianim \
+	dlls/winmm/mciavi \
+	dlls/winmm/mcicda \
+	dlls/winmm/mciseq \
+	dlls/winmm/mciwave \
+	dlls/winmm/wineoss \
 	dlls/winspool \
 	dlls/wnaspi32 \
 	files \
@@ -83,7 +89,6 @@ LIBSUBDIRS = \
 	memory \
 	misc \
 	msdos \
-	multimedia \
 	objects \
 	ole \
 	relay32 \
@@ -137,6 +142,7 @@ LIBOBJS = \
 	dlls/crtdll/crtdll.o \
 	dlls/dciman32/dciman32.o \
 	dlls/dplayx/dplayx.o \
+	dlls/dsound/dsound.o \
 	dlls/imagehlp/imagehlp.o \
 	dlls/imm32/imm32.o \
 	dlls/lzexpand/lzexpand.o \
@@ -163,8 +169,14 @@ LIBOBJS = \
 	dlls/win87em/win87em.o \
 	dlls/winaspi/winaspi.o \
 	dlls/windebug/windebug.o \
-	dlls/winmm/wineoss/wineoss.o \
 	dlls/wing/wing.o \
+	dlls/winmm/mcianim/mcianim.drv.o \
+	dlls/winmm/mciavi/mciavi.drv.o \
+	dlls/winmm/mcicda/mcicda.drv.o \
+	dlls/winmm/mciseq/mciseq.drv.o \
+	dlls/winmm/mciwave/mciwave.drv.o \
+	dlls/winmm/wineoss/wineoss.o \
+	dlls/winmm/winmm.o \
 	dlls/winspool/winspool.o \
 	dlls/wnaspi32/wnaspi32.o \
 	files/files.o \
@@ -181,7 +193,6 @@ LIBOBJS = \
 	memory/memory.o \
 	misc/misc.o \
 	msdos/msdos.o \
-	multimedia/multimedia.o \
 	objects/objects.o \
 	ole/ole.o \
 	relay32/relay32.o \
diff --git a/configure b/configure
index 968a40d4d7e..f5abb467600 100755
--- a/configure
+++ b/configure
@@ -5625,6 +5625,7 @@ dlls/commdlg/Makefile
 dlls/crtdll/Makefile
 dlls/dciman32/Makefile
 dlls/dplayx/Makefile
+dlls/dsound/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
 dlls/lzexpand/Makefile
@@ -5651,9 +5652,14 @@ dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
 dlls/windebug/Makefile
-dlls/winmm/Makefile
-dlls/winmm/wineoss/Makefile
 dlls/wing/Makefile
+dlls/winmm/Makefile
+dlls/winmm/mcianim/Makefile
+dlls/winmm/mciavi/Makefile
+dlls/winmm/mcicda/Makefile
+dlls/winmm/mciseq/Makefile
+dlls/winmm/mciwave/Makefile
+dlls/winmm/wineoss/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile
@@ -5678,7 +5684,6 @@ memory/Makefile
 misc/Makefile
 miscemu/Makefile
 msdos/Makefile
-multimedia/Makefile
 objects/Makefile
 ole/Makefile
 programs/Makefile
@@ -5821,6 +5826,7 @@ dlls/commdlg/Makefile
 dlls/crtdll/Makefile
 dlls/dciman32/Makefile
 dlls/dplayx/Makefile
+dlls/dsound/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
 dlls/lzexpand/Makefile
@@ -5847,9 +5853,14 @@ dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
 dlls/windebug/Makefile
-dlls/winmm/Makefile
-dlls/winmm/wineoss/Makefile
 dlls/wing/Makefile
+dlls/winmm/Makefile
+dlls/winmm/mcianim/Makefile
+dlls/winmm/mciavi/Makefile
+dlls/winmm/mcicda/Makefile
+dlls/winmm/mciseq/Makefile
+dlls/winmm/mciwave/Makefile
+dlls/winmm/wineoss/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile
@@ -5874,7 +5885,6 @@ memory/Makefile
 misc/Makefile
 miscemu/Makefile
 msdos/Makefile
-multimedia/Makefile
 objects/Makefile
 ole/Makefile
 programs/Makefile
diff --git a/configure.in b/configure.in
index ba9f6b39e9c..7f02946b697 100644
--- a/configure.in
+++ b/configure.in
@@ -832,6 +832,7 @@ dlls/commdlg/Makefile
 dlls/crtdll/Makefile
 dlls/dciman32/Makefile
 dlls/dplayx/Makefile
+dlls/dsound/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
 dlls/lzexpand/Makefile
@@ -858,9 +859,14 @@ dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
 dlls/windebug/Makefile
-dlls/winmm/Makefile
-dlls/winmm/wineoss/Makefile
 dlls/wing/Makefile
+dlls/winmm/Makefile
+dlls/winmm/mcianim/Makefile
+dlls/winmm/mciavi/Makefile
+dlls/winmm/mcicda/Makefile
+dlls/winmm/mciseq/Makefile
+dlls/winmm/mciwave/Makefile
+dlls/winmm/wineoss/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile
@@ -885,7 +891,6 @@ memory/Makefile
 misc/Makefile
 miscemu/Makefile
 msdos/Makefile
-multimedia/Makefile
 objects/Makefile
 ole/Makefile
 programs/Makefile
diff --git a/dlls/dsound/.cvsignore b/dlls/dsound/.cvsignore
new file mode 100644
index 00000000000..c88b549003a
--- /dev/null
+++ b/dlls/dsound/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+dsound.spec.c
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
new file mode 100644
index 00000000000..599fc422b15
--- /dev/null
+++ b/dlls/dsound/Makefile.in
@@ -0,0 +1,19 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = dsound
+
+SPEC_SRCS = \
+	dsound.spec
+
+C_SRCS = \
+	dsound_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+
diff --git a/relay32/dsound.spec b/dlls/dsound/dsound.spec
similarity index 100%
rename from relay32/dsound.spec
rename to dlls/dsound/dsound.spec
diff --git a/multimedia/dsound.c b/dlls/dsound/dsound_main.c
similarity index 100%
rename from multimedia/dsound.c
rename to dlls/dsound/dsound_main.c
diff --git a/dlls/winmm/.cvsignore b/dlls/winmm/.cvsignore
index f3c7a7c5da6..732697fd9f3 100644
--- a/dlls/winmm/.cvsignore
+++ b/dlls/winmm/.cvsignore
@@ -1 +1,6 @@
 Makefile
+lolvldrv.glue.c
+mmsystem.glue.c
+mmsystem.spec.c
+winmm.spec.c
+winmm_res.s
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 09e0c339852..d881d6865ea 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -4,10 +4,30 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm
+WRCEXTRA  = -s -pwinmm
 
-all: $(MODULE).o
+SPEC_SRCS = \
+	mmsystem.spec \
+	winmm.spec
+
+C_SRCS = \
+	joystick.c \
+	lolvldrv.c \
+	mci.c \
+	mmio.c \
+	mmsystem.c \
+	time.c
+
+GLUE =  lolvldrv.c \
+	mmsystem.c
+
+RC_SRCS= \
+	winmm_res.rc
+
+all: check_wrc $ $(MODULE).o
 
 @MAKE_RULES@
 
-### Dependencies:
+$(RC_SRCS:.rc=.s): $(WRC)
 
+### Dependencies:
diff --git a/multimedia/joystick.c b/dlls/winmm/joystick.c
similarity index 100%
rename from multimedia/joystick.c
rename to dlls/winmm/joystick.c
diff --git a/multimedia/lolvldrv.c b/dlls/winmm/lolvldrv.c
similarity index 100%
rename from multimedia/lolvldrv.c
rename to dlls/winmm/lolvldrv.c
diff --git a/multimedia/mci.c b/dlls/winmm/mci.c
similarity index 100%
rename from multimedia/mci.c
rename to dlls/winmm/mci.c
diff --git a/dlls/winmm/mcianim/.cvsignore b/dlls/winmm/mcianim/.cvsignore
new file mode 100644
index 00000000000..952ce1bbace
--- /dev/null
+++ b/dlls/winmm/mcianim/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mcianim.spec.c
diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in
new file mode 100644
index 00000000000..e1613bea6be
--- /dev/null
+++ b/dlls/winmm/mcianim/Makefile.in
@@ -0,0 +1,21 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mcianim.drv
+
+SPEC_SRCS = \
+	mcianim.spec
+
+C_SRCS = \
+	mcianim.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+call32.s: $(BUILD)
+	$(BUILD) @BUILDFLAGS@ -o $@ -call32
+
+### Dependencies:
diff --git a/multimedia/mcianim.c b/dlls/winmm/mcianim/mcianim.c
similarity index 100%
rename from multimedia/mcianim.c
rename to dlls/winmm/mcianim/mcianim.c
diff --git a/relay32/mcianim.spec b/dlls/winmm/mcianim/mcianim.spec
similarity index 100%
rename from relay32/mcianim.spec
rename to dlls/winmm/mcianim/mcianim.spec
diff --git a/dlls/winmm/mciavi/.cvsignore b/dlls/winmm/mciavi/.cvsignore
new file mode 100644
index 00000000000..bcd93c7f865
--- /dev/null
+++ b/dlls/winmm/mciavi/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mciavi.spec.c
diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in
new file mode 100644
index 00000000000..0ef35842b3a
--- /dev/null
+++ b/dlls/winmm/mciavi/Makefile.in
@@ -0,0 +1,21 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mciavi.drv
+
+SPEC_SRCS = \
+	mciavi.spec
+
+C_SRCS = \
+	mciavi.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+call32.s: $(BUILD)
+	$(BUILD) @BUILDFLAGS@ -o $@ -call32
+
+### Dependencies:
diff --git a/multimedia/mciavi.c b/dlls/winmm/mciavi/mciavi.c
similarity index 100%
rename from multimedia/mciavi.c
rename to dlls/winmm/mciavi/mciavi.c
diff --git a/relay32/mciavi.spec b/dlls/winmm/mciavi/mciavi.spec
similarity index 100%
rename from relay32/mciavi.spec
rename to dlls/winmm/mciavi/mciavi.spec
diff --git a/dlls/winmm/mcicda/.cvsignore b/dlls/winmm/mcicda/.cvsignore
new file mode 100644
index 00000000000..0dc9119da4e
--- /dev/null
+++ b/dlls/winmm/mcicda/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mcicda.spec.c
diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in
new file mode 100644
index 00000000000..d5d299db37e
--- /dev/null
+++ b/dlls/winmm/mcicda/Makefile.in
@@ -0,0 +1,21 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mcicda.drv
+
+SPEC_SRCS = \
+	mcicda.spec
+
+C_SRCS = \
+	mcicda.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+call32.s: $(BUILD)
+	$(BUILD) @BUILDFLAGS@ -o $@ -call32
+
+### Dependencies:
diff --git a/multimedia/mcicda.c b/dlls/winmm/mcicda/mcicda.c
similarity index 100%
rename from multimedia/mcicda.c
rename to dlls/winmm/mcicda/mcicda.c
diff --git a/relay32/mcicda.spec b/dlls/winmm/mcicda/mcicda.spec
similarity index 100%
rename from relay32/mcicda.spec
rename to dlls/winmm/mcicda/mcicda.spec
diff --git a/dlls/winmm/mciseq/.cvsignore b/dlls/winmm/mciseq/.cvsignore
new file mode 100644
index 00000000000..0b4b6f071e8
--- /dev/null
+++ b/dlls/winmm/mciseq/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mciseq.spec.c
diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in
new file mode 100644
index 00000000000..f6b7d860998
--- /dev/null
+++ b/dlls/winmm/mciseq/Makefile.in
@@ -0,0 +1,21 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mciseq.drv
+
+SPEC_SRCS = \
+	mciseq.spec
+
+C_SRCS = \
+	mcimidi.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+call32.s: $(BUILD)
+	$(BUILD) @BUILDFLAGS@ -o $@ -call32
+
+### Dependencies:
diff --git a/multimedia/mcimidi.c b/dlls/winmm/mciseq/mcimidi.c
similarity index 100%
rename from multimedia/mcimidi.c
rename to dlls/winmm/mciseq/mcimidi.c
diff --git a/relay32/mciseq.spec b/dlls/winmm/mciseq/mciseq.spec
similarity index 100%
rename from relay32/mciseq.spec
rename to dlls/winmm/mciseq/mciseq.spec
diff --git a/dlls/winmm/mciwave/.cvsignore b/dlls/winmm/mciwave/.cvsignore
new file mode 100644
index 00000000000..d9dfe65475d
--- /dev/null
+++ b/dlls/winmm/mciwave/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mciwave.spec.c
diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in
new file mode 100644
index 00000000000..8432f17b420
--- /dev/null
+++ b/dlls/winmm/mciwave/Makefile.in
@@ -0,0 +1,21 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mciwave.drv
+
+SPEC_SRCS = \
+	mciwave.spec
+
+C_SRCS = \
+	mciwave.c \
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+call32.s: $(BUILD)
+	$(BUILD) @BUILDFLAGS@ -o $@ -call32
+
+### Dependencies:
diff --git a/multimedia/mciwave.c b/dlls/winmm/mciwave/mciwave.c
similarity index 100%
rename from multimedia/mciwave.c
rename to dlls/winmm/mciwave/mciwave.c
diff --git a/relay32/mciwave.spec b/dlls/winmm/mciwave/mciwave.spec
similarity index 100%
rename from relay32/mciwave.spec
rename to dlls/winmm/mciwave/mciwave.spec
diff --git a/multimedia/mmio.c b/dlls/winmm/mmio.c
similarity index 100%
rename from multimedia/mmio.c
rename to dlls/winmm/mmio.c
diff --git a/multimedia/mmsystem.c b/dlls/winmm/mmsystem.c
similarity index 100%
rename from multimedia/mmsystem.c
rename to dlls/winmm/mmsystem.c
diff --git a/if1632/mmsystem.spec b/dlls/winmm/mmsystem.spec
similarity index 100%
rename from if1632/mmsystem.spec
rename to dlls/winmm/mmsystem.spec
diff --git a/multimedia/time.c b/dlls/winmm/time.c
similarity index 100%
rename from multimedia/time.c
rename to dlls/winmm/time.c
diff --git a/multimedia/winemm.h b/dlls/winmm/winemm.h
similarity index 100%
rename from multimedia/winemm.h
rename to dlls/winmm/winemm.h
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index 7e2d45be0a8..fc896c3f5a6 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -8,7 +8,13 @@ MODULE    = wineoss
 SPEC_SRCS = \
 	wineoss.spec
 
-C_SRCS = 
+C_SRCS = \
+	audio.c \
+	midi.c \
+	midipatch.c \
+	mixer.c \
+	mmaux.c \
+	oss.c
 
 all: $(MODULE).o
 
diff --git a/multimedia/audio.c b/dlls/winmm/wineoss/audio.c
similarity index 100%
rename from multimedia/audio.c
rename to dlls/winmm/wineoss/audio.c
diff --git a/multimedia/midi.c b/dlls/winmm/wineoss/midi.c
similarity index 100%
rename from multimedia/midi.c
rename to dlls/winmm/wineoss/midi.c
diff --git a/multimedia/midipatch.c b/dlls/winmm/wineoss/midipatch.c
similarity index 100%
rename from multimedia/midipatch.c
rename to dlls/winmm/wineoss/midipatch.c
diff --git a/multimedia/mixer.c b/dlls/winmm/wineoss/mixer.c
similarity index 100%
rename from multimedia/mixer.c
rename to dlls/winmm/wineoss/mixer.c
diff --git a/multimedia/mmaux.c b/dlls/winmm/wineoss/mmaux.c
similarity index 100%
rename from multimedia/mmaux.c
rename to dlls/winmm/wineoss/mmaux.c
diff --git a/multimedia/oss.c b/dlls/winmm/wineoss/oss.c
similarity index 100%
rename from multimedia/oss.c
rename to dlls/winmm/wineoss/oss.c
diff --git a/multimedia/oss.h b/dlls/winmm/wineoss/oss.h
similarity index 100%
rename from multimedia/oss.h
rename to dlls/winmm/wineoss/oss.h
diff --git a/relay32/winmm.spec b/dlls/winmm/winmm.spec
similarity index 100%
rename from relay32/winmm.spec
rename to dlls/winmm/winmm.spec
diff --git a/multimedia/winmm_En.rc b/dlls/winmm/winmm_En.rc
similarity index 100%
rename from multimedia/winmm_En.rc
rename to dlls/winmm/winmm_En.rc
diff --git a/multimedia/winmm_Fr.rc b/dlls/winmm/winmm_Fr.rc
similarity index 100%
rename from multimedia/winmm_Fr.rc
rename to dlls/winmm/winmm_Fr.rc
diff --git a/multimedia/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc
similarity index 100%
rename from multimedia/winmm_Nl.rc
rename to dlls/winmm/winmm_Nl.rc
diff --git a/multimedia/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc
similarity index 100%
rename from multimedia/winmm_Pt.rc
rename to dlls/winmm/winmm_Pt.rc
diff --git a/multimedia/winmm.rc b/dlls/winmm/winmm_res.rc
similarity index 100%
rename from multimedia/winmm.rc
rename to dlls/winmm/winmm_res.rc
diff --git a/if1632/.cvsignore b/if1632/.cvsignore
index 68d2ec92b90..c9ba827e9df 100644
--- a/if1632/.cvsignore
+++ b/if1632/.cvsignore
@@ -7,7 +7,6 @@ display.spec.c
 gdi.spec.c
 kernel.spec.c
 keyboard.spec.c
-mmsystem.spec.c
 mouse.spec.c
 ole2conv.spec.c
 ole2nls.spec.c
diff --git a/if1632/Makefile.in b/if1632/Makefile.in
index 6016c9a86f6..005b58033f5 100644
--- a/if1632/Makefile.in
+++ b/if1632/Makefile.in
@@ -13,7 +13,6 @@ SPEC_SRCS = \
 	gdi.spec \
 	kernel.spec \
 	keyboard.spec \
-	mmsystem.spec \
 	mouse.spec \
 	ole2conv.spec \
 	ole2nls.spec \
diff --git a/multimedia/Makefile.in b/multimedia/Makefile.in
deleted file mode 100644
index f937e2ee77d..00000000000
--- a/multimedia/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-DEFS      = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = multimedia
-WRCEXTRA  = -s -pwinmm
-
-C_SRCS = \
-	audio.c \
-	dsound.c \
-	joystick.c \
-	lolvldrv.c \
-	mci.c \
-	mcianim.c \
-	mciavi.c \
-	mcicda.c \
-	mcimidi.c \
-	mciwave.c \
-	midi.c \
-	midipatch.c \
-	mixer.c \
-	mmaux.c \
-	mmio.c \
-	mmsystem.c \
-	oss.c \
-	time.c
-
-GLUE =  lolvldrv.c \
-	mmsystem.c
-
-RC_SRCS= \
-	winmm.rc
-
-all: check_wrc $ $(MODULE).o
-
-@MAKE_RULES@
-
-$(RC_SRCS:.rc=.s): $(WRC)
-
-### Dependencies:
diff --git a/relay32/.cvsignore b/relay32/.cvsignore
index 0375e53aad1..201dd385031 100644
--- a/relay32/.cvsignore
+++ b/relay32/.cvsignore
@@ -2,15 +2,8 @@ Makefile
 call32.s
 ddraw.spec.c
 dinput.spec.c
-dsound.spec.c
 gdi32.spec.c
 kernel32.spec.c
-mcianim.spec.c
-mciavi.spec.c
-mcicda.spec.c
-mciseq.spec.c
-mciwave.spec.c
 user32.spec.c
-winmm.spec.c
 wow32.spec.c
 wsock32.spec.c
diff --git a/relay32/Makefile.in b/relay32/Makefile.in
index bdd7bb67a82..8fc5804359a 100644
--- a/relay32/Makefile.in
+++ b/relay32/Makefile.in
@@ -8,16 +8,9 @@ MODULE    = relay32
 SPEC_SRCS = \
 	ddraw.spec \
 	dinput.spec \
-	dsound.spec \
 	gdi32.spec \
 	kernel32.spec \
-	mcianim.spec \
-	mciavi.spec \
-	mcicda.spec \
-	mciseq.spec \
-	mciwave.spec \
 	user32.spec \
-	winmm.spec \
 	wow32.spec \
 	wsock32.spec