diff --git a/dlls/activeds.tlb/Makefile.in b/dlls/activeds.tlb/Makefile.in
index 50a32d907ed..ac16c4c0858 100644
--- a/dlls/activeds.tlb/Makefile.in
+++ b/dlls/activeds.tlb/Makefile.in
@@ -2,4 +2,5 @@ MODULE = activeds.tlb
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-IDL_SRCS = activeds_tlb.idl
+SOURCES = \
+	activeds_tlb.idl
diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in
index b9fbdfeca82..819f736f988 100644
--- a/dlls/activeds/Makefile.in
+++ b/dlls/activeds/Makefile.in
@@ -4,9 +4,7 @@ IMPORTS   = advapi32 ole32 oleaut32 uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	activeds.idl \
 	activeds_main.c \
 	pathname.c
-
-IDL_SRCS = \
-	activeds.idl
diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in
index a4618bd560f..0397f7c3a93 100644
--- a/dlls/actxprxy/Makefile.in
+++ b/dlls/actxprxy/Makefile.in
@@ -1,10 +1,7 @@
 MODULE    = actxprxy.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4
 
-C_SRCS = \
-	usrmarshal.c
-
-IDL_SRCS = \
+SOURCES = \
 	actxprxy_activscp.idl \
 	actxprxy_comcat.idl \
 	actxprxy_docobj.idl \
@@ -16,6 +13,7 @@ IDL_SRCS = \
 	actxprxy_servprov.idl \
 	actxprxy_shldisp.idl \
 	actxprxy_shobjidl.idl \
-	actxprxy_urlhist.idl
+	actxprxy_urlhist.idl \
+	usrmarshal.c
 
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION
diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in
index 89b6b903013..4031656a5b4 100644
--- a/dlls/adsldp/Makefile.in
+++ b/dlls/adsldp/Makefile.in
@@ -4,12 +4,9 @@ DELAYIMPORTS = netapi32 wldap32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	adsldp.c \
+	adsldp.idl \
 	ldap.c \
+	rsrc.rc \
 	schema.c
-
-IDL_SRCS = \
-	adsldp.idl
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in
index 35356a06a8c..cd4bd0a7862 100644
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@@ -1,14 +1,12 @@
 MODULE    = amstream.dll
 IMPORTS   = strmiids strmbase uuid ole32 advapi32 ddraw
 
-C_SRCS = \
+SOURCES = \
+	amstream_classes.idl \
 	audiodata.c \
 	audiostream.c \
 	ddrawstream.c \
 	filter.c \
 	main.c \
-	multimedia.c
-
-IDL_SRCS = amstream_classes.idl
-
-RC_SRCS = version.rc
+	multimedia.c \
+	version.rc
diff --git a/dlls/appxdeploymentclient/Makefile.in b/dlls/appxdeploymentclient/Makefile.in
index 75eeb6186ec..315f501d9cd 100644
--- a/dlls/appxdeploymentclient/Makefile.in
+++ b/dlls/appxdeploymentclient/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = appxdeploymentclient.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	package.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index 826a5bf7d25..ddbbf66d41c 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -3,12 +3,10 @@ IMPORTLIB = atl
 IMPORTS   = uuid oleaut32 ole32 user32 gdi32 advapi32 shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_30
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl30.c \
 	atl_ax.c \
-	registrar.c
-
-IDL_SRCS = \
 	atl_classes.idl \
-	atl_lib.idl
+	atl_lib.idl \
+	registrar.c
diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in
index 719afe04911..3a4682785ed 100644
--- a/dlls/atl100/Makefile.in
+++ b/dlls/atl100/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = uuid ole32 oleaut32 user32 gdi32 advapi32 shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_100
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl
diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in
index d33d30d2820..906c4811907 100644
--- a/dlls/atl110/Makefile.in
+++ b/dlls/atl110/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_110
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl
diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in
index b3a5a9cc681..74ba178a96f 100644
--- a/dlls/atl80/Makefile.in
+++ b/dlls/atl80/Makefile.in
@@ -4,12 +4,10 @@ IMPORTS   = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_80
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl80.c \
+	atl80.rc \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl
-
-RC_SRCS = atl80.rc
diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in
index d3aebe6883f..ddfea04c6db 100644
--- a/dlls/atl90/Makefile.in
+++ b/dlls/atl90/Makefile.in
@@ -3,11 +3,9 @@ IMPORTS   = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_90
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
+	atl90.rc \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl
-
-RC_SRCS = atl90.rc
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 4030514d95c..fd19511712c 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -2,9 +2,11 @@ MODULE    = avifil32.dll
 IMPORTLIB = avifil32
 IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
 
-C_SRCS = \
+SOURCES = \
 	acmstream.c \
 	api.c \
+	avifil32.idl \
+	avifil32.rc \
 	avifile.c \
 	editstream.c \
 	extrachunk.c \
@@ -14,8 +16,4 @@ C_SRCS = \
 	tmpfile.c \
 	wavfile.c
 
-IDL_SRCS = avifil32.idl
-
-RC_SRCS = avifil32.rc
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=avifil32_
diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index 6c14ace37cf..762cccdb7f3 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -3,13 +3,11 @@ IMPORTS   = uuid ole32 comctl32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	aclmulti.c \
 	aclsource.c \
+	browseui.rc \
+	browseui_classes.idl \
 	browseui_main.c \
 	compcatcachedaemon.c \
 	progressdlg.c
-
-IDL_SRCS = browseui_classes.idl
-
-RC_SRCS = browseui.rc
diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in
index fa24dd9e37d..f0acc33751f 100644
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -4,11 +4,13 @@ IMPORTLIB = combase
 IMPORTS   = advapi32 ole32 user32 gdi32 uuid rpcrt4
 DELAYIMPORTS = oleaut32
 
-C_SRCS = \
+SOURCES = \
 	apartment.c \
 	combase.c \
+	dcom.idl \
 	errorinfo.c \
 	hglobalstream.c \
+	irpcss.idl \
 	malloc.c \
 	marshal.c \
 	roapi.c \
@@ -16,7 +18,3 @@ C_SRCS = \
 	string.c \
 	stubmanager.c \
 	usrmarshal.c
-
-IDL_SRCS = \
-	dcom.idl \
-	irpcss.idl
diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in
index 22090938b52..741c49e1acc 100644
--- a/dlls/comsvcs/Makefile.in
+++ b/dlls/comsvcs/Makefile.in
@@ -4,10 +4,8 @@ IMPORTS   = ole32 uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	comsvcs_classes.idl \
+	comsvcs_tlb.idl \
 	main.c \
 	property.c
-
-IDL_SRCS = \
-	comsvcs_classes.idl \
-	comsvcs_tlb.idl
diff --git a/dlls/cryptowinrt/Makefile.in b/dlls/cryptowinrt/Makefile.in
index 6f11a7cd05d..8d9d23a6cc2 100644
--- a/dlls/cryptowinrt/Makefile.in
+++ b/dlls/cryptowinrt/Makefile.in
@@ -1,11 +1,9 @@
 MODULE = cryptowinrt.dll
 IMPORTS = combase bcrypt uuid
 
-C_SRCS = \
+SOURCES = \
 	async.c \
-	credentials.c \
-	main.c
-
-IDL_SRCS = \
 	classes.idl \
+	credentials.c \
+	main.c \
 	provider.idl
diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in
index 93032adbb3f..4be21a5321a 100644
--- a/dlls/d3dxof/Makefile.in
+++ b/dlls/d3dxof/Makefile.in
@@ -2,12 +2,10 @@ MODULE    = d3dxof.dll
 IMPORTLIB = d3dxof
 IMPORTS   = dxguid uuid ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	d3dxof.c \
+	d3dxof.idl \
 	main.c \
 	mszip.c \
-	parsing.c
-
-IDL_SRCS = d3dxof.idl
-
-RC_SRCS = version.rc
+	parsing.c \
+	version.rc
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index 5106834dec8..e6d6dddddef 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -2,9 +2,10 @@ MODULE    = ddraw.dll
 IMPORTLIB = ddraw
 IMPORTS   = dxguid uuid wined3d user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	clipper.c \
 	ddraw.c \
+	ddraw_classes.idl \
 	device.c \
 	executebuffer.c \
 	light.c \
@@ -13,9 +14,6 @@ C_SRCS = \
 	palette.c \
 	surface.c \
 	utils.c \
+	version.rc \
 	vertexbuffer.c \
 	viewport.c
-
-IDL_SRCS = ddraw_classes.idl
-
-RC_SRCS = version.rc
diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in
index 0d67f9eb07e..a839e85749d 100644
--- a/dlls/ddrawex/Makefile.in
+++ b/dlls/ddrawex/Makefile.in
@@ -1,11 +1,9 @@
 MODULE    = ddrawex.dll
 IMPORTS   = dxguid uuid ddraw ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	ddraw.c \
+	ddrawex.idl \
 	main.c \
-	surface.c
-
-IDL_SRCS = ddrawex.idl
-
-RC_SRCS = version.rc
+	surface.c \
+	version.rc
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index 16ae8e1abfa..82cac01a430 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -2,13 +2,10 @@ MODULE    = devenum.dll
 IMPORTS   = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo
 DELAYIMPORTS = msvfw32
 
-C_SRCS = \
+SOURCES = \
 	createdevenum.c \
+	devenum.rc \
+	devenum_classes.idl \
 	devenum_main.c \
 	mediacatenum.c \
 	parsedisplayname.c
-
-IDL_SRCS = \
-	devenum_classes.idl
-
-RC_SRCS = devenum.rc
diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in
index 02556ba89e0..349fef1c1e8 100644
--- a/dlls/dhtmled.ocx/Makefile.in
+++ b/dlls/dhtmled.ocx/Makefile.in
@@ -1,10 +1,8 @@
 MODULE    = dhtmled.ocx
 IMPORTS   = uuid ole32 oleaut32 user32 gdi32
 
-RC_SRCS   = dhtmled.rc
-
-C_SRCS = \
+SOURCES = \
+	dhtmled.rc \
+	dhtmled_tlb.idl \
 	edit.c \
 	main.c
-
-IDL_SRCS = dhtmled_tlb.idl
diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in
index 545368d5c11..1258e4dc940 100644
--- a/dlls/diasymreader/Makefile.in
+++ b/dlls/diasymreader/Makefile.in
@@ -3,10 +3,8 @@ IMPORTS   = uuid rpcrt4
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	diasymreader.idl \
+	diasymreader.rc \
 	main.c \
 	writer.c
-
-IDL_SRCS = diasymreader.idl
-
-RC_SRCS = diasymreader.rc
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index 280ac49f9aa..d4bb1bca2da 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -3,19 +3,16 @@ IMPORTLIB = dinput
 IMPORTS   = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700
 
-C_SRCS = \
+SOURCES = \
 	ansi.c \
 	config.c \
 	data_formats.c \
 	device.c \
 	dinput.c \
+	dinput.rc \
+	dinput_classes.idl \
 	dinput_main.c \
 	joystick_hid.c \
 	keyboard.c \
-	mouse.c
-
-IDL_SRCS = dinput_classes.idl
-
-RC_SRCS = \
-	dinput.rc \
+	mouse.c \
 	version.rc
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 1d1b52c00ac..f3f5fdc4fd8 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -4,19 +4,16 @@ IMPORTS   = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
 PARENTSRC = ../dinput
 
-C_SRCS = \
+SOURCES = \
 	ansi.c \
 	config.c \
 	data_formats.c \
 	device.c \
 	dinput.c \
+	dinput.rc \
+	dinput8.idl \
 	dinput_main.c \
 	joystick_hid.c \
 	keyboard.c \
-	mouse.c
-
-IDL_SRCS = dinput8.idl
-
-RC_SRCS = \
-	dinput.rc \
+	mouse.c \
 	version.rc
diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in
index a258835e3ab..af884c3842b 100644
--- a/dlls/directmanipulation/Makefile.in
+++ b/dlls/directmanipulation/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-IDL_SRCS = directmanip.idl
-
-C_SRCS = \
+SOURCES = \
+	directmanip.idl \
 	directmanipulation.c
diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in
index 98a05926727..d8a542acb71 100644
--- a/dlls/dispex/Makefile.in
+++ b/dlls/dispex/Makefile.in
@@ -1,10 +1,8 @@
 MODULE    = dispex.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 
-C_SRCS = \
+SOURCES = \
+	disp_ex.idl \
 	usrmarshal.c
 
-IDL_SRCS = \
-	disp_ex.idl
-
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION
diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in
index 2c6a59dad4c..459c236addc 100644
--- a/dlls/dmband/Makefile.in
+++ b/dlls/dmband/Makefile.in
@@ -2,12 +2,10 @@ MODULE    = dmband.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	band.c \
 	bandtrack.c \
+	dmband.idl \
 	dmband_main.c \
-	dmobject.c
-
-IDL_SRCS = dmband.idl
-
-RC_SRCS = version.rc
+	dmobject.c \
+	version.rc
diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in
index af5f2134152..5a598fe78e7 100644
--- a/dlls/dmcompos/Makefile.in
+++ b/dlls/dmcompos/Makefile.in
@@ -2,14 +2,12 @@ MODULE    = dmcompos.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	chordmap.c \
 	chordmaptrack.c \
 	composer.c \
+	dmcompos.idl \
 	dmcompos_main.c \
 	dmobject.c \
-	signposttrack.c
-
-IDL_SRCS = dmcompos.idl
-
-RC_SRCS = version.rc
+	signposttrack.c \
+	version.rc
diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in
index eccf7815475..cf041ef2b27 100644
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@@ -2,8 +2,9 @@ MODULE    = dmime.dll
 IMPORTS   = dxguid uuid dsound ole32 user32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	audiopath.c \
+	dmime.idl \
 	dmime_main.c \
 	dmobject.c \
 	graph.c \
@@ -18,9 +19,6 @@ C_SRCS = \
 	sysextrack.c \
 	tempotrack.c \
 	timesigtrack.c \
+	version.rc \
 	wave.c \
 	wavetrack.c
-
-IDL_SRCS = dmime.idl
-
-RC_SRCS = version.rc
diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index a8d3698ab6c..214c06de207 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -2,14 +2,12 @@ MODULE    = dmloader.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	container.c \
 	debug.c \
+	dmloader.idl \
 	dmloader_main.c \
 	dmobject.c \
 	loader.c \
-	loaderstream.c
-
-IDL_SRCS = dmloader.idl
-
-RC_SRCS = version.rc
+	loaderstream.c \
+	version.rc
diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in
index 9eac24c2d86..c31ddf92571 100644
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@@ -2,12 +2,10 @@ MODULE    = dmscript.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	dmobject.c \
+	dmscript.idl \
 	dmscript_main.c \
+	rsrc.rc \
 	script.c \
 	scripttrack.c
-
-IDL_SRCS = dmscript.idl
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in
index 8a6897ca4ca..a5e4c5da289 100644
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@@ -2,18 +2,16 @@ MODULE    = dmstyle.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	auditiontrack.c \
 	chordtrack.c \
 	commandtrack.c \
 	dmobject.c \
+	dmstyle.idl \
 	dmstyle_main.c \
 	dmutils.c \
 	motiftrack.c \
 	mutetrack.c \
 	style.c \
-	styletrack.c
-
-IDL_SRCS = dmstyle.idl
-
-RC_SRCS = version.rc
+	styletrack.c \
+	version.rc
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index 85cac5912ac..091f4459e9e 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -3,11 +3,9 @@ IMPORTS   = $(FLUIDSYNTH_PE_LIBS) dxguid uuid ole32 advapi32 user32
 EXTRAINCL = $(FLUIDSYNTH_PE_CFLAGS)
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
+	dmsynth.idl \
 	dmsynth_main.c \
 	synth.c \
-	synthsink.c
-
-IDL_SRCS = dmsynth.idl
-
-RC_SRCS = version.rc
+	synthsink.c \
+	version.rc
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index d9438af0d18..8e1c07e90a7 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -1,18 +1,16 @@
 MODULE    = dmusic.dll
 IMPORTS   = dxguid uuid ole32 advapi32 dsound user32 winmm
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	clock.c \
 	collection.c \
 	dmobject.c \
 	dmusic.c \
+	dmusic.idl \
 	dmusic_main.c \
 	download.c \
 	instrument.c \
 	port.c \
+	version.rc \
 	wave.c
-
-IDL_SRCS = dmusic.idl
-
-RC_SRCS = version.rc
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 8d41fdbad9e..43593326611 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -2,17 +2,15 @@ MODULE    = dplayx.dll
 IMPORTLIB = dplayx
 IMPORTS   = dxguid uuid winmm ole32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	dpclassfactory.c \
 	dplay.c \
 	dplaysp.c \
+	dplayx.idl \
 	dplayx_global.c \
 	dplayx_main.c \
 	dplayx_messages.c \
 	dplobby.c \
 	lobbysp.c \
-	name_server.c
-
-IDL_SRCS = dplayx.idl
-
-RC_SRCS = version.rc
+	name_server.c \
+	version.rc
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in
index 541e104c64a..5d417bd87fb 100644
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@@ -2,15 +2,13 @@ MODULE    = dpnet.dll
 IMPORTLIB = dpnet
 IMPORTS   = dxguid uuid ole32 advapi32 ws2_32
 
-C_SRCS = \
+SOURCES = \
 	address.c \
 	client.c \
+	dpnet.idl \
 	dpnet_main.c \
 	lobbiedapp.c \
 	peer.c \
 	server.c \
-	threadpool.c
-
-IDL_SRCS = dpnet.idl
-
-RC_SRCS = version.rc
+	threadpool.c \
+	version.rc
diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in
index 7767d141fa8..4b2b710f588 100644
--- a/dlls/dpvoice/Makefile.in
+++ b/dlls/dpvoice/Makefile.in
@@ -3,11 +3,9 @@ IMPORTS   = dxguid uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	client.c \
+	dpvoice.idl \
 	main.c \
-	server.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = dpvoice.idl
+	server.c \
+	version.rc
diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in
index a3dd1ad11e9..5442e8d31c3 100644
--- a/dlls/dsdmo/Makefile.in
+++ b/dlls/dsdmo/Makefile.in
@@ -3,10 +3,7 @@ IMPORTS   = dmoguids strmiids uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = \
-	dsdmo.idl
-
-RC_SRCS = version.rc
+SOURCES = \
+	dsdmo.idl \
+	main.c \
+	version.rc
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 6cb653fdfa0..13cb6e8b615 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -2,18 +2,16 @@ MODULE    = dsound.dll
 IMPORTLIB = dsound
 IMPORTS   = dxguid uuid winmm ole32 advapi32 user32
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	capture.c \
 	dsound.c \
+	dsound_classes.idl \
 	dsound_convert.c \
 	dsound_main.c \
 	duplex.c \
 	mixer.c \
 	primary.c \
 	propset.c \
-	sound3d.c
-
-IDL_SRCS = dsound_classes.idl
-
-RC_SRCS = version.rc
+	sound3d.c \
+	version.rc
diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in
index 611e6011575..87ac11cc479 100644
--- a/dlls/dsquery/Makefile.in
+++ b/dlls/dsquery/Makefile.in
@@ -1,8 +1,6 @@
 MODULE = dsquery.dll
 IMPORTS = uuid
 
-C_SRCS = \
+SOURCES = \
+	dsquery.idl \
 	main.c
-
-IDL_SRCS = \
-	dsquery.idl
diff --git a/dlls/dsuiext/Makefile.in b/dlls/dsuiext/Makefile.in
index d3d663bf0c3..be2ea90d947 100644
--- a/dlls/dsuiext/Makefile.in
+++ b/dlls/dsuiext/Makefile.in
@@ -1,8 +1,6 @@
 MODULE  = dsuiext.dll
 IMPORTS = ole32 uuid
 
-C_SRCS = \
-	dsuiext.c
-
-IDL_SRCS = \
+SOURCES = \
+	dsuiext.c \
 	dsuiext.idl
diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index 8535e8fc27b..814f9f8e217 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -2,11 +2,9 @@ MODULE    = dswave.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	dmobject.c \
+	dswave.idl \
 	dswave_main.c \
+	version.rc \
 	wave.c
-
-IDL_SRCS = dswave.idl
-
-RC_SRCS = version.rc
diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in
index 1b2249da6a7..2939e4de2ac 100644
--- a/dlls/dx8vb/Makefile.in
+++ b/dlls/dx8vb/Makefile.in
@@ -3,9 +3,7 @@ IMPORTS   = uuid ole32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = dx8vb.idl
-
-RC_SRCS = version.rc
+SOURCES = \
+	dx8vb.idl \
+	main.c \
+	version.rc
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index 127981e8183..da0b48b9894 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -1,12 +1,9 @@
 MODULE    = dxdiagn.dll
 IMPORTS   = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	container.c \
 	dxdiag_main.c \
+	dxdiagn.idl \
+	dxdiagn.rc \
 	provider.c
-
-RC_SRCS = dxdiagn.rc
-
-IDL_SRCS = \
-	dxdiagn.idl
diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
index d5d78252113..45e9c62fb17 100644
--- a/dlls/evr/Makefile.in
+++ b/dlls/evr/Makefile.in
@@ -5,11 +5,10 @@ DELAYIMPORTS = mfplat
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	evr.c \
+	evr_classes.idl \
 	main.c \
 	mixer.c \
 	presenter.c \
 	sample.c
-
-IDL_SRCS = evr_classes.idl
diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in
index 18d054c7fad..4b108c59f1e 100644
--- a/dlls/explorerframe/Makefile.in
+++ b/dlls/explorerframe/Makefile.in
@@ -1,12 +1,9 @@
 MODULE    = explorerframe.dll
 IMPORTS   = uuid ole32 comctl32 shell32 user32
 
-C_SRCS = \
+SOURCES = \
+	explorerframe.idl \
 	explorerframe_main.c \
 	nstc.c \
-	taskbarlist.c
-
-IDL_SRCS = explorerframe.idl
-
-RC_SRCS = \
+	taskbarlist.c \
 	version.rc
diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in
index b541ae9470b..7df63207010 100644
--- a/dlls/gameux/Makefile.in
+++ b/dlls/gameux/Makefile.in
@@ -1,11 +1,9 @@
 MODULE    = gameux.dll
 IMPORTS   = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi
 
-C_SRCS = \
+SOURCES = \
 	factory.c \
 	gameexplorer.c \
-	gamestatistics.c
-
-IDL_SRCS = gameux_tlb.idl
-
-RC_SRCS = rsrc.rc
+	gamestatistics.c \
+	gameux_tlb.idl \
+	rsrc.rc
diff --git a/dlls/geolocation/Makefile.in b/dlls/geolocation/Makefile.in
index b1274a1e2c8..283806d14bf 100644
--- a/dlls/geolocation/Makefile.in
+++ b/dlls/geolocation/Makefile.in
@@ -1,7 +1,6 @@
 MODULE = geolocation.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/graphicscapture/Makefile.in b/dlls/graphicscapture/Makefile.in
index 28fc3eee3b5..c17d4a448a8 100644
--- a/dlls/graphicscapture/Makefile.in
+++ b/dlls/graphicscapture/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = graphicscapture.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	session.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in
index 4aeb7619911..54198a3e02d 100644
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@@ -3,10 +3,9 @@ IMPORTLIB = hlink
 IMPORTS   = uuid shell32 ole32 advapi32
 DELAYIMPORTS = urlmon
 
-C_SRCS = \
+SOURCES = \
 	browse_ctx.c \
 	extserv.c \
+	hlink_classes.idl \
 	hlink_main.c \
 	link.c
-
-IDL_SRCS = hlink_classes.idl
diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in
index 0ff7c511eb4..ced479ddec9 100644
--- a/dlls/hnetcfg/Makefile.in
+++ b/dlls/hnetcfg/Makefile.in
@@ -3,15 +3,13 @@ IMPORTS   = oleaut32 ole32 advapi32 mpr uuid
 DELAYIMPORTS = ws2_32 winhttp shcore xmllite
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	apps.c \
 	hnetcfg.c \
+	hnetcfg.idl \
+	hnetcfg_tlb.idl \
 	manager.c \
 	policy.c \
 	port.c \
 	profile.c \
 	service.c
-
-IDL_SRCS = \
-	hnetcfg.idl \
-	hnetcfg_tlb.idl
diff --git a/dlls/hvsimanagementapi/Makefile.in b/dlls/hvsimanagementapi/Makefile.in
index c2a67062fad..658dd8aa99f 100644
--- a/dlls/hvsimanagementapi/Makefile.in
+++ b/dlls/hvsimanagementapi/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = hvsimanagementapi.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	host.c \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/ia2comproxy/Makefile.in b/dlls/ia2comproxy/Makefile.in
index 48f58a8093e..3e8380c6f7d 100644
--- a/dlls/ia2comproxy/Makefile.in
+++ b/dlls/ia2comproxy/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = ia2comproxy.dll
 IMPORTS   = uuid oleacc oleaut32 ole32 rpcrt4
 
-IDL_SRCS = \
+SOURCES = \
 	ia2_classes.idl \
 	oleacc_classes.idl
 
diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in
index 00c5fd1eabd..7b1db81a3d1 100644
--- a/dlls/ieproxy/Makefile.in
+++ b/dlls/ieproxy/Makefile.in
@@ -1,7 +1,7 @@
 MODULE = ieproxy.dll
 IMPORTS = uuid ole32 rpcrt4
 
-IDL_SRCS = \
+SOURCES = \
 	ieproxy_ieautomation.idl \
 	ieproxy_perhist.idl
 
diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in
index 079f3128297..bf774371142 100644
--- a/dlls/inetcomm/Makefile.in
+++ b/dlls/inetcomm/Makefile.in
@@ -4,8 +4,10 @@ IMPORTS   = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	imaptransport.c \
+	inetcomm.idl \
+	inetcomm.rc \
 	inetcomm_main.c \
 	internettransport.c \
 	mimeintl.c \
@@ -13,7 +15,3 @@ C_SRCS = \
 	pop3transport.c \
 	protocol.c \
 	smtptransport.c
-
-RC_SRCS = inetcomm.rc
-
-IDL_SRCS = inetcomm.idl
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index d70e2fa52fe..f1ebc4320da 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -3,8 +3,7 @@ IMPORTS   = uuid advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	infosoft.idl \
 	infosoft_main.c \
 	wordbreaker.c
-
-IDL_SRCS = infosoft.idl
diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index 0217203791a..40eda55661a 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = uuid ole32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = inseng_main.c
-
-IDL_SRCS = inseng_classes.idl
+SOURCES = \
+	inseng_classes.idl \
+	inseng_main.c
diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index 2d34b74ed78..8c8d6b44dc4 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -1,14 +1,12 @@
 MODULE    = itss.dll
 IMPORTS   = uuid urlmon shlwapi ole32
 
-C_SRCS = \
+SOURCES = \
 	chm_lib.c \
 	itss.c \
+	itss.idl \
 	lzx.c \
 	moniker.c \
 	protocol.c \
+	rsrc.rc \
 	storage.c
-
-IDL_SRCS = itss.idl
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
index 1deffe1cc0e..8eb1809be9b 100644
--- a/dlls/mf/Makefile.in
+++ b/dlls/mf/Makefile.in
@@ -5,11 +5,13 @@ DELAYIMPORTS = evr urlmon user32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	clock.c \
 	copier.c \
 	evr.c \
 	main.c \
+	mf.idl \
+	mf.rc \
 	quality.c \
 	samplegrabber.c \
 	sar.c \
@@ -17,7 +19,3 @@ C_SRCS = \
 	session.c \
 	topology.c \
 	topology_loader.c
-
-IDL_SRCS = mf.idl
-
-RC_SRCS = mf.rc
diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in
index a0e944c0633..6e83cf19b9c 100644
--- a/dlls/mfmediaengine/Makefile.in
+++ b/dlls/mfmediaengine/Makefile.in
@@ -3,9 +3,7 @@ IMPORTS = oleaut32 ole32 mfplat mf mfuuid dxguid uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = \
+SOURCES = \
+	main.c \
 	mediaengine.idl \
 	mediaengine_classes.idl
diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in
index 35e3ff75398..242fc53e38c 100644
--- a/dlls/mfreadwrite/Makefile.in
+++ b/dlls/mfreadwrite/Makefile.in
@@ -5,8 +5,7 @@ DELAYIMPORTS = mf
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	mf_classes.idl \
 	reader.c \
 	writer.c
-
-IDL_SRCS = mf_classes.idl
diff --git a/dlls/mfsrcsnk/Makefile.in b/dlls/mfsrcsnk/Makefile.in
index 5f586dcc83f..7a3f947eb0c 100644
--- a/dlls/mfsrcsnk/Makefile.in
+++ b/dlls/mfsrcsnk/Makefile.in
@@ -4,8 +4,7 @@ IMPORTS   = ole32 mfplat mfuuid uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	factory.c \
+	mfsrcsnk.idl \
 	wave.c
-
-IDL_SRCS = mfsrcsnk.idl
diff --git a/dlls/mmcndmgr/Makefile.in b/dlls/mmcndmgr/Makefile.in
index e156ceb26a1..72f1acaded8 100644
--- a/dlls/mmcndmgr/Makefile.in
+++ b/dlls/mmcndmgr/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = uuid oleaut32 ole32 user32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	mmcndmgr.c
-
-IDL_SRCS = mmcndmgr.idl
+SOURCES = \
+	mmcndmgr.c \
+	mmcndmgr.idl
diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in
index d9ec97b87e5..90c2302ef50 100644
--- a/dlls/mmdevapi/Makefile.in
+++ b/dlls/mmdevapi/Makefile.in
@@ -1,13 +1,12 @@
 MODULE    = mmdevapi.dll
 IMPORTS   = ole32 oleaut32 user32 advapi32 version
 
-C_SRCS = \
+SOURCES = \
 	audiosessionmanager.c \
 	audiovolume.c \
 	client.c \
 	devenum.c \
 	main.c \
+	mmdevapi_classes.idl \
 	session.c \
 	spatialaudio.c
-
-IDL_SRCS = mmdevapi_classes.idl
diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in
index 3ba343a4d34..ff2f2f24116 100644
--- a/dlls/mp3dmod/Makefile.in
+++ b/dlls/mp3dmod/Makefile.in
@@ -3,8 +3,6 @@ IMPORTS   = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbas
 EXTRAINCL = $(MPG123_PE_CFLAGS)
 EXTRADEFS = -DMPG123_NO_LARGENAME
 
-C_SRCS = \
-	mp3dmod.c
-
-IDL_SRCS = \
+SOURCES = \
+	mp3dmod.c \
 	mp3dmod.idl
diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in
index 9c1fba502c5..74fee1adea5 100644
--- a/dlls/msado15/Makefile.in
+++ b/dlls/msado15/Makefile.in
@@ -1,13 +1,11 @@
 MODULE    = msado15.dll
 IMPORTS   = oleaut32 ole32
 
-C_SRCS = \
+SOURCES = \
 	command.c \
 	connection.c \
 	main.c \
+	msado15_classes.idl \
+	msado15_tlb.idl \
 	recordset.c \
 	stream.c
-
-IDL_SRCS = \
-	msado15_classes.idl \
-	msado15_tlb.idl
diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in
index 95639bd0fc4..0e97e78cb33 100644
--- a/dlls/mscoree/Makefile.in
+++ b/dlls/mscoree/Makefile.in
@@ -3,15 +3,14 @@ IMPORTS   = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	assembly.c \
 	config.c \
 	cordebug.c \
 	corruntimehost.c \
 	metadata.c \
 	metahost.c \
+	mscoree_classes.idl \
 	mscoree_main.c
 
-IDL_SRCS = mscoree_classes.idl
-
 metahost_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""
diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in
index 7dcd5b64113..624b5e6f2da 100644
--- a/dlls/mscoree/tests/Makefile.in
+++ b/dlls/mscoree/tests/Makefile.in
@@ -1,11 +1,10 @@
 TESTDLL   = mscoree.dll
 IMPORTS   = ole32 shlwapi uuid shell32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	comtest.c \
 	debugging.c \
+	interfaces.idl \
 	metahost.c \
-	mscoree.c
-
-RC_SRCS = resource.rc
-IDL_SRCS = interfaces.idl
+	mscoree.c \
+	resource.rc
diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in
index 3e04f7b6cbf..917c78be5c2 100644
--- a/dlls/msctf/Makefile.in
+++ b/dlls/msctf/Makefile.in
@@ -3,7 +3,7 @@ IMPORTS   = uuid ole32 oleaut32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	categorymgr.c \
 	compartmentmgr.c \
 	context.c \
@@ -12,10 +12,7 @@ C_SRCS = \
 	inputprocessor.c \
 	langbarmgr.c \
 	msctf.c \
+	msctf_classes.idl \
 	range.c \
-	threadmgr.c
-
-IDL_SRCS = msctf_classes.idl
-
-RC_SRCS = \
+	threadmgr.c \
 	version.rc
diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in
index 992aeef65f7..b3d3f0ed932 100644
--- a/dlls/msctfp/Makefile.in
+++ b/dlls/msctfp/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = msctfp.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
-IDL_SRCS = msctfp.idl
+SOURCES = \
+	msctfp.idl
 
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer
diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in
index 14bef85fa9f..1a974266d11 100644
--- a/dlls/msdaps/Makefile.in
+++ b/dlls/msdaps/Makefile.in
@@ -2,13 +2,11 @@ MODULE    = msdaps.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 EXTRAIDLFLAGS = --win32-align=2
 
-C_SRCS = \
+SOURCES = \
 	main.c \
+	msdaps.idl \
 	row_server.c \
+	row_server.idl \
 	usrmarshal.c
 
-IDL_SRCS = \
-	msdaps.idl \
-	row_server.idl
-
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_
diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in
index 0f5453131f6..d94d1481d1a 100644
--- a/dlls/msdasql/Makefile.in
+++ b/dlls/msdasql/Makefile.in
@@ -3,10 +3,8 @@ IMPORTS   = uuid ole32 oleaut32 odbc32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	msdasql.rc \
+	msdasql_classes.idl \
 	msdasql_main.c \
 	session.c
-
-RC_SRCS = msdasql.rc
-
-IDL_SRCS = msdasql_classes.idl
diff --git a/dlls/mshtml.tlb/Makefile.in b/dlls/mshtml.tlb/Makefile.in
index 7eda5da0e18..16c9c054eed 100644
--- a/dlls/mshtml.tlb/Makefile.in
+++ b/dlls/mshtml.tlb/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = mshtml.tlb
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-IDL_SRCS = mshtml_tlb.idl
+SOURCES = \
+	mshtml_tlb.idl
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 14e992a6593..1e509a62e85 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = mshtml
 IMPORTS   = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
 DELAYIMPORTS = wininet inetcomm
 
-C_SRCS = \
+SOURCES = \
 	conpoint.c \
 	dispex.c \
 	editor.c \
@@ -40,11 +40,15 @@ C_SRCS = \
 	ifacewrap.c \
 	loadopts.c \
 	main.c \
+	mshtml.rc \
+	mshtml_classes.idl \
+	mshtml_private_iface.idl \
 	mutation.c \
 	navigate.c \
 	npplugin.c \
 	nsembed.c \
 	nsevents.c \
+	nsiface.idl \
 	nsio.c \
 	nsservice.c \
 	olecmd.c \
@@ -64,10 +68,3 @@ C_SRCS = \
 	xmlhttprequest.c
 
 nsembed_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""
-
-RC_SRCS = mshtml.rc
-
-IDL_SRCS = \
-	mshtml_classes.idl \
-	mshtml_private_iface.idl \
-	nsiface.idl
diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in
index ce258d13ada..112810a1d0d 100644
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@@ -1,6 +1,7 @@
 TESTDLL   = mshtml.dll
 IMPORTS   = ole32 oleaut32 shlwapi wininet user32 urlmon gdi32 advapi32
-C_SRCS = \
+
+SOURCES = \
 	activex.c \
 	dom.c \
 	events.c \
@@ -8,10 +9,8 @@ C_SRCS = \
 	htmllocation.c \
 	misc.c \
 	protocol.c \
+	rsrc.rc \
 	script.c \
 	style.c \
+	test_tlb.idl \
 	xmlhttprequest.c
-
-IDL_SRCS = test_tlb.idl
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in
index d04285aebd6..c90d7bcd47f 100644
--- a/dlls/msident/Makefile.in
+++ b/dlls/msident/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = msident.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	msident.c
-
-IDL_SRCS = msident_classes.idl
+SOURCES = \
+	msident.c \
+	msident_classes.idl
diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in
index c76c274969c..63a94112cad 100644
--- a/dlls/msimtf/Makefile.in
+++ b/dlls/msimtf/Makefile.in
@@ -3,8 +3,7 @@ IMPORTS   = uuid imm32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	activeimmapp.c \
-	main.c
-
-IDL_SRCS = msimtf.idl
+	main.c \
+	msimtf.idl
diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in
index 36950fd53cc..0694f336bcc 100644
--- a/dlls/msscript.ocx/Makefile.in
+++ b/dlls/msscript.ocx/Makefile.in
@@ -1,9 +1,9 @@
 MODULE    = msscript.ocx
-RC_SRCS   = msscript.rc
-IDL_SRCS  = msscript.idl
 IMPORTS   = gdi32 user32 ole32 oleaut32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	msscript.c
+SOURCES = \
+	msscript.c \
+	msscript.idl \
+	msscript.rc
diff --git a/dlls/msscript.ocx/tests/Makefile.in b/dlls/msscript.ocx/tests/Makefile.in
index cc62590133a..57df9267f62 100644
--- a/dlls/msscript.ocx/tests/Makefile.in
+++ b/dlls/msscript.ocx/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = msscript.ocx
 IMPORTS   = user32 gdi32 ole32 oleaut32 advapi32
 
-C_SRCS = \
-	msscript.c
-
-IDL_SRCS = msscript.idl
+SOURCES = \
+	msscript.c \
+	msscript.idl
diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in
index 086d3c0c5ab..bb6ed7638dc 100644
--- a/dlls/mstask/Makefile.in
+++ b/dlls/mstask/Makefile.in
@@ -1,13 +1,11 @@
 MODULE    = mstask.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
-C_SRCS = \
+SOURCES = \
+	atsvc.idl \
 	factory.c \
+	mstask_local.idl \
 	mstask_main.c \
 	task.c \
 	task_scheduler.c \
 	task_trigger.c
-
-IDL_SRCS = \
-	atsvc.idl \
-	mstask_local.idl
diff --git a/dlls/msxml/Makefile.in b/dlls/msxml/Makefile.in
index b43593d5629..cdfc0916e5a 100644
--- a/dlls/msxml/Makefile.in
+++ b/dlls/msxml/Makefile.in
@@ -1,5 +1,5 @@
 MODULE = msxml.dll
 
-IDL_SRCS = msxml_tlb.idl
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	msxml_tlb.idl \
+	rsrc.rc
diff --git a/dlls/msxml2/Makefile.in b/dlls/msxml2/Makefile.in
index b3fefc35507..81dab815a29 100644
--- a/dlls/msxml2/Makefile.in
+++ b/dlls/msxml2/Makefile.in
@@ -1,3 +1,4 @@
 MODULE = msxml2.dll
 
-IDL_SRCS = msxml2_tlb.idl
+SOURCES = \
+	msxml2_tlb.idl
diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in
index bc1f051b091..1305e4352e7 100644
--- a/dlls/msxml3/tests/Makefile.in
+++ b/dlls/msxml3/tests/Makefile.in
@@ -1,15 +1,13 @@
 TESTDLL   = msxml3.dll
 IMPORTS   = oleaut32 ole32 user32 shlwapi
 
-C_SRCS = \
+SOURCES = \
 	domdoc.c \
 	httpreq.c \
+	rsrc.rc \
 	saxreader.c \
 	schema.c \
 	xmldoc.c \
 	xmlparser.c \
+	xmlparser.idl \
 	xmlview.c
-
-IDL_SRCS = xmlparser.idl
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in
index 8abf6683a03..16884177308 100644
--- a/dlls/msxml4/Makefile.in
+++ b/dlls/msxml4/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = msxml4.dll
 IMPORTS   = ole32 advapi32
 
-IDL_SRCS = msxml4_tlb.idl
-RC_SRCS = rsrc.rc
+SOURCES = \
+	msxml4_tlb.idl \
+	rsrc.rc
diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in
index 6cbe43af743..d3b7cccfdf3 100644
--- a/dlls/msxml6/Makefile.in
+++ b/dlls/msxml6/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = msxml6.dll
 IMPORTS   = oleaut32 ole32 advapi32
 
-RC_SRCS = rsrc.rc
-IDL_SRCS = msxml6_tlb.idl
+SOURCES = \
+	msxml6_tlb.idl \
+	rsrc.rc
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index cb0ea5168b5..055e8dd04d4 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -3,13 +3,11 @@ UNIXLIB   = netapi32.so
 IMPORTLIB = netapi32
 IMPORTS   = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi
 
-C_SRCS = \
+SOURCES = \
+	atsvc.idl \
 	nbcmdqueue.c \
 	nbnamecache.c \
 	nbt.c \
 	netapi32.c \
 	netbios.c \
 	unixlib.c
-
-IDL_SRCS = \
-	atsvc.idl
diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in
index 7d4b3b5a203..6eaa1e89aff 100644
--- a/dlls/netcfgx/Makefile.in
+++ b/dlls/netcfgx/Makefile.in
@@ -3,8 +3,7 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	main.c \
-	netcfg.c
-
-IDL_SRCS = netcfgx_classes.idl
+	netcfg.c \
+	netcfgx_classes.idl
diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in
index c491c483c3a..46af13bb74c 100644
--- a/dlls/netprofm/Makefile.in
+++ b/dlls/netprofm/Makefile.in
@@ -3,8 +3,7 @@ IMPORTS   = iphlpapi
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	list.c \
-	main.c
-
-IDL_SRCS = netprofm.idl
+	main.c \
+	netprofm.idl
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index e7b070bb750..a04a75e7f52 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -3,13 +3,10 @@ IMPORTLIB = ntoskrnl
 IMPORTS   = advapi32 hal msvcrt
 DELAYIMPORTS = rpcrt4 setupapi
 
-C_SRCS = \
+SOURCES = \
 	instr.c \
 	ntoskrnl.c \
+	ntoskrnl.rc \
+	plugplay.idl \
 	pnp.c \
 	sync.c
-
-RC_SRCS = ntoskrnl.rc
-
-IDL_SRCS = \
-	plugplay.idl
diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in
index d177686067e..ec3b675b6d7 100644
--- a/dlls/objsel/Makefile.in
+++ b/dlls/objsel/Makefile.in
@@ -1,9 +1,7 @@
 MODULE    = objsel.dll
 IMPORTS   = strmiids uuid ole32 advapi32
 
-C_SRCS = \
-	objsel.c
-
-IDL_SRCS = objsel_classes.idl
-
-RC_SRCS = objsel.rc
+SOURCES = \
+	objsel.c \
+	objsel.rc \
+	objsel_classes.idl
diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index 331229f2d4e..4bd7438aec5 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -2,14 +2,12 @@ MODULE    = oleacc.dll
 IMPORTLIB = oleacc
 IMPORTS   = uuid oleaut32 ole32 user32 rpcrt4
 
-C_SRCS = \
+SOURCES = \
 	client.c \
 	main.c \
+	oleacc.rc \
+	oleacc_classes.idl \
 	propservice.c \
 	window.c
 
-IDL_SRCS = oleacc_classes.idl
-
-RC_SRCS = oleacc.rc
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEACC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 82e5fa97fac..04dfcaa2bd3 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -4,11 +4,14 @@ IMPORTLIB = oleaut32
 IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = comctl32 urlmon windowscodecs
 
-C_SRCS = \
+SOURCES = \
 	connpt.c \
 	dispatch.c \
 	hash.c \
 	oleaut.c \
+	oleaut32.rc \
+	oleaut32_oaidl.idl \
+	oleaut32_ocidl.idl \
 	olefont.c \
 	olepicture.c \
 	olepropframe.c \
@@ -20,10 +23,4 @@ C_SRCS = \
 	variant.c \
 	vartype.c
 
-RC_SRCS = oleaut32.rc
-
-IDL_SRCS = \
-	oleaut32_oaidl.idl \
-	oleaut32_ocidl.idl
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer
diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in
index 098ea9deef7..b8e7615a04e 100644
--- a/dlls/oleaut32/tests/Makefile.in
+++ b/dlls/oleaut32/tests/Makefile.in
@@ -1,22 +1,19 @@
 TESTDLL   = oleaut32.dll
 IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	dispatch.c \
 	olefont.c \
 	olepicture.c \
 	safearray.c \
+	test_reg.idl \
+	test_simple.idl \
+	test_tlb.idl \
 	tmarshal.c \
+	tmarshal.idl \
+	tmarshal.rc \
 	typelib.c \
 	usrmarshal.c \
 	varformat.c \
 	vartest.c \
 	vartype.c
-
-RC_SRCS = tmarshal.rc
-
-IDL_SRCS = \
-	test_reg.idl \
-	test_simple.idl \
-	test_tlb.idl \
-	tmarshal.idl
diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in
index 58e8f7b519d..e72a45762bc 100644
--- a/dlls/oledb32/Makefile.in
+++ b/dlls/oledb32/Makefile.in
@@ -1,17 +1,14 @@
 MODULE    = oledb32.dll
 IMPORTS   = uuid oleaut32 ole32 comctl32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	convert.c \
+	convert.idl \
 	datainit.c \
 	dslocator.c \
 	errorinfo.c \
 	main.c \
-	rowpos.c
-
-IDL_SRCS = \
-	convert.idl \
 	oledb32_classes.idl \
-	oledb32_typelib.idl
-
-RC_SRCS = version.rc
+	oledb32_typelib.idl \
+	rowpos.c \
+	version.rc
diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in
index 1a4e07ead1e..df99b317649 100644
--- a/dlls/oledb32/tests/Makefile.in
+++ b/dlls/oledb32/tests/Makefile.in
@@ -1,9 +1,8 @@
 TESTDLL   = oledb32.dll
 IMPORTS   = uuid oleaut32 ole32 user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	convert.c \
+	convert.idl \
 	database.c \
 	marshal.c
-
-IDL_SRCS = convert.idl
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in
index 032fdbd482b..eefde3bac93 100644
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@@ -2,8 +2,7 @@ MODULE    = olepro32.dll
 IMPORTLIB = olepro32
 IMPORTS   = oleaut32
 
-C_SRCS = olepro32stubs.c
-
-IDL_SRCS = olepro.idl
-
-RC_SRCS = version.rc
+SOURCES = \
+	olepro.idl \
+	olepro32stubs.c \
+	version.rc
diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in
index 0867b1bd882..16df3e6063f 100644
--- a/dlls/opcservices/Makefile.in
+++ b/dlls/opcservices/Makefile.in
@@ -2,11 +2,9 @@ MODULE    = opcservices.dll
 IMPORTS   = $(ZLIB_PE_LIBS) uuid ole32 advapi32 urlmon xmllite oleaut32
 EXTRAINCL = $(ZLIB_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	compress.c \
 	factory.c \
+	opcservices.idl \
 	package.c \
 	uri.c
-
-IDL_SRCS = \
-	opcservices.idl
diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in
index a2b2daa0cea..5fc89d807a8 100644
--- a/dlls/packager/Makefile.in
+++ b/dlls/packager/Makefile.in
@@ -1,8 +1,7 @@
 MODULE = packager.dll
 IMPORTS = uuid shell32 shlwapi user32
 
-C_SRCS = \
+SOURCES = \
+	packager.rc \
+	packager_classes.idl \
 	packager_main.c
-
-RC_SRCS = packager.rc
-IDL_SRCS = packager_classes.idl
diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in
index 166b7751d6e..4a3e77a6ba5 100644
--- a/dlls/propsys/Makefile.in
+++ b/dlls/propsys/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = ole32 oleaut32 uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	propstore.c \
+	propsys_classes.idl \
 	propsys_main.c \
 	propvar.c
-
-IDL_SRCS = propsys_classes.idl
diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index 62d06a759b4..41040b640b8 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	pstorec.c
-
-IDL_SRCS = pstorec_tlb.idl
+SOURCES = \
+	pstorec.c \
+	pstorec_tlb.idl
diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in
index 05c947b6255..e37a03c4e60 100644
--- a/dlls/qasf/Makefile.in
+++ b/dlls/qasf/Makefile.in
@@ -1,12 +1,9 @@
 MODULE    = qasf.dll
 IMPORTS   = strmbase dmoguids strmiids uuid ole32 oleaut32 wmvcore
 
-C_SRCS = \
+SOURCES = \
 	asfreader.c \
 	dmowrapper.c \
-	qasf_main.c
-
-IDL_SRCS = \
-	qasf_classes.idl
-
-RC_SRCS = version.rc
+	qasf_classes.idl \
+	qasf_main.c \
+	version.rc
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index 56482c23ced..10e543137f5 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -3,18 +3,15 @@ UNIXLIB   = qcap.so
 IMPORTS   = strmbase strmiids uuid ole32 oleaut32 winmm
 DELAYIMPORTS = msvfw32
 
-C_SRCS = \
+SOURCES = \
 	audiorecord.c \
 	avico.c \
 	avimux.c \
 	capturegraph.c \
 	filewriter.c \
+	qcap_classes.idl \
 	qcap_main.c \
 	smartteefilter.c \
 	v4l.c \
+	version.rc \
 	vfwcapture.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = \
-	qcap_classes.idl
diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in
index 4c2266d633a..03989faf53c 100644
--- a/dlls/qdvd/Makefile.in
+++ b/dlls/qdvd/Makefile.in
@@ -3,12 +3,9 @@ IMPORTS   = strmbase strmiids uuid ole32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	graph.c \
 	navigator.c \
-	qdvd_main.c
-
-IDL_SRCS = \
-	qdvd_classes.idl
-
-RC_SRCS = version.rc
+	qdvd_classes.idl \
+	qdvd_main.c \
+	version.rc
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index f9b6f5c3ed9..9545b21c091 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -1,13 +1,11 @@
 MODULE    = qedit.dll
 IMPORTS   = strmiids strmbase uuid oleaut32 ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	main.c \
 	mediadet.c \
 	nullrenderer.c \
+	qedit_classes.idl \
 	samplegrabber.c \
-	timeline.c
-
-IDL_SRCS = qedit_classes.idl
-
-RC_SRCS = version.rc
+	timeline.c \
+	version.rc
diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in
index 21d2328e2f0..6ff7af03e9d 100644
--- a/dlls/qmgr/Makefile.in
+++ b/dlls/qmgr/Makefile.in
@@ -3,15 +3,13 @@ IMPORTS   = uuid winhttp ole32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	enum_files.c \
 	enum_jobs.c \
 	factory.c \
 	file.c \
 	job.c \
 	qmgr.c \
+	qmgr_local.idl \
+	rsrc.rc \
 	service.c
-
-RC_SRCS = rsrc.rc
-
-IDL_SRCS = qmgr_local.idl
diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in
index bdbe0bcc299..a222c51a5b1 100644
--- a/dlls/qmgrprxy/Makefile.in
+++ b/dlls/qmgrprxy/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = qmgrprxy.dll
 IMPORTS   = rpcrt4
 
-IDL_SRCS = qmgrprxy.idl
+SOURCES = \
+	qmgrprxy.idl
 
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 7854a87e846..ae45fa8c387 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -2,9 +2,10 @@ MODULE    = quartz.dll
 IMPORTLIB = quartz
 IMPORTS   = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm
 
-C_SRCS = \
+SOURCES = \
 	acmwrapper.c \
 	avidec.c \
+	control_tlb.idl \
 	dsoundrender.c \
 	filesource.c \
 	filtergraph.c \
@@ -12,16 +13,12 @@ C_SRCS = \
 	main.c \
 	memallocator.c \
 	passthrough.c \
+	quartz.rc \
+	quartz_strmif.idl \
 	regsvr.c \
 	systemclock.c \
 	videorenderer.c \
 	vmr9.c \
 	window.c
 
-RC_SRCS = quartz.rc
-
-IDL_SRCS = \
-	control_tlb.idl \
-	quartz_strmif.idl
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 3542118d1a0..f2f6d35b2a5 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -6,10 +6,11 @@ DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 ole32 oleaut32
 
 ndr_types_EXTRAIDLFLAGS = -Oicf
 
-C_SRCS = \
+SOURCES = \
 	cproxy.c \
 	cpsf.c \
 	cstub.c \
+	epm.idl \
 	ndr_clientserver.c \
 	ndr_contexthandle.c \
 	ndr_es.c \
@@ -18,6 +19,7 @@ C_SRCS = \
 	ndr_ole.c \
 	ndr_stubless.c \
 	ndr_typelib.c \
+	ndr_types.idl \
 	rpc_assoc.c \
 	rpc_async.c \
 	rpc_binding.c \
@@ -25,10 +27,5 @@ C_SRCS = \
 	rpc_message.c \
 	rpc_server.c \
 	rpc_transport.c \
-	rpcrt4_main.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = \
-	epm.idl \
-	ndr_types.idl
+	rpcrt4_main.c \
+	version.rc
diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in
index 1e7276c893a..f46ff49219a 100644
--- a/dlls/rpcrt4/tests/Makefile.in
+++ b/dlls/rpcrt4/tests/Makefile.in
@@ -6,15 +6,13 @@ EXTRADEFS = -DPROXY_DELEGATION
 server_EXTRAIDLFLAGS = -Os --prefix-client=mixed_
 server_interp_EXTRAIDLFLAGS = -Oicf --prefix-client=interp_
 
-C_SRCS = \
+SOURCES = \
 	cstub.c \
+	cstub.idl \
 	generated.c \
 	ndr_marshall.c \
 	rpc.c \
 	rpc_async.c \
-	server.c
-
-IDL_SRCS = \
-	cstub.idl \
+	server.c \
 	server.idl \
 	server_interp.idl
diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index 4229320e473..008d0f74545 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -2,19 +2,15 @@ MODULE    = sapi.dll
 IMPORTS   = uuid ole32 user32 advapi32
 DELAYIMPORTS = winmm
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	automation.c \
 	main.c \
 	mmaudio.c \
 	resource.c \
+	sapi.rc \
+	sapi_classes.idl \
+	sapi_typelib.idl \
 	stream.c \
 	token.c \
 	tts.c
-
-IDL_SRCS = \
-	sapi_classes.idl \
-	sapi_typelib.idl
-
-RC_SRCS = \
-	sapi.rc
diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in
index ccd483edae2..40dee0b48df 100644
--- a/dlls/schedsvc/Makefile.in
+++ b/dlls/schedsvc/Makefile.in
@@ -1,11 +1,9 @@
 MODULE    = schedsvc.dll
 IMPORTS   = rpcrt4 advapi32 ole32 xmllite
 
-C_SRCS = \
+SOURCES = \
 	atsvc.c \
-	schedsvc.c \
-	svc_main.c
-
-IDL_SRCS = \
 	atsvc.idl \
-	schrpc.idl
+	schedsvc.c \
+	schrpc.idl \
+	svc_main.c
diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in
index 62f41d4744f..d78da177906 100644
--- a/dlls/schedsvc/tests/Makefile.in
+++ b/dlls/schedsvc/tests/Makefile.in
@@ -1,10 +1,8 @@
 TESTDLL   = schedsvc.dll
 IMPORTS   = advapi32 rpcrt4 ole32
 
-C_SRCS = \
-	atsvcapi.c \
-	rpcapi.c
-
-IDL_SRCS = \
+SOURCES = \
 	atsvc.idl \
+	atsvcapi.c \
+	rpcapi.c \
 	schrpc.idl
diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in
index ad21234f065..db95fa0b7d3 100644
--- a/dlls/scrobj/Makefile.in
+++ b/dlls/scrobj/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = uuid urlmon ole32 oleaut32 xmllite advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	scrobj.c
-
-IDL_SRCS = scrobj.idl
+SOURCES = \
+	scrobj.c \
+	scrobj.idl
diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in
index 12be899162b..94395f52797 100644
--- a/dlls/scrrun/Makefile.in
+++ b/dlls/scrrun/Makefile.in
@@ -4,11 +4,9 @@ IMPORTS   = uuid oleaut32 version advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	dictionary.c \
 	filesystem.c \
-	scrrun.c
-
-RC_SRCS = scrrun.rc
-
-IDL_SRCS = scrrun.idl
+	scrrun.c \
+	scrrun.idl \
+	scrrun.rc
diff --git a/dlls/scrrun/tests/Makefile.in b/dlls/scrrun/tests/Makefile.in
index e9eccb686d2..ffd11ea72ea 100644
--- a/dlls/scrrun/tests/Makefile.in
+++ b/dlls/scrrun/tests/Makefile.in
@@ -1,8 +1,7 @@
 TESTDLL   = scrrun.dll
 IMPORTS   = ole32 shlwapi uuid oleaut32 user32
 
-C_SRCS = \
+SOURCES = \
 	dictionary.c \
-	filesystem.c
-
-IDL_SRCS = scrrun.idl
+	filesystem.c \
+	scrrun.idl
diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in
index f930088d3a7..ec1eb100683 100644
--- a/dlls/sechost/Makefile.in
+++ b/dlls/sechost/Makefile.in
@@ -3,11 +3,9 @@ IMPORTLIB = sechost
 IMPORTS   = kernelbase
 DELAYIMPORTS = rpcrt4
 
-C_SRCS = \
+SOURCES = \
+	plugplay.idl \
 	security.c \
 	service.c \
+	svcctl.idl \
 	trace.c
-
-IDL_SRCS = \
-	plugplay.idl \
-	svcctl.idl
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index 9523f299ce1..d38782eaf22 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -3,11 +3,8 @@ IMPORTLIB = shdocvw
 IMPORTS   = uuid shlwapi advapi32
 DELAYIMPORTS = version ole32 oleaut32 ieframe
 
-C_SRCS = \
+SOURCES = \
+	shdocvw.rc \
 	shdocvw_main.c \
+	shdocvw_v1.idl \
 	shlinstobj.c
-
-RC_SRCS = \
-	shdocvw.rc
-
-IDL_SRCS = shdocvw_v1.idl
diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in
index 125d81b6e52..9826cf08612 100644
--- a/dlls/stdole2.tlb/Makefile.in
+++ b/dlls/stdole2.tlb/Makefile.in
@@ -2,5 +2,6 @@ MODULE    = stdole2.tlb
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS = rsrc.rc
-IDL_SRCS = stdole2.idl
+SOURCES = \
+	rsrc.rc \
+	stdole2.idl
diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in
index 9fc649ee5a4..8ae404a4711 100644
--- a/dlls/stdole32.tlb/Makefile.in
+++ b/dlls/stdole32.tlb/Makefile.in
@@ -2,5 +2,6 @@ MODULE    = stdole32.tlb
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS = rsrc.rc
-IDL_SRCS = std_ole_v1.idl
+SOURCES = \
+	rsrc.rc \
+	std_ole_v1.idl
diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index f6e542c64d5..cbdc42ea2d0 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -4,10 +4,9 @@ IMPORTS   = uuid ole32 oleaut32 rpcrt4 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	sti.c \
-	sti_main.c
-
-IDL_SRCS = sti_wia.idl
+	sti_main.c \
+	sti_wia.idl
 
 dlldata_EXTRADEFS = -DENTRY_PREFIX=STI_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in
index e271d7df7f2..9c93f16da66 100644
--- a/dlls/sxs/tests/Makefile.in
+++ b/dlls/sxs/tests/Makefile.in
@@ -1,10 +1,9 @@
 TESTDLL   = sxs.dll
 IMPORTS   = sxs shlwapi
 
-C_SRCS = \
+SOURCES = \
 	cache.c \
+	interfaces.idl \
 	name.c \
+	resource.rc \
 	sxs.c
-
-RC_SRCS = resource.rc
-IDL_SRCS = interfaces.idl
diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in
index 4634c5bbe84..fcc39fd6f04 100644
--- a/dlls/taskschd/Makefile.in
+++ b/dlls/taskschd/Makefile.in
@@ -3,13 +3,11 @@ IMPORTS   = oleaut32 ole32 advapi32 xmllite rpcrt4
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	folder.c \
 	folder_collection.c \
 	regtask.c \
-	task.c \
-	taskschd.c
-
-IDL_SRCS = \
 	schrpc.idl \
+	task.c \
+	taskschd.c \
 	taskschd_tlb.idl
diff --git a/dlls/threadpoolwinrt/Makefile.in b/dlls/threadpoolwinrt/Makefile.in
index 1058cac55a8..6181210d0bb 100644
--- a/dlls/threadpoolwinrt/Makefile.in
+++ b/dlls/threadpoolwinrt/Makefile.in
@@ -1,7 +1,6 @@
 MODULE = threadpoolwinrt.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
index e632e19bd7c..29192a60c6e 100644
--- a/dlls/uianimation/Makefile.in
+++ b/dlls/uianimation/Makefile.in
@@ -3,9 +3,7 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = \
+SOURCES = \
+	main.c \
 	uianimation_reg.idl \
 	uianimation_typelib.idl
diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
index f0f2a853cfb..008c7b1deb1 100644
--- a/dlls/uiautomationcore/Makefile.in
+++ b/dlls/uiautomationcore/Makefile.in
@@ -4,7 +4,10 @@ IMPORTS   = uuid ole32 oleaut32 user32 oleacc
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	uia_classes.idl \
+	uia_classes_client.idl \
+	uia_classes_core.idl \
 	uia_client.c \
 	uia_com_client.c \
 	uia_event.c \
@@ -12,8 +15,3 @@ C_SRCS = \
 	uia_main.c \
 	uia_provider.c \
 	uia_utils.c
-
-IDL_SRCS = \
-	uia_classes.idl \
-	uia_classes_client.idl \
-	uia_classes_core.idl
diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in
index 0b9724d87a9..f355938ec4f 100644
--- a/dlls/uiribbon/Makefile.in
+++ b/dlls/uiribbon/Makefile.in
@@ -1,8 +1,7 @@
 MODULE    = uiribbon.dll
 IMPORTS   = uuid ole32
 
-C_SRCS = \
+SOURCES = \
 	main.c \
-	uiribbon.c
-
-IDL_SRCS = uiribbon_classes.idl
+	uiribbon.c \
+	uiribbon_classes.idl
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index a29c831e455..ba6f1db87ad 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = urlmon
 IMPORTS   = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32
 DELAYIMPORTS = advpack
 
-C_SRCS = \
+SOURCES = \
 	axinstall.c \
 	bindctx.c \
 	binding.c \
@@ -23,12 +23,10 @@ C_SRCS = \
 	umon.c \
 	umstream.c \
 	uri.c \
+	urlmon.rc \
 	urlmon_main.c \
+	urlmon_urlmon.idl \
 	usrmarshal.c
 
-RC_SRCS = urlmon.rc
-
-IDL_SRCS = urlmon_urlmon.idl
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \
 	    -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}"
diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in
index 927280bef22..437ecf76be8 100644
--- a/dlls/vbscript/tests/Makefile.in
+++ b/dlls/vbscript/tests/Makefile.in
@@ -1,12 +1,10 @@
 TESTDLL   = vbscript.dll
 IMPORTS   = oleaut32 ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	caller.c \
 	createobj.c \
+	rsrc.rc \
 	run.c \
-	vbscript.c
-
-RC_SRCS = rsrc.rc
-
-IDL_SRCS = vbsregexp55.idl
+	vbscript.c \
+	vbsregexp55.idl
diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in
index 682cee35391..9f1b33092fa 100644
--- a/dlls/wbemdisp/Makefile.in
+++ b/dlls/wbemdisp/Makefile.in
@@ -3,10 +3,8 @@ IMPORTS   = oleaut32 ole32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	locator.c \
-	main.c
-
-IDL_SRCS = \
+	main.c \
 	wbemdisp_classes.idl \
 	wbemdisp_tlb.idl
diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in
index c2ba299c4e3..cdc17a68045 100644
--- a/dlls/wiaservc/Makefile.in
+++ b/dlls/wiaservc/Makefile.in
@@ -3,11 +3,9 @@ IMPORTS   = uuid ole32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	factory.c \
+	rsrc.rc \
 	service.c \
-	wiadevmgr.c
-
-IDL_SRCS = wiaservc.idl
-
-RC_SRCS = rsrc.rc
+	wiadevmgr.c \
+	wiaservc.idl
diff --git a/dlls/windows.applicationmodel/Makefile.in b/dlls/windows.applicationmodel/Makefile.in
index ca0d03b0b23..82646f4d8f4 100644
--- a/dlls/windows.applicationmodel/Makefile.in
+++ b/dlls/windows.applicationmodel/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = windows.applicationmodel.dll
 IMPORTS = combase kernelbase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	package.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.devices.bluetooth/Makefile.in b/dlls/windows.devices.bluetooth/Makefile.in
index a7af5a1327d..216c1f7ae9b 100644
--- a/dlls/windows.devices.bluetooth/Makefile.in
+++ b/dlls/windows.devices.bluetooth/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = windows.devices.bluetooth.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
 	bluetoothadapter.c \
+	classes.idl \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in
index e5b492e2bb9..93c15dfcc64 100644
--- a/dlls/windows.devices.enumeration/Makefile.in
+++ b/dlls/windows.devices.enumeration/Makefile.in
@@ -1,9 +1,8 @@
 MODULE = windows.devices.enumeration.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
 	access.c \
+	classes.idl \
 	event_handlers.c \
 	main.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/windows.devices.usb/Makefile.in b/dlls/windows.devices.usb/Makefile.in
index d205b8be87d..7deda726750 100644
--- a/dlls/windows.devices.usb/Makefile.in
+++ b/dlls/windows.devices.usb/Makefile.in
@@ -1,9 +1,7 @@
 MODULE = windows.devices.usb.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	usbdevice.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in
index 3ec3dd0d864..1342a4f9dde 100644
--- a/dlls/windows.gaming.input/Makefile.in
+++ b/dlls/windows.gaming.input/Makefile.in
@@ -1,8 +1,9 @@
 MODULE = windows.gaming.input.dll
 IMPORTS = combase uuid user32 dinput8 setupapi hid
 
-C_SRCS = \
+SOURCES = \
 	async.c \
+	classes.idl \
 	condition_effect.c \
 	constant_effect.c \
 	controller.c \
@@ -13,10 +14,7 @@ C_SRCS = \
 	manager.c \
 	periodic_effect.c \
 	provider.c \
+	provider.idl \
 	racing_wheel.c \
 	ramp_effect.c \
 	vector.c
-
-IDL_SRCS = \
-	classes.idl \
-	provider.idl
diff --git a/dlls/windows.gaming.ui.gamebar/Makefile.in b/dlls/windows.gaming.ui.gamebar/Makefile.in
index a0eefc4b951..96bec124506 100644
--- a/dlls/windows.gaming.ui.gamebar/Makefile.in
+++ b/dlls/windows.gaming.ui.gamebar/Makefile.in
@@ -1,8 +1,6 @@
 MODULE = windows.gaming.ui.gamebar.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.globalization/Makefile.in b/dlls/windows.globalization/Makefile.in
index d29c44ea746..3aaaa62c4a5 100644
--- a/dlls/windows.globalization/Makefile.in
+++ b/dlls/windows.globalization/Makefile.in
@@ -1,7 +1,6 @@
 MODULE = windows.globalization.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in
index b4cdb69900e..44a63bf7cc3 100644
--- a/dlls/windows.media.devices/Makefile.in
+++ b/dlls/windows.media.devices/Makefile.in
@@ -1,7 +1,6 @@
 MODULE = windows.media.devices.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/windows.media.mediacontrol/Makefile.in b/dlls/windows.media.mediacontrol/Makefile.in
index d4bb8bf4d3e..f43097a3bbd 100644
--- a/dlls/windows.media.mediacontrol/Makefile.in
+++ b/dlls/windows.media.mediacontrol/Makefile.in
@@ -1,8 +1,6 @@
 MODULE  = windows.media.mediacontrol.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in
index 10903cb1d7b..5be66d8367e 100644
--- a/dlls/windows.media.speech/Makefile.in
+++ b/dlls/windows.media.speech/Makefile.in
@@ -1,13 +1,12 @@
 MODULE = windows.media.speech.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
 	async.c \
+	classes.idl \
 	event_handlers.c \
 	listconstraint.c \
 	main.c \
 	recognizer.c \
 	synthesizer.c \
 	vector.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/windows.media/Makefile.in b/dlls/windows.media/Makefile.in
index be5012c170f..9ab83d7e07f 100644
--- a/dlls/windows.media/Makefile.in
+++ b/dlls/windows.media/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = windows.media.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
 	captions.c \
+	classes.idl \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.networking.hostname/Makefile.in b/dlls/windows.networking.hostname/Makefile.in
index 72ef78cc716..8bb0eee7729 100644
--- a/dlls/windows.networking.hostname/Makefile.in
+++ b/dlls/windows.networking.hostname/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = windows.networking.hostname.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	hostname.c \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.perception.stub/Makefile.in b/dlls/windows.perception.stub/Makefile.in
index dd4274e2055..18c90e697c4 100644
--- a/dlls/windows.perception.stub/Makefile.in
+++ b/dlls/windows.perception.stub/Makefile.in
@@ -1,10 +1,8 @@
 MODULE  = windows.perception.stub.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	holographicspace.c \
 	main.c \
 	observer.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/Makefile.in b/dlls/windows.security.credentials.ui.userconsentverifier/Makefile.in
index 3794a442baa..82ed7ea79dc 100644
--- a/dlls/windows.security.credentials.ui.userconsentverifier/Makefile.in
+++ b/dlls/windows.security.credentials.ui.userconsentverifier/Makefile.in
@@ -1,10 +1,8 @@
 MODULE  = windows.security.credentials.ui.userconsentverifier.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
 	async.c \
-	main.c
-
-IDL_SRCS = \
 	classes.idl \
+	main.c \
 	provider.idl
diff --git a/dlls/windows.storage.applicationdata/Makefile.in b/dlls/windows.storage.applicationdata/Makefile.in
index 68a21908592..f712fef4ae9 100644
--- a/dlls/windows.storage.applicationdata/Makefile.in
+++ b/dlls/windows.storage.applicationdata/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = windows.storage.applicationdata.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
 	applicationdata.c \
+	classes.idl \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.system.profile.systemmanufacturers/Makefile.in b/dlls/windows.system.profile.systemmanufacturers/Makefile.in
index 9d07caa287c..20f630011dd 100644
--- a/dlls/windows.system.profile.systemmanufacturers/Makefile.in
+++ b/dlls/windows.system.profile.systemmanufacturers/Makefile.in
@@ -1,8 +1,6 @@
 MODULE  = windows.system.profile.systemmanufacturers.dll
 IMPORTS = combase oleaut32
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windows.ui/Makefile.in b/dlls/windows.ui/Makefile.in
index 592d023f353..3389b364090 100644
--- a/dlls/windows.ui/Makefile.in
+++ b/dlls/windows.ui/Makefile.in
@@ -1,9 +1,7 @@
 MODULE  = windows.ui.dll
 IMPORTS = combase advapi32
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	uisettings.c
-
-IDL_SRCS = \
-	classes.idl
diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index 068730971e8..511d45170d3 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = windowscodecs
 IMPORTS   = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
 EXTRAINCL = $(TIFF_PE_CFLAGS) $(JPEG_PE_CFLAGS) $(PNG_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	bitmap.c \
 	bmpdecode.c \
 	bmpencode.c \
@@ -36,10 +36,8 @@ C_SRCS = \
 	tgaformat.c \
 	ungif.c \
 	uuid.c \
-	wincodecs_common.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = windowscodecs_wincodec.idl
+	version.rc \
+	wincodecs_common.c \
+	windowscodecs_wincodec.idl
 
 dlldata_EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index f963dcea7f0..02b1b04fdf9 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = mfplat mf
 UNIX_CFLAGS  = $(GSTREAMER_CFLAGS)
 UNIX_LIBS    = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	aac_decoder.c \
 	color_convert.c \
 	h264_decoder.c \
@@ -17,6 +17,7 @@ C_SRCS = \
 	quartz_parser.c \
 	quartz_transform.c \
 	resampler.c \
+	rsrc.rc \
 	unixlib.c \
 	video_decoder.c \
 	video_processor.c \
@@ -26,12 +27,7 @@ C_SRCS = \
 	wg_parser.c \
 	wg_sample.c \
 	wg_transform.c \
+	winegstreamer_classes.idl \
 	wm_reader.c \
 	wma_decoder.c \
 	wmv_decoder.c
-
-IDL_SRCS = \
-	winegstreamer_classes.idl
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index 360769a0758..995587aa37f 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -4,15 +4,13 @@ IMPORTLIB = winhttp
 IMPORTS   = uuid jsproxy user32 advapi32 ws2_32
 DELAYIMPORTS = oleaut32 crypt32 secur32 iphlpapi dhcpcsvc
 
-C_SRCS = \
+SOURCES = \
 	cookie.c \
 	handle.c \
 	main.c \
 	net.c \
 	request.c \
+	rsrc.rc \
 	session.c \
-	url.c
-
-IDL_SRCS = winhttp_tlb.idl
-
-RC_SRCS = rsrc.rc
+	url.c \
+	winhttp_tlb.idl
diff --git a/dlls/wintypes/Makefile.in b/dlls/wintypes/Makefile.in
index aaa954322f7..c6789d41974 100644
--- a/dlls/wintypes/Makefile.in
+++ b/dlls/wintypes/Makefile.in
@@ -1,7 +1,6 @@
 MODULE = wintypes.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = classes.idl
diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in
index 22d756c1f5a..1b1004a0067 100644
--- a/dlls/wmiutils/Makefile.in
+++ b/dlls/wmiutils/Makefile.in
@@ -3,9 +3,8 @@ IMPORTS   = oleaut32 ole32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	main.c \
 	path.c \
-	statuscode.c
-
-IDL_SRCS = wmiutils_classes.idl
+	statuscode.c \
+	wmiutils_classes.idl
diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in
index 0e17ee4b257..76f52605536 100644
--- a/dlls/wmp/Makefile.in
+++ b/dlls/wmp/Makefile.in
@@ -3,11 +3,10 @@ IMPORTS   = oleaut32 ole32 urlmon shlwapi user32 gdi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	events.c \
 	oleobj.c \
 	player.c \
-	wmp_main.c
-
-RC_SRCS = rsrc.rc
-IDL_SRCS = wmp_typelib.idl
+	rsrc.rc \
+	wmp_main.c \
+	wmp_typelib.idl
diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in
index cb095120e94..eeb55bf7232 100644
--- a/dlls/wmphoto/Makefile.in
+++ b/dlls/wmphoto/Makefile.in
@@ -5,10 +5,9 @@ PARENTSRC = ../windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	decoder.c \
 	jxrlib.c \
 	main.c \
-	wincodecs_common.c
-
-IDL_SRCS = wmphoto.idl
+	wincodecs_common.c \
+	wmphoto.idl
diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in
index 37be33631e5..75bf0a7827e 100644
--- a/dlls/wpc/Makefile.in
+++ b/dlls/wpc/Makefile.in
@@ -2,7 +2,6 @@ MODULE = wpc.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	wpc.c
-
-IDL_SRCS = wpc_classes.idl
+SOURCES = \
+	wpc.c \
+	wpc_classes.idl
diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in
index 27297eed2f0..8d2bae1887c 100644
--- a/dlls/wshom.ocx/Makefile.in
+++ b/dlls/wshom.ocx/Makefile.in
@@ -3,11 +3,9 @@ IMPORTS   = uuid oleaut32 ole32 shell32 user32 advapi32 scrrun
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	network.c \
 	shell.c \
+	wshom.idl \
+	wshom.rc \
 	wshom_main.c
-
-RC_SRCS = wshom.rc
-
-IDL_SRCS = wshom.idl
diff --git a/dlls/wshom.ocx/tests/Makefile.in b/dlls/wshom.ocx/tests/Makefile.in
index f115163aceb..afc18b9eb9c 100644
--- a/dlls/wshom.ocx/tests/Makefile.in
+++ b/dlls/wshom.ocx/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = wshom.ocx
 IMPORTS   = oleaut32 ole32 advapi32
 
-C_SRCS = \
-	wshom.c
-
-IDL_SRCS = wshom.idl
+SOURCES = \
+	wshom.c \
+	wshom.idl
diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in
index 4c4a57d2f15..0a2d06eed0c 100644
--- a/dlls/wuapi/Makefile.in
+++ b/dlls/wuapi/Makefile.in
@@ -3,13 +3,12 @@ IMPORTS   = uuid ole32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	downloader.c \
 	installer.c \
 	main.c \
 	searcher.c \
 	session.c \
 	systeminfo.c \
-	updates.c
-
-IDL_SRCS = wuapi_tlb.idl
+	updates.c \
+	wuapi_tlb.idl
diff --git a/dlls/xactengine2_0/Makefile.in b/dlls/xactengine2_0/Makefile.in
index 5c4b635b060..2064afadc3d 100644
--- a/dlls/xactengine2_0/Makefile.in
+++ b/dlls/xactengine2_0/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0200
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in
index 2b5fd547b61..b61774d6693 100644
--- a/dlls/xactengine2_4/Makefile.in
+++ b/dlls/xactengine2_4/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0204
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in
index 6861555b23b..bd91161fd2c 100644
--- a/dlls/xactengine2_7/Makefile.in
+++ b/dlls/xactengine2_7/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0207
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in
index e5f8c83e962..10e0578a82c 100644
--- a/dlls/xactengine2_9/Makefile.in
+++ b/dlls/xactengine2_9/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0209
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in
index 10259e44ee0..b944a7d5a7a 100644
--- a/dlls/xactengine3_0/Makefile.in
+++ b/dlls/xactengine3_0/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0300
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in
index 3105c3443bd..410ac6ce4f2 100644
--- a/dlls/xactengine3_1/Makefile.in
+++ b/dlls/xactengine3_1/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0301
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in
index 92481ba1e26..32d855dd2c3 100644
--- a/dlls/xactengine3_2/Makefile.in
+++ b/dlls/xactengine3_2/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0302
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in
index 1963f033557..650b577a16c 100644
--- a/dlls/xactengine3_3/Makefile.in
+++ b/dlls/xactengine3_3/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0303
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in
index 5d639c4e7ad..1fad4f2f4c4 100644
--- a/dlls/xactengine3_4/Makefile.in
+++ b/dlls/xactengine3_4/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0304
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in
index 47731dd7017..1e74124da75 100644
--- a/dlls/xactengine3_5/Makefile.in
+++ b/dlls/xactengine3_5/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0305
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in
index b0e235ecd08..12861dbfad9 100644
--- a/dlls/xactengine3_6/Makefile.in
+++ b/dlls/xactengine3_6/Makefile.in
@@ -4,7 +4,6 @@ EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0306
 PARENTSRC = ../xactengine3_7
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in
index 128a41cf59a..e9b815b9b6a 100644
--- a/dlls/xactengine3_7/Makefile.in
+++ b/dlls/xactengine3_7/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = $(FAUDIO_PE_LIBS) ole32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 EXTRADEFS = -DXACT3_VER=0x0307
 
-C_SRCS = \
+SOURCES = \
+	xact_classes.idl \
 	xact_dll.c
-
-IDL_SRCS = xact_classes.idl
diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in
index 563bfeaf0cb..81e2e5ae95b 100644
--- a/dlls/xapofx1_1/Makefile.in
+++ b/dlls/xapofx1_1/Makefile.in
@@ -4,11 +4,9 @@ IMPORTS   = $(FAUDIO_PE_LIBS) ole32
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
+	version.rc \
 	xapo.c \
 	xapofx.c \
-	xaudio_allocator.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = xaudio_classes.idl
+	xaudio_allocator.c \
+	xaudio_classes.idl
diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in
index f37fcd356ac..63534142460 100644
--- a/dlls/xapofx1_2/Makefile.in
+++ b/dlls/xapofx1_2/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) ole32
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xapofx.c \
-	xaudio_allocator.c
-
-IDL_SRCS = xaudio_classes.idl
+	xaudio_allocator.c \
+	xaudio_classes.idl
diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in
index 5fb6ea8acad..e0c2a17f9e2 100644
--- a/dlls/xapofx1_3/Makefile.in
+++ b/dlls/xapofx1_3/Makefile.in
@@ -4,11 +4,9 @@ IMPORTS   = $(FAUDIO_PE_LIBS) ole32
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
+	version.rc \
 	xapo.c \
 	xapofx.c \
-	xaudio_allocator.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = xaudio_classes.idl
+	xaudio_allocator.c \
+	xaudio_classes.idl
diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in
index 3b29169a321..43dde8f047e 100644
--- a/dlls/xapofx1_4/Makefile.in
+++ b/dlls/xapofx1_4/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) ole32
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xapofx.c \
-	xaudio_allocator.c
-
-IDL_SRCS = xaudio_classes.idl
+	xaudio_allocator.c \
+	xaudio_classes.idl
diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in
index 71937520a68..fb534286626 100644
--- a/dlls/xapofx1_5/Makefile.in
+++ b/dlls/xapofx1_5/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) ole32
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xapofx.c \
-	xaudio_allocator.c
-
-IDL_SRCS = xaudio_classes.idl
+	xaudio_allocator.c \
+	xaudio_classes.idl
diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in
index 49340bb90ba..64a0efd3925 100644
--- a/dlls/xaudio2_0/Makefile.in
+++ b/dlls/xaudio2_0/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in
index 38a157a433f..ebfe545f31e 100644
--- a/dlls/xaudio2_1/Makefile.in
+++ b/dlls/xaudio2_1/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
index 9d0fd75a2e0..3bc76019aff 100644
--- a/dlls/xaudio2_2/Makefile.in
+++ b/dlls/xaudio2_2/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in
index f4ef0d4f2f5..dec87cf0bcd 100644
--- a/dlls/xaudio2_3/Makefile.in
+++ b/dlls/xaudio2_3/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in
index 0b4f2a81a9f..37c0a361a7a 100644
--- a/dlls/xaudio2_4/Makefile.in
+++ b/dlls/xaudio2_4/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in
index 6d4c5bdb3aa..75ec4a32d4e 100644
--- a/dlls/xaudio2_5/Makefile.in
+++ b/dlls/xaudio2_5/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in
index 568f39ad9bb..ba84d189fc4 100644
--- a/dlls/xaudio2_6/Makefile.in
+++ b/dlls/xaudio2_6/Makefile.in
@@ -4,9 +4,8 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	xapo.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
index 40f81d76d36..0d88bfe6dd3 100644
--- a/dlls/xaudio2_7/Makefile.in
+++ b/dlls/xaudio2_7/Makefile.in
@@ -3,11 +3,10 @@ MODULE    = xaudio2_7.dll
 IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	x3daudio.c \
 	xapo.c \
 	xapofx.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_7/tests/Makefile.in b/dlls/xaudio2_7/tests/Makefile.in
index 99b982a97ed..19150da77e0 100644
--- a/dlls/xaudio2_7/tests/Makefile.in
+++ b/dlls/xaudio2_7/tests/Makefile.in
@@ -2,7 +2,6 @@ TESTDLL = xaudio2_7.dll
 IMPORTS = ole32
 EXTRADEFS = -DXAUDIO2_VER=7
 
-C_SRCS = \
-	xaudio2.c
-
-IDL_SRCS = xaudio_classes.idl
+SOURCES = \
+	xaudio2.c \
+	xaudio_classes.idl
diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in
index 131da70954a..b5406fe7fd0 100644
--- a/dlls/xaudio2_8/Makefile.in
+++ b/dlls/xaudio2_8/Makefile.in
@@ -5,11 +5,10 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
 	x3daudio.c \
 	xapo.c \
 	xapofx.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_8/tests/Makefile.in b/dlls/xaudio2_8/tests/Makefile.in
index f8e0eae50e4..e1fbb10853b 100644
--- a/dlls/xaudio2_8/tests/Makefile.in
+++ b/dlls/xaudio2_8/tests/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS = ole32 xaudio2_8
 EXTRADEFS = -DXAUDIO2_VER=8
 PARENTSRC = ../../xaudio2_7/tests
 
-C_SRCS = \
-	xaudio2.c
-
-IDL_SRCS = xaudio_classes.idl
+SOURCES = \
+	xaudio2.c \
+	xaudio_classes.idl
diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in
index 51f69c7ba7d..1db3ea4e9c0 100644
--- a/dlls/xaudio2_9/Makefile.in
+++ b/dlls/xaudio2_9/Makefile.in
@@ -4,13 +4,11 @@ IMPORTS   = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
 EXTRAINCL = $(FAUDIO_PE_CFLAGS)
 PARENTSRC = ../xaudio2_7
 
-C_SRCS = \
+SOURCES = \
+	version.rc \
 	x3daudio.c \
 	xapo.c \
 	xapofx.c \
 	xaudio_allocator.c \
+	xaudio_classes.idl \
 	xaudio_dll.c
-
-IDL_SRCS = xaudio_classes.idl
-
-RC_SRCS = version.rc
diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in
index 7d3e74768f3..1aeda6cad0f 100644
--- a/programs/cscript/Makefile.in
+++ b/programs/cscript/Makefile.in
@@ -5,9 +5,8 @@ PARENTSRC = ../wscript
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
+SOURCES = \
 	arguments.c \
 	host.c \
+	ihost.idl \
 	main.c
-
-IDL_SRCS = ihost.idl
diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in
index 137ea28ba43..ce595a6d759 100644
--- a/programs/plugplay/Makefile.in
+++ b/programs/plugplay/Makefile.in
@@ -3,8 +3,6 @@ IMPORTS   = advapi32 rpcrt4 user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = \
+SOURCES = \
+	main.c \
 	plugplay.idl
diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in
index a4d3533e55e..e643f66f38d 100644
--- a/programs/rpcss/Makefile.in
+++ b/programs/rpcss/Makefile.in
@@ -3,12 +3,10 @@ IMPORTS   = rpcrt4 advapi32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	epmp.c \
-	irotp.c \
-	rpcss_main.c
-
-IDL_SRCS = \
+SOURCES = \
 	epm.idl \
+	epmp.c \
 	irot.idl \
-	irpcss.idl
+	irotp.c \
+	irpcss.idl \
+	rpcss_main.c
diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in
index 31e77c49082..735fb6ec886 100644
--- a/programs/services/Makefile.in
+++ b/programs/services/Makefile.in
@@ -3,9 +3,8 @@ IMPORTS   = rpcrt4 advapi32 userenv setupapi
 
 EXTRADLLFLAGS = -mconsole
 
-C_SRCS = \
+SOURCES = \
 	rpc.c \
 	services.c \
+	svcctl.idl \
 	utils.c
-
-IDL_SRCS = svcctl.idl
diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in
index 33b2e66d9bc..21511a3ca81 100644
--- a/programs/wscript/Makefile.in
+++ b/programs/wscript/Makefile.in
@@ -3,9 +3,8 @@ IMPORTS   = uuid shell32 oleaut32 ole32 user32 advapi32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
 	arguments.c \
 	host.c \
+	ihost.idl \
 	main.c
-
-IDL_SRCS = ihost.idl
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 0e4a31648c3..e74f9c7dd7a 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -358,7 +358,8 @@ sub assign_sources_to_makefiles(@)
         elsif ($name =~ /\.idl$/)
         {
             die "no makedep flags specified in $file" unless $dir eq "include" || get_makedep_flags($file);
-            push @{${$make}{"=IDL_SRCS"}}, $name;
+            push @{${$make}{"=SOURCES"}}, $name;
+            next;
         }
         elsif ($name =~ /\.spec$/)
         {
@@ -392,7 +393,6 @@ sub assign_sources_to_makefiles(@)
         preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "SOURCES" );
         preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" );
         preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" );
-        preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" );
     }
 }