diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
index a4879f54c4b..d54e6c040a9 100644
--- a/dlls/aclui/Makefile.in
+++ b/dlls/aclui/Makefile.in
@@ -4,6 +4,6 @@ IMPORTS   = comctl32 user32 advapi32 gdi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = aclui_main.c
-
-RC_SRCS = aclui.rc
+SOURCES = \
+	aclui.rc \
+	aclui_main.c
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index 8ed0754ca9c..1b6cce08e67 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -4,7 +4,7 @@ IMPORTLIB = advapi32
 IMPORTS   = kernelbase sechost msvcrt
 DELAYIMPORTS = rpcrt4 user32
 
-C_SRCS = \
+SOURCES = \
 	advapi.c \
 	cred.c \
 	crypt.c \
@@ -16,7 +16,5 @@ C_SRCS = \
 	registry.c \
 	security.c \
 	service.c \
+	version.rc \
 	wmi.c
-
-
-RC_SRCS = version.rc
diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
index 3dec3cbabeb..766a228c3f0 100644
--- a/dlls/advapi32/tests/Makefile.in
+++ b/dlls/advapi32/tests/Makefile.in
@@ -1,7 +1,7 @@
 TESTDLL   = advapi32.dll
 IMPORTS   = advapi32 user32
 
-C_SRCS = \
+SOURCES = \
 	cred.c \
 	crypt.c \
 	crypt_lmhash.c \
@@ -12,7 +12,6 @@ C_SRCS = \
 	lsa.c \
 	perf.c \
 	registry.c \
+	rsrc.rc \
 	security.c \
 	service.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in
index eb756ddf39d..f6344602d99 100644
--- a/dlls/amstream/tests/Makefile.in
+++ b/dlls/amstream/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = amstream.dll
 IMPORTS   = strmbase strmiids uuid ddraw ole32 user32
 
-C_SRCS = \
-	amstream.c
-
-RC_SRCS = \
+SOURCES = \
+	amstream.c \
 	rsrc.rc
diff --git a/dlls/atl80/tests/Makefile.in b/dlls/atl80/tests/Makefile.in
index ba4854511e1..4612c4e851e 100644
--- a/dlls/atl80/tests/Makefile.in
+++ b/dlls/atl80/tests/Makefile.in
@@ -2,8 +2,6 @@ TESTDLL   = atl80.dll
 IMPORTS   = uuid atl80 oleaut32 ole32 advapi32 user32
 EXTRADEFS = -D_ATL_VER=_ATL_VER_80
 
-C_SRCS = \
-	atl.c
-
-RC_SRCS = \
+SOURCES = \
+	atl.c \
 	atl80.rc
diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
index 11f4acea4f2..542837b2a7a 100644
--- a/dlls/bcrypt/Makefile.in
+++ b/dlls/bcrypt/Makefile.in
@@ -4,11 +4,10 @@ IMPORTLIB = bcrypt
 UNIXLIB   = bcrypt.so
 UNIX_CFLAGS = $(GNUTLS_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	bcrypt_main.c \
 	gnutls.c \
 	md2.c \
 	sha256.c \
-	sha512.c
-
-RC_SRCS = version.rc
+	sha512.c \
+	version.rc
diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index 4ee406480ac..a72e5a31be6 100644
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -3,9 +3,8 @@ IMPORTLIB = cabinet
 IMPORTS   = $(ZLIB_PE_LIBS)
 EXTRAINCL = $(ZLIB_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
+	cabinet.rc \
 	cabinet_main.c \
 	fci.c \
 	fdi.c
-
-RC_SRCS = cabinet.rc
diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in
index 395b15018ad..1192feaf22c 100644
--- a/dlls/cards/Makefile.in
+++ b/dlls/cards/Makefile.in
@@ -2,9 +2,7 @@ MODULE    = cards.dll
 IMPORTLIB = cards
 IMPORTS   = user32 gdi32
 
-C_SRCS = \
-	cards.c
-
-RC_SRCS = \
+SOURCES = \
+	cards.c \
 	cards.rc \
 	version.rc
diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in
index 4e954f7d799..18a45e0e863 100644
--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = comcat.dll
 IMPORTS   = ole32
 
-RC_SRCS = \
+SOURCES = \
 	version.rc
diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in
index 3f80250081c..c9b0d5c578f 100644
--- a/dlls/comctl32/tests/Makefile.in
+++ b/dlls/comctl32/tests/Makefile.in
@@ -1,7 +1,7 @@
 TESTDLL   = comctl32.dll
 IMPORTS   = ole32 user32 gdi32 advapi32 imm32
 
-C_SRCS = \
+SOURCES = \
 	animate.c \
 	button.c \
 	combo.c \
@@ -20,6 +20,7 @@ C_SRCS = \
 	progress.c \
 	propsheet.c \
 	rebar.c \
+	rsrc.rc \
 	static.c \
 	status.c \
 	subclass.c \
@@ -31,5 +32,3 @@ C_SRCS = \
 	trackbar.c \
 	treeview.c \
 	updown.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in
index 96c53ae25aa..a3839e090d8 100644
--- a/dlls/comdlg32/tests/Makefile.in
+++ b/dlls/comdlg32/tests/Makefile.in
@@ -1,11 +1,10 @@
 TESTDLL   = comdlg32.dll
 IMPORTS   = uuid shell32 ole32 comdlg32 winspool user32 gdi32
 
-C_SRCS = \
+SOURCES = \
 	filedlg.c \
 	finddlg.c \
 	fontdlg.c \
 	itemdlg.c \
-	printdlg.c
-
-RC_SRCS = rsrc.rc
+	printdlg.c \
+	rsrc.rc
diff --git a/dlls/compstui/Makefile.in b/dlls/compstui/Makefile.in
index 98ec5cb48e7..9a0585b0ed8 100644
--- a/dlls/compstui/Makefile.in
+++ b/dlls/compstui/Makefile.in
@@ -4,7 +4,6 @@ IMPORTS   = comctl32 user32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	compstui.rc \
 	compstui_main.c
-
-RC_SRCS = compstui.rc
diff --git a/dlls/compstui/tests/Makefile.in b/dlls/compstui/tests/Makefile.in
index 8904782645f..d81bee7af7e 100644
--- a/dlls/compstui/tests/Makefile.in
+++ b/dlls/compstui/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = compstui.dll
 IMPORTS   = comctl32 compstui user32
 
-C_SRCS = \
-	compstui.c
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	compstui.c \
+	rsrc.rc
diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in
index 3dae1d7a339..59df971e3b7 100644
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@@ -7,13 +7,14 @@ DELAYIMPORTS = cryptnet
 UNIX_LIBS    = $(SECURITY_LIBS)
 UNIX_CFLAGS  = $(GNUTLS_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	base64.c \
 	cert.c \
 	chain.c \
 	collectionstore.c \
 	context.c \
 	crl.c \
+	crypt32.rc \
 	ctl.c \
 	decode.c \
 	encode.c \
@@ -34,5 +35,3 @@ C_SRCS = \
 	store.c \
 	str.c \
 	unixlib.c
-
-RC_SRCS = crypt32.rc
diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index b9fccf2e31e..1b71d6cf10e 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = cryptui crypt32 wintrust user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	cryptdlg.rc \
 	main.c
-
-RC_SRCS = cryptdlg.rc
diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in
index 9e2031dc17b..06828e5720c 100644
--- a/dlls/cryptui/Makefile.in
+++ b/dlls/cryptui/Makefile.in
@@ -5,7 +5,6 @@ IMPORTLIB = cryptui
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	cryptui.rc \
 	main.c
-
-RC_SRCS = cryptui.rc
diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in
index cd8887064e8..4378350c129 100644
--- a/dlls/d2d1/Makefile.in
+++ b/dlls/d2d1/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = d2d1
 IMPORTS   = d3d10_1 dxguid uuid gdi32 user32 advapi32
 DELAYIMPORTS = dwrite xmllite ole32
 
-C_SRCS = \
+SOURCES = \
 	bitmap.c \
 	bitmap_render_target.c \
 	brush.c \
@@ -18,6 +18,5 @@ C_SRCS = \
 	mesh.c \
 	state_block.c \
 	stroke.c \
+	version.rc \
 	wic_render_target.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index ed0e52def19..b942e27f991 100644
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -5,12 +5,11 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=0
 PARENTSRC = ../d3dcompiler_43
 EXTRAINCL = $(VKD3D_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	d3d10_main.c \
 	effect.c \
 	reflection.c \
 	shader.c \
 	stateblock.c \
-	utils.c
-
-RC_SRCS = version.rc
+	utils.c \
+	version.rc
diff --git a/dlls/d3d10_1/Makefile.in b/dlls/d3d10_1/Makefile.in
index 50ae0383b92..3838af41f90 100644
--- a/dlls/d3d10_1/Makefile.in
+++ b/dlls/d3d10_1/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = d3d10_1.dll
 IMPORTLIB = d3d10_1
 IMPORTS   = dxguid d3d10core dxgi
 
-C_SRCS = \
-	d3d10_1_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3d10_1_main.c \
+	version.rc
diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in
index 9fe4ac96a78..29228cf1782 100644
--- a/dlls/d3d10core/Makefile.in
+++ b/dlls/d3d10core/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = d3d10core.dll
 IMPORTLIB = d3d10core
 IMPORTS   = d3d11 dxgi
 
-C_SRCS = \
-	d3d10core_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3d10core_main.c \
+	version.rc
diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in
index 5197f9ef9d7..83f49602a46 100644
--- a/dlls/d3d11/Makefile.in
+++ b/dlls/d3d11/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = d3d11
 IMPORTS   = dxguid uuid dxgi wined3d
 EXTRAINCL = $(VKD3D_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	buffer.c \
 	d3d11_main.c \
@@ -13,6 +13,5 @@ C_SRCS = \
 	state.c \
 	texture.c \
 	utils.c \
+	version.rc \
 	view.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index 542a052512f..5a718b2d22d 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = d3d8.dll
 IMPORTLIB = d3d8
 IMPORTS   = dxguid uuid wined3d
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	d3d8_main.c \
 	device.c \
@@ -11,6 +11,6 @@ C_SRCS = \
 	surface.c \
 	swapchain.c \
 	texture.c \
+	version.rc \
 	vertexdeclaration.c \
 	volume.c
-RC_SRCS = version.rc
diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in
index 3b406cb30d9..9a2ed9b548e 100644
--- a/dlls/d3d8thk/Makefile.in
+++ b/dlls/d3d8thk/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = d3d8thk.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 1c05f5a3129..5a717b11863 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = d3d9.dll
 IMPORTLIB = d3d9
 IMPORTS   = dxguid uuid wined3d
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	d3d9_main.c \
 	device.c \
@@ -13,7 +13,6 @@ C_SRCS = \
 	surface.c \
 	swapchain.c \
 	texture.c \
+	version.rc \
 	vertexdeclaration.c \
 	volume.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in
index f62573b513d..a7d43eb5d6c 100644
--- a/dlls/d3dim/Makefile.in
+++ b/dlls/d3dim/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = d3dim.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in
index f2106dd977e..f8233a29e0e 100644
--- a/dlls/d3dim700/Makefile.in
+++ b/dlls/d3dim700/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = d3dim700.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in
index 8daaa426c8f..e5381b4919c 100644
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@@ -4,7 +4,7 @@ IMPORTS   = d3dxof ddraw
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	d3drm.c \
 	d3drm_main.c \
 	device.c \
@@ -15,6 +15,5 @@ C_SRCS = \
 	math.c \
 	meshbuilder.c \
 	texture.c \
+	version.rc \
 	viewport.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in
index ec4b2874916..c95a867c685 100644
--- a/dlls/d3dx10_33/Makefile.in
+++ b/dlls/d3dx10_33/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = d3dx10_33.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_33_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_33_main.c \
+	version.rc
diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in
index 6a7aa8446d9..9b6bb65d12c 100644
--- a/dlls/d3dx10_34/Makefile.in
+++ b/dlls/d3dx10_34/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_34
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_34_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_34_main.c \
+	version.rc
diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in
index b0f19e6d837..74e39ae7a9a 100644
--- a/dlls/d3dx10_35/Makefile.in
+++ b/dlls/d3dx10_35/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_35
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_35_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_35_main.c \
+	version.rc
diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in
index 80fcf2b11ef..7e62ee7361f 100644
--- a/dlls/d3dx10_36/Makefile.in
+++ b/dlls/d3dx10_36/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_36
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_36_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_36_main.c \
+	version.rc
diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in
index 3e71e8322ab..703d9fa5d5a 100644
--- a/dlls/d3dx10_37/Makefile.in
+++ b/dlls/d3dx10_37/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_37
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_37_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_37_main.c \
+	version.rc
diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in
index 4a19b943448..5a4ca8faf5d 100644
--- a/dlls/d3dx10_38/Makefile.in
+++ b/dlls/d3dx10_38/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_38
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_38_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_38_main.c \
+	version.rc
diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in
index 101a9717155..cb6911d133d 100644
--- a/dlls/d3dx10_39/Makefile.in
+++ b/dlls/d3dx10_39/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_39
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_39_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_39_main.c \
+	version.rc
diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in
index 9254913f9d1..b351ec3793c 100644
--- a/dlls/d3dx10_40/Makefile.in
+++ b/dlls/d3dx10_40/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_40
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_40_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_40_main.c \
+	version.rc
diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in
index fe79f781107..21d5fa05a6b 100644
--- a/dlls/d3dx10_41/Makefile.in
+++ b/dlls/d3dx10_41/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_41
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_41_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_41_main.c \
+	version.rc
diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in
index f2d7a0f3fb6..ddedeac57f8 100644
--- a/dlls/d3dx10_42/Makefile.in
+++ b/dlls/d3dx10_42/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = d3dx10_42
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	d3dx10_42_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	d3dx10_42_main.c \
+	version.rc
diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in
index 0fab62f4834..3d755499749 100644
--- a/dlls/d3dx10_43/Makefile.in
+++ b/dlls/d3dx10_43/Makefile.in
@@ -5,13 +5,12 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	compiler.c \
 	d3dx10_43_main.c \
 	font.c \
 	mesh.c \
 	sprite.c \
-	texture.c
-
-RC_SRCS = version.rc
+	texture.c \
+	version.rc
diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in
index 7fcce18a8e1..985fc1c59c2 100644
--- a/dlls/d3dx11_42/Makefile.in
+++ b/dlls/d3dx11_42/Makefile.in
@@ -6,9 +6,8 @@ PARENTSRC = ../d3dx11_43
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	main.c \
-	texture.c
-
-RC_SRCS = version.rc
+	texture.c \
+	version.rc
diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in
index ccd4319ace2..762987a89ad 100644
--- a/dlls/d3dx11_43/Makefile.in
+++ b/dlls/d3dx11_43/Makefile.in
@@ -5,9 +5,8 @@ IMPORTS   = d3dcompiler
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	main.c \
-	texture.c
-
-RC_SRCS = version.rc
+	texture.c \
+	version.rc
diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
index bf23db04f1c..d0fef3bebd0 100644
--- a/dlls/d3dx9_24/Makefile.in
+++ b/dlls/d3dx9_24/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
index f7190739256..869c1162904 100644
--- a/dlls/d3dx9_25/Makefile.in
+++ b/dlls/d3dx9_25/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
index a59f1c9f7d0..ae3f2e18953 100644
--- a/dlls/d3dx9_26/Makefile.in
+++ b/dlls/d3dx9_26/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
index ee99ec65b53..4f2993638f3 100644
--- a/dlls/d3dx9_27/Makefile.in
+++ b/dlls/d3dx9_27/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
index b8550538d9f..3c7ddb93c2e 100644
--- a/dlls/d3dx9_28/Makefile.in
+++ b/dlls/d3dx9_28/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
index 58dbedb8a2e..75eb3e73243 100644
--- a/dlls/d3dx9_29/Makefile.in
+++ b/dlls/d3dx9_29/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
index f835432c401..9b8eb133611 100644
--- a/dlls/d3dx9_30/Makefile.in
+++ b/dlls/d3dx9_30/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
index 9072b3e9e9f..52d3a3d0986 100644
--- a/dlls/d3dx9_31/Makefile.in
+++ b/dlls/d3dx9_31/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
index e9fd6ca7900..70a1696de97 100644
--- a/dlls/d3dx9_32/Makefile.in
+++ b/dlls/d3dx9_32/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
index 8eb0d6bb970..2c01e9da3d9 100644
--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
index ab3076e45c5..1e317f37226 100644
--- a/dlls/d3dx9_34/Makefile.in
+++ b/dlls/d3dx9_34/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
index 2afd74c129f..859cef9b1ce 100644
--- a/dlls/d3dx9_35/Makefile.in
+++ b/dlls/d3dx9_35/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index c9bc5021fc8..5370b3e7e7a 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in
index bc5cfc36653..5a45850936e 100644
--- a/dlls/d3dx9_36/tests/Makefile.in
+++ b/dlls/d3dx9_36/tests/Makefile.in
@@ -1,17 +1,16 @@
 TESTDLL   = d3dx9_36.dll
 IMPORTS   = d3dx9 d3d9 user32 gdi32
 
-C_SRCS = \
+SOURCES = \
 	asm.c \
 	core.c \
 	effect.c \
 	line.c \
 	math.c \
 	mesh.c \
+	rsrc.rc \
 	shader.c \
 	surface.c \
 	texture.c \
 	volume.c \
 	xfile.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
index 66431141852..150f1ceb215 100644
--- a/dlls/d3dx9_37/Makefile.in
+++ b/dlls/d3dx9_37/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
index 1af5aaba2ee..5706fe9b203 100644
--- a/dlls/d3dx9_38/Makefile.in
+++ b/dlls/d3dx9_38/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
index 57b5f05d147..9e8f8f6199e 100644
--- a/dlls/d3dx9_39/Makefile.in
+++ b/dlls/d3dx9_39/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
index 9a5cfe44c4b..fe10a5d3dcb 100644
--- a/dlls/d3dx9_40/Makefile.in
+++ b/dlls/d3dx9_40/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
index 093b404df8c..bc02a280d33 100644
--- a/dlls/d3dx9_41/Makefile.in
+++ b/dlls/d3dx9_41/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
index 0dd2b322059..5efa6cc00cd 100644
--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
index 5319ff2b28a..e28429c5236 100644
--- a/dlls/d3dx9_43/Makefile.in
+++ b/dlls/d3dx9_43/Makefile.in
@@ -6,7 +6,7 @@ DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	animation.c \
 	core.c \
 	effect.c \
@@ -25,7 +25,6 @@ C_SRCS = \
 	txc_compress_dxtn.c \
 	txc_fetch_dxtn.c \
 	util.c \
+	version.rc \
 	volume.c \
 	xfile.c
-
-RC_SRCS = version.rc
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index 3657fa7db12..152ef80611a 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -4,7 +4,7 @@ IMPORTS   = kernelbase $(ZLIB_PE_LIBS)
 EXTRAINCL = $(ZLIB_PE_CFLAGS)
 EXTRADEFS = -D_IMAGEHLP_SOURCE_
 
-C_SRCS = \
+SOURCES = \
 	coff.c \
 	cpu_arm.c \
 	cpu_arm64.c \
@@ -25,6 +25,5 @@ C_SRCS = \
 	stack.c \
 	storage.c \
 	symbol.c \
-	type.c
-
-RC_SRCS = version.rc
+	type.c \
+	version.rc
diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in
index 271e480ad4e..d48b901a4fb 100644
--- a/dlls/dcomp/Makefile.in
+++ b/dlls/dcomp/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = dcomp.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	device.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	device.c \
+	version.rc
diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in
index 533ff36c0cc..6d258d43bf9 100644
--- a/dlls/display.drv16/Makefile.in
+++ b/dlls/display.drv16/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -m16
 
-C_SRCS = display.c
-
-RC_SRCS = display.rc
+SOURCES = \
+	display.c \
+	display.rc
diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in
index f07cdf835e9..92a4e83f46b 100644
--- a/dlls/dmime/tests/Makefile.in
+++ b/dlls/dmime/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = dmime.dll
 IMPORTS   = user32 ole32 dsound
 
-C_SRCS = \
-	dmime.c
-
-RC_SRCS = resource.rc
+SOURCES = \
+	dmime.c \
+	resource.rc
diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in
index 0b0e250be48..5d1cc984b1c 100644
--- a/dlls/dmusic32/Makefile.in
+++ b/dlls/dmusic32/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = dmusic32.dll
 IMPORTS   = uuid
 
-C_SRCS = \
-	dmusic32_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	dmusic32_main.c \
+	version.rc
diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in
index 336bf6f8583..6cf1a92205a 100644
--- a/dlls/dnsapi/Makefile.in
+++ b/dlls/dnsapi/Makefile.in
@@ -4,12 +4,10 @@ IMPORTLIB = dnsapi
 DELAYIMPORTS = netapi32
 UNIX_LIBS    = $(RESOLV_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	libresolv.c \
 	main.c \
 	name.c \
 	query.c \
-	record.c
-
-RC_SRCS = \
+	record.c \
 	version.rc
diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in
index b13c0c0b8cf..037ef178865 100644
--- a/dlls/dplay/Makefile.in
+++ b/dlls/dplay/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = dplay.dll
 IMPORTS   = dplayx
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/dpnaddr/Makefile.in b/dlls/dpnaddr/Makefile.in
index 7e98ff5aa59..722b72220d5 100644
--- a/dlls/dpnaddr/Makefile.in
+++ b/dlls/dpnaddr/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = dpnaddr.dll
 IMPORTS   = dpnet
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/dpnhpast/Makefile.in b/dlls/dpnhpast/Makefile.in
index 12a0443d47b..4b24ac9fc83 100644
--- a/dlls/dpnhpast/Makefile.in
+++ b/dlls/dpnhpast/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = dpnhpast.dll
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in
index 6aa9ef1dd80..d73a78805dc 100644
--- a/dlls/dpnhupnp/Makefile.in
+++ b/dlls/dpnhupnp/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = dpnhupnp.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/dpnlobby/Makefile.in b/dlls/dpnlobby/Makefile.in
index 36bb4233dff..87f931c3f64 100644
--- a/dlls/dpnlobby/Makefile.in
+++ b/dlls/dpnlobby/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = dpnlobby.dll
 IMPORTS   = dpnet
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in
index 18b5581a696..d0601de6cd1 100644
--- a/dlls/dpwsockx/Makefile.in
+++ b/dlls/dpwsockx/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = dxguid ws2_32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	dpwsockx_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	dpwsockx_main.c \
+	version.rc
diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in
index 909f2e3010c..f888dfab5fa 100644
--- a/dlls/dssenh/Makefile.in
+++ b/dlls/dssenh/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = dssenh.dll
 IMPORTS   = bcrypt crypt32 advapi32
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	main.c \
+	rsrc.rc
diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
index 37411a57608..4774119e70f 100644
--- a/dlls/dwmapi/Makefile.in
+++ b/dlls/dwmapi/Makefile.in
@@ -4,7 +4,6 @@ IMPORTLIB = dwmapi
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	dwmapi_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	dwmapi_main.c \
+	version.rc
diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in
index dea2e4b58f7..d859e59d06d 100644
--- a/dlls/dxgi/Makefile.in
+++ b/dlls/dxgi/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = dxgi
 IMPORTS   = gdi32 dxguid uuid wined3d user32 win32u
 EXTRAINCL = $(VKD3D_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	adapter.c \
 	device.c \
 	dxgi_main.c \
@@ -11,6 +11,5 @@ C_SRCS = \
 	output.c \
 	resource.c \
 	swapchain.c \
-	utils.c
-
-RC_SRCS = version.rc
+	utils.c \
+	version.rc
diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in
index 6b89635225a..61509f0e356 100644
--- a/dlls/evr/tests/Makefile.in
+++ b/dlls/evr/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = evr.dll
 IMPORTS   = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32
 
-C_SRCS = \
-	evr.c
-
-RC_SRCS = resource.rc
+SOURCES = \
+	evr.c \
+	resource.rc
diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in
index d969421644a..dc889c36b14 100644
--- a/dlls/fltlib/Makefile.in
+++ b/dlls/fltlib/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = fltlib.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	fltlib.c
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	fltlib.c \
+	rsrc.rc
diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in
index 093b64c0d32..7d047d41e65 100644
--- a/dlls/fusion/Makefile.in
+++ b/dlls/fusion/Makefile.in
@@ -1,11 +1,10 @@
 MODULE    = fusion.dll
 IMPORTS   = bcrypt dbghelp shlwapi version user32
 
-C_SRCS = \
+SOURCES = \
 	asmcache.c \
 	asmenum.c \
 	asmname.c \
 	assembly.c \
-	fusion.c
-
-RC_SRCS = version.rc
+	fusion.c \
+	version.rc
diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in
index 7b3f2f9cd19..e96bdf4f7a7 100644
--- a/dlls/gameux/tests/Makefile.in
+++ b/dlls/gameux/tests/Makefile.in
@@ -1,8 +1,7 @@
 TESTDLL   = gameux.dll
 IMPORTS   = uuid shlwapi oleaut32 ole32 advapi32 shell32
 
-C_SRCS = \
+SOURCES = \
 	gameexplorer.c \
-	gamestatistics.c
-
-RC_SRCS = rsrc.rc
+	gamestatistics.c \
+	rsrc.rc
diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 21850e2e660..061eb144134 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -3,11 +3,10 @@ IMPORTS   = user32 advapi32 gdi32 win32u
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
 
-C_SRCS = \
+SOURCES = \
 	bidi.c \
 	env.c \
 	gdi.c \
 	metafile.c \
-	printdrv.c
-
-RC_SRCS = version.rc
+	printdrv.c \
+	version.rc
diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index 9e6d53dc219..8c5a299933d 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -4,10 +4,11 @@ IMPORTLIB = gdi32
 IMPORTS   = user32 advapi32 win32u
 DELAYIMPORTS = setupapi winspool
 
-C_SRCS = \
+SOURCES = \
 	dc.c \
 	emfdc.c \
 	enhmetafile.c \
+	gdi32.rc \
 	icm.c \
 	metadc.c \
 	metafile.c \
@@ -26,6 +27,3 @@ C_SRCS = \
 	uniscribe/shape.c \
 	uniscribe/shaping.c \
 	uniscribe/usp10.c
-
-
-RC_SRCS = gdi32.rc
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index c87ec5ba827..382033be901 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -3,11 +3,12 @@ IMPORTLIB = gdiplus
 IMPORTS   = uuid shlwapi ole32 oleaut32 user32 gdi32
 DELAYIMPORTS = windowscodecs
 
-C_SRCS = \
+SOURCES = \
 	brush.c \
 	customlinecap.c \
 	font.c \
 	gdiplus.c \
+	gdiplus.rc \
 	graphics.c \
 	graphicspath.c \
 	image.c \
@@ -18,5 +19,3 @@ C_SRCS = \
 	pen.c \
 	region.c \
 	stringformat.c
-
-RC_SRCS = gdiplus.rc
diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 501c3215238..bd6c01be74a 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -5,11 +5,10 @@ EXTRAINCL = $(JPEG_PE_CFLAGS)
 UNIX_LIBS    = $(GPHOTO2_LIBS) $(GPHOTO2_PORT_LIBS)
 UNIX_CFLAGS  = $(GPHOTO2_CFLAGS) $(GPHOTO2_PORT_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	capability.c \
 	ds_image.c \
+	gphoto2.rc \
 	gphoto2_main.c \
 	ui.c \
 	unixlib.c
-
-RC_SRCS = gphoto2.rc
diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in
index 63211a18d7d..7e9928f0e57 100644
--- a/dlls/hal/Makefile.in
+++ b/dlls/hal/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = hal.dll
 IMPORTLIB = hal
 IMPORTS   = ntoskrnl
 
-C_SRCS = \
-	hal.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	hal.c \
+	version.rc
diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index 8bad2ec00de..00720eb8c73 100644
--- a/dlls/hid/Makefile.in
+++ b/dlls/hid/Makefile.in
@@ -3,8 +3,7 @@ IMPORTLIB = hid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	hidd.c \
-	hidp.c
-
-RC_SRCS = version.rc
+	hidp.c \
+	version.rc
diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in
index 0e55bb9a232..57a8fd79297 100644
--- a/dlls/hidclass.sys/Makefile.in
+++ b/dlls/hidclass.sys/Makefile.in
@@ -2,8 +2,7 @@ MODULE    = hidclass.sys
 IMPORTLIB = hidclass
 IMPORTS   = hal ntoskrnl user32 hidparse win32u
 
-C_SRCS = \
+SOURCES = \
 	device.c \
+	hidclass.rc \
 	pnp.c
-
-RC_SRCS = hidclass.rc
diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in
index 77254521fae..c3147eac639 100644
--- a/dlls/iccvid/Makefile.in
+++ b/dlls/iccvid/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = iccvid.dll
 IMPORTS   = user32
 
-C_SRCS = \
-	iccvid.c
-
-RC_SRCS = iccvid.rc
+SOURCES = \
+	iccvid.c \
+	iccvid.rc
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index baf10c5f1dc..5f758686c58 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -3,8 +3,7 @@ IMPORTLIB = imm32
 IMPORTS   = user32 gdi32 advapi32 kernelbase win32u
 DELAYIMPORTS = ole32
 
-C_SRCS = \
+SOURCES = \
 	ime.c \
-	imm.c
-
-RC_SRCS = version.rc
+	imm.c \
+	version.rc
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index 63d27a90df9..90c370d27b3 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
 IMPORTS   = advapi32 dnsapi nsi uuid ws2_32
 
-C_SRCS = \
-	iphlpapi_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	iphlpapi_main.c \
+	version.rc
diff --git a/dlls/ir50_32/Makefile.in b/dlls/ir50_32/Makefile.in
index 2db9c8076c9..c035dd97086 100644
--- a/dlls/ir50_32/Makefile.in
+++ b/dlls/ir50_32/Makefile.in
@@ -2,7 +2,6 @@ MODULE       = ir50_32.dll
 IMPORTS      = user32 mfplat mfuuid
 DELAYIMPORTS = winegstreamer
 
-C_SRCS = \
-	ir50.c
-
-RC_SRCS = ir50_32.rc
+SOURCES = \
+	ir50.c \
+	ir50_32.rc
diff --git a/dlls/itss/tests/Makefile.in b/dlls/itss/tests/Makefile.in
index c1e9a192a2e..653e57f7121 100644
--- a/dlls/itss/tests/Makefile.in
+++ b/dlls/itss/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = itss.dll
 IMPORTS   = ole32
 
-C_SRCS = \
-	protocol.c
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	protocol.c \
+	rsrc.rc
diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in
index a4493d6ed89..423f74983c1 100644
--- a/dlls/jscript/tests/Makefile.in
+++ b/dlls/jscript/tests/Makefile.in
@@ -1,10 +1,9 @@
 TESTDLL   = jscript.dll
 IMPORTS   = oleaut32 ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	activex.c \
 	caller.c \
 	jscript.c \
+	rsrc.rc \
 	run.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in
index 07f1fb53bc9..316cc1cc360 100644
--- a/dlls/jsproxy/Makefile.in
+++ b/dlls/jsproxy/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = jsproxy.dll
 IMPORTS   = uuid oleaut32 ole32 ws2_32
 IMPORTLIB = jsproxy
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	main.c \
+	rsrc.rc
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index d606b9aba1c..ca5bb437e24 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -7,7 +7,7 @@ EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll
 i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b800000
 x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x178000000
 
-C_SRCS = \
+SOURCES = \
 	atom.c \
 	comm.c \
 	computername.c \
@@ -29,8 +29,6 @@ C_SRCS = \
 	thread.c \
 	toolhelp.c \
 	version.c \
+	version.rc \
 	virtual.c \
 	volume.c
-
-RC_SRCS = \
-	version.rc
diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in
index b51eaefcd13..654cb9d5aed 100644
--- a/dlls/kernelbase/tests/Makefile.in
+++ b/dlls/kernelbase/tests/Makefile.in
@@ -1,10 +1,8 @@
 TESTDLL   = kernelbase.dll
 
-C_SRCS = \
+SOURCES = \
 	file.c \
 	path.c \
 	process.c \
+	rsrc.rc \
 	sync.c
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in
index 75f561c1d4b..4251c83e158 100644
--- a/dlls/krnl386.exe16/Makefile.in
+++ b/dlls/krnl386.exe16/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = kernel
 DELAYIMPORTS = user32
 EXTRADLLFLAGS = -m16 -Wb,--dll-name,kernel
 
-C_SRCS = \
+SOURCES = \
 	atom.c \
 	dosmem.c \
 	error.c \
@@ -32,7 +32,6 @@ C_SRCS = \
 	task.c \
 	thunk.c \
 	utthunk.c \
+	version.rc \
 	vxd.c \
 	wowthunk.c
-
-RC_SRCS = version.rc
diff --git a/dlls/ksproxy.ax/Makefile.in b/dlls/ksproxy.ax/Makefile.in
index b21780b1190..af7954b2b44 100644
--- a/dlls/ksproxy.ax/Makefile.in
+++ b/dlls/ksproxy.ax/Makefile.in
@@ -1,3 +1,4 @@
 MODULE    = ksproxy.ax
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/ksuser/Makefile.in b/dlls/ksuser/Makefile.in
index c83a9556073..a5458bf2a86 100644
--- a/dlls/ksuser/Makefile.in
+++ b/dlls/ksuser/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = ksuser.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in
index 837467211ef..ba0472f7246 100644
--- a/dlls/localspl/Makefile.in
+++ b/dlls/localspl/Makefile.in
@@ -6,9 +6,8 @@ UNIX_LIBS    = $(APPLICATIONSERVICES_LIBS)
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	cups.c \
 	localmon.c \
+	localspl.rc \
 	provider.c
-
-RC_SRCS = localspl.rc
diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index eb4273f8d93..4197582ab7c 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = localui.dll
 IMPORTS   = winspool user32
 
-C_SRCS = \
-	localui.c
-
-RC_SRCS = localui.rc
+SOURCES = \
+	localui.c \
+	localui.rc
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 3811fd1904b..92315949532 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -2,11 +2,10 @@ MODULE    = mapi32.dll
 IMPORTLIB = mapi32
 IMPORTS   = uuid shlwapi shell32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	imalloc.c \
+	mapi32.rc \
 	mapi32_main.c \
 	prop.c \
 	sendmail.c \
 	util.c
-
-RC_SRCS = mapi32.rc
diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in
index e7fe6ba5760..a1c211b0aa9 100644
--- a/dlls/mciavi32/Makefile.in
+++ b/dlls/mciavi32/Makefile.in
@@ -1,10 +1,9 @@
 MODULE    = mciavi32.dll
 IMPORTS   = msvfw32 winmm user32 gdi32
 
-C_SRCS = \
+SOURCES = \
 	info.c \
 	mciavi.c \
+	mciavi_res.rc \
 	mmoutput.c \
 	wnd.c
-
-RC_SRCS = mciavi_res.rc
diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in
index 4aa7e113cd5..84028d18e2f 100644
--- a/dlls/mciqtz32/Makefile.in
+++ b/dlls/mciqtz32/Makefile.in
@@ -1,9 +1,7 @@
 MODULE    = mciqtz32.dll
 IMPORTS   = strmiids oleaut32 ole32 winmm user32 gdi32
 
-C_SRCS = \
-	mciqtz.c
-
-RC_SRCS = \
+SOURCES = \
 	mciavi_res.rc \
+	mciqtz.c \
 	version.rc
diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in
index d6219219f67..3bb0c66de0a 100644
--- a/dlls/mf/tests/Makefile.in
+++ b/dlls/mf/tests/Makefile.in
@@ -1,8 +1,7 @@
 TESTDLL   = mf.dll
 IMPORTS   = mf mfplat dmoguids mfuuid strmiids uuid wmcodecdspuuid ole32 user32 propsys msdmo d3d11 msvfw32
 
-C_SRCS = \
+SOURCES = \
 	mf.c \
+	resource.rc \
 	transform.c
-
-RC_SRCS = resource.rc
diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in
index 437229a905d..e123952956d 100644
--- a/dlls/mfmediaengine/tests/Makefile.in
+++ b/dlls/mfmediaengine/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = mfmediaengine.dll
 IMPORTS   = ole32 mf mfplat oleaut32 mfuuid uuid
 
-C_SRCS = \
-	mfmediaengine.c
-
-RC_SRCS = resource.rc
+SOURCES = \
+	mfmediaengine.c \
+	resource.rc
diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in
index ae9cc378933..217ea437b3c 100644
--- a/dlls/mfplat/tests/Makefile.in
+++ b/dlls/mfplat/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = mfplat.dll
 IMPORTS   = ole32 mfplat user32 d3d9 dxva2 mfuuid propsys uuid strmiids
 
-C_SRCS = \
-	mfplat.c
-
-RC_SRCS = resource.rc
+SOURCES = \
+	mfplat.c \
+	resource.rc
diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in
index aabc08258f9..2bdc236b782 100644
--- a/dlls/mfplay/tests/Makefile.in
+++ b/dlls/mfplay/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = mfplay.dll
 IMPORTS   = mfplay user32 uuid mfuuid mfplat ole32
 
-C_SRCS = \
-	mfplay.c
-
-RC_SRCS = resource.rc
+SOURCES = \
+	mfplay.c \
+	resource.rc
diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in
index c7476c14c6b..90bac9e0896 100644
--- a/dlls/mfreadwrite/tests/Makefile.in
+++ b/dlls/mfreadwrite/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = mfreadwrite.dll
 IMPORTS   = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid
 
-C_SRCS = \
-	mfplat.c
-
-RC_SRCS = resource.rc
+SOURCES = \
+	mfplat.c \
+	resource.rc
diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in
index 7fe138660ae..3366b55e09f 100644
--- a/dlls/mouse.drv16/Makefile.in
+++ b/dlls/mouse.drv16/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -m16
 
-C_SRCS = mouse.c
-
-RC_SRCS = mouse.rc
+SOURCES = \
+	mouse.c \
+	mouse.rc
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index 8a74786cd22..ed84349f4f6 100644
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -2,12 +2,11 @@ MODULE    = mpr.dll
 IMPORTLIB = mpr
 IMPORTS   = user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	auth.c \
+	mpr.rc \
 	mpr_main.c \
 	multinet.c \
 	nps.c \
 	pwcache.c \
 	wnet.c
-
-RC_SRCS = mpr.rc
diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
index be2136d78f7..8174256c237 100644
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@@ -2,13 +2,12 @@ MODULE    = msacm32.dll
 IMPORTLIB = msacm32
 IMPORTS   = winmm user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	driver.c \
 	filter.c \
 	format.c \
 	internal.c \
+	msacm32.rc \
 	msacm32_main.c \
 	pcmconverter.c \
 	stream.c
-
-RC_SRCS = msacm32.rc
diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in
index d57cc54e3c6..30339602798 100644
--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@@ -3,12 +3,11 @@ IMPORTLIB = mscms
 IMPORTS   = $(LCMS2_PE_LIBS) shlwapi advapi32
 EXTRAINCL = $(LCMS2_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	handle.c \
 	icc.c \
 	mscms_main.c \
 	profile.c \
 	stub.c \
-	transform.c
-
-RC_SRCS = version.rc
+	transform.c \
+	version.rc
diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in
index 4f699af8e27..dc572d4d9c1 100644
--- a/dlls/msctf/tests/Makefile.in
+++ b/dlls/msctf/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = msctf.dll
 IMPORTS   = ole32 user32 advapi32
 
-C_SRCS = \
-	inputprocessor.c
-
-RC_SRCS = \
+SOURCES = \
+	inputprocessor.c \
 	msctf.rc
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index 566461e00bf..e551823926e 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -2,9 +2,7 @@ MODULE    = msdmo.dll
 IMPORTLIB = msdmo
 IMPORTS   = dmoguids uuid ole32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	dmoreg.c \
-	dmort.c
-
-RC_SRCS = \
+	dmort.c \
 	rsrc.rc
diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in
index 32f558b387f..a378d8d7c26 100644
--- a/dlls/msftedit/Makefile.in
+++ b/dlls/msftedit/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = uuid riched20
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	msftedit_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	msftedit_main.c \
+	version.rc
diff --git a/dlls/msimsg/Makefile.in b/dlls/msimsg/Makefile.in
index 2e8fa718070..d5099b34314 100644
--- a/dlls/msimsg/Makefile.in
+++ b/dlls/msimsg/Makefile.in
@@ -2,4 +2,5 @@ MODULE = msimsg.dll
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS = msimsg.rc
+SOURCES = \
+	msimsg.rc
diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in
index 89d6367b39d..18898f0fe95 100644
--- a/dlls/mspatcha/Makefile.in
+++ b/dlls/mspatcha/Makefile.in
@@ -3,9 +3,8 @@ IMPORTLIB = mspatcha
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	lzxd_dec.c \
 	mspatcha_main.c \
-	pa19.c
-
-RC_SRCS = version.rc
+	pa19.c \
+	version.rc
diff --git a/dlls/mspatcha/tests/Makefile.in b/dlls/mspatcha/tests/Makefile.in
index ef1d19271c7..3629b0dd535 100644
--- a/dlls/mspatcha/tests/Makefile.in
+++ b/dlls/mspatcha/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = mspatcha.dll
 IMPORTS   = mspatcha
 
-C_SRCS = \
-	apply_patch.c
-
-RC_SRCS = \
+SOURCES = \
+	apply_patch.c \
 	mspatcha.rc
diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in
index 6368cd8673d..620293277a2 100644
--- a/dlls/msrle32/Makefile.in
+++ b/dlls/msrle32/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = msrle32.dll
 IMPORTS   = winmm user32
 
-C_SRCS = msrle32.c
-
-RC_SRCS = msrle32.rc
+SOURCES = \
+	msrle32.c \
+	msrle32.rc
diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in
index 3dfaf0b303e..582b3ab4fdf 100644
--- a/dlls/msvcp90/tests/Makefile.in
+++ b/dlls/msvcp90/tests/Makefile.in
@@ -1,9 +1,7 @@
 TESTDLL   = msvcp90.dll
 
-C_SRCS = \
+SOURCES = \
 	ios.c \
 	misc.c \
+	msvcp90.rc \
 	string.c
-
-RC_SRCS = \
-	msvcp90.rc
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in
index b7ed6c9cf87..71bd580a6e7 100644
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -5,7 +5,7 @@ IMPORTS   = $(MUSL_PE_LIBS) ntdll
 DELAYIMPORTS = advapi32 user32
 PARENTSRC = ../msvcrt
 
-C_SRCS = \
+SOURCES = \
 	concurrency.c \
 	console.c \
 	cpp.c \
@@ -33,6 +33,7 @@ C_SRCS = \
 	misc.c \
 	onexit.c \
 	process.c \
+	rsrc.rc \
 	scanf.c \
 	sincos.c \
 	string.c \
@@ -40,5 +41,3 @@ C_SRCS = \
 	time.c \
 	undname.c \
 	wcs.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in
index f854f0d5417..ea9df276926 100644
--- a/dlls/msvcr120/Makefile.in
+++ b/dlls/msvcr120/Makefile.in
@@ -5,7 +5,7 @@ IMPORTS   = $(MUSL_PE_LIBS) ntdll
 DELAYIMPORTS = advapi32 user32
 PARENTSRC = ../msvcrt
 
-C_SRCS = \
+SOURCES = \
 	concurrency.c \
 	console.c \
 	cpp.c \
@@ -39,6 +39,5 @@ C_SRCS = \
 	thread.c \
 	time.c \
 	undname.c \
+	version.rc \
 	wcs.c
-
-RC_SRCS = version.rc
diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in
index 2bf999f37f1..c6d2bb884f3 100644
--- a/dlls/msvcr80/Makefile.in
+++ b/dlls/msvcr80/Makefile.in
@@ -5,7 +5,7 @@ IMPORTS   = $(MUSL_PE_LIBS) ntdll
 DELAYIMPORTS = advapi32 user32
 PARENTSRC = ../msvcrt
 
-C_SRCS = \
+SOURCES = \
 	console.c \
 	cpp.c \
 	ctype.c \
@@ -30,6 +30,7 @@ C_SRCS = \
 	mathf.c \
 	mbcs.c \
 	misc.c \
+	msvcr80.rc \
 	onexit.c \
 	process.c \
 	scanf.c \
@@ -39,5 +40,3 @@ C_SRCS = \
 	time.c \
 	undname.c \
 	wcs.c
-
-RC_SRCS = msvcr80.rc
diff --git a/dlls/msvcr80/tests/Makefile.in b/dlls/msvcr80/tests/Makefile.in
index 1a17aea05ce..ecb59f84aa0 100644
--- a/dlls/msvcr80/tests/Makefile.in
+++ b/dlls/msvcr80/tests/Makefile.in
@@ -1,7 +1,5 @@
 TESTDLL   = msvcr80.dll
 
-C_SRCS = \
-	msvcr80.c
-
-RC_SRCS = \
+SOURCES = \
+	msvcr80.c \
 	msvcr80.rc
diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in
index 0faac8f4150..f86dfa18105 100644
--- a/dlls/msvcr90/Makefile.in
+++ b/dlls/msvcr90/Makefile.in
@@ -5,7 +5,7 @@ IMPORTS   = $(MUSL_PE_LIBS) ntdll
 DELAYIMPORTS = advapi32 user32
 PARENTSRC = ../msvcrt
 
-C_SRCS = \
+SOURCES = \
 	console.c \
 	cpp.c \
 	ctype.c \
@@ -30,6 +30,7 @@ C_SRCS = \
 	mathf.c \
 	mbcs.c \
 	misc.c \
+	msvcr90.rc \
 	onexit.c \
 	process.c \
 	scanf.c \
@@ -39,5 +40,3 @@ C_SRCS = \
 	time.c \
 	undname.c \
 	wcs.c
-
-RC_SRCS = msvcr90.rc
diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in
index 9db8275e020..25bf91e38cc 100644
--- a/dlls/msvcr90/tests/Makefile.in
+++ b/dlls/msvcr90/tests/Makefile.in
@@ -1,7 +1,5 @@
 TESTDLL   = msvcr90.dll
 
-C_SRCS = \
-	msvcr90.c
-
-RC_SRCS = \
+SOURCES = \
+	msvcr90.c \
 	msvcr90.rc
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index ad42e217d56..7dd1f9ed1a8 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -4,7 +4,7 @@ IMPORTLIB = msvcrt
 IMPORTS   = $(MUSL_PE_LIBS) ntdll
 DELAYIMPORTS = advapi32 user32
 
-C_SRCS = \
+SOURCES = \
 	concurrency.c \
 	console.c \
 	cpp.c \
@@ -38,6 +38,7 @@ C_SRCS = \
 	misc.c \
 	onexit.c \
 	process.c \
+	rsrc.rc \
 	scanf.c \
 	sincos.c \
 	string.c \
@@ -45,6 +46,3 @@ C_SRCS = \
 	time.c \
 	undname.c \
 	wcs.c
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 9247fb8b2cc..50feb8ff554 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -2,9 +2,8 @@ MODULE    = msvfw32.dll
 IMPORTLIB = msvfw32
 IMPORTS   = winmm version comctl32 user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	drawdib.c \
 	mciwnd.c \
+	msvfw32.rc \
 	msvideo_main.c
-
-RC_SRCS = msvfw32.rc
diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in
index 01d83acb105..685bcfc94c2 100644
--- a/dlls/msvfw32/tests/Makefile.in
+++ b/dlls/msvfw32/tests/Makefile.in
@@ -1,10 +1,8 @@
 TESTDLL   = msvfw32.dll
 IMPORTS   = msvfw32 advapi32 gdi32 user32
 
-C_SRCS = \
+SOURCES = \
 	drawdib.c \
 	mciwnd.c \
-	msvfw.c
-
-RC_SRCS = \
+	msvfw.c \
 	msvfw32.rc
diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in
index 2fc8f907541..0139f6910d8 100644
--- a/dlls/msvidc32/Makefile.in
+++ b/dlls/msvidc32/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = msvidc32.dll
 IMPORTS   = user32
 
-C_SRCS = \
+SOURCES = \
+	msvidc32.rc \
 	msvideo1.c
-
-RC_SRCS = msvidc32.rc
diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in
index 98c738fd354..d6bc34f3ca3 100644
--- a/dlls/mswsock/Makefile.in
+++ b/dlls/mswsock/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = mswsock.dll
 IMPORTLIB = mswsock
 IMPORTS   = ws2_32
 
-C_SRCS = \
-	mswsock.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	mswsock.c \
+	version.rc
diff --git a/dlls/npmshtml/Makefile.in b/dlls/npmshtml/Makefile.in
index aaaad83ce19..2206f3cd526 100644
--- a/dlls/npmshtml/Makefile.in
+++ b/dlls/npmshtml/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = npmshtml.dll
 IMPORTS   = mshtml
 
-C_SRCS = main.c
-RC_SRCS = rsrc.rc
+SOURCES = \
+	main.c \
+	rsrc.rc
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 2e862c68b7e..7aa1652507d 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -10,7 +10,7 @@ EXTRADLLFLAGS = -nodefaultlibs
 i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
 x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x170000000
 
-C_SRCS = \
+SOURCES = \
 	actctx.c \
 	atom.c \
 	crypt.c \
@@ -66,10 +66,9 @@ C_SRCS = \
 	unix/thread.c \
 	unix/virtual.c \
 	version.c \
+	version.rc \
 	wcstring.c
 
-RC_SRCS = version.rc
-
 EXTRA_OBJS = unix/version.o
 
 unix_loader_EXTRADEFS = \
diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in
index 2ca355140d9..123cbf069ee 100644
--- a/dlls/ntprint/Makefile.in
+++ b/dlls/ntprint/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = winspool
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	ntprint.c
-
-RC_SRCS = ntprint.rc
+SOURCES = \
+	ntprint.c \
+	ntprint.rc
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index def7b4b5d67..44962ca4896 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -3,8 +3,7 @@ UNIXLIB   = odbc32.so
 IMPORTLIB = odbc32
 IMPORTS   = advapi32
 
-C_SRCS = \
+SOURCES = \
 	proxyodbc.c \
+	rsrc.rc \
 	unixlib.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/odbccp32/tests/Makefile.in b/dlls/odbccp32/tests/Makefile.in
index c65292e12d2..2f14cacea50 100644
--- a/dlls/odbccp32/tests/Makefile.in
+++ b/dlls/odbccp32/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = odbccp32.dll
 IMPORTS   = odbccp32 advapi32
 
-C_SRCS = \
-	misc.c
-
-RC_SRCS = \
+SOURCES = \
+	misc.c \
 	odbccp32.rc
diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in
index 31829c4bb5b..65209a957b5 100644
--- a/dlls/odbccu32/Makefile.in
+++ b/dlls/odbccu32/Makefile.in
@@ -1,3 +1,4 @@
 MODULE    = odbccu32.dll
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in
index bea15132151..658d9c11b89 100644
--- a/dlls/ole2nls.dll16/Makefile.in
+++ b/dlls/ole2nls.dll16/Makefile.in
@@ -2,6 +2,6 @@ MODULE    = ole2nls.dll16
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
 
-C_SRCS = ole2nls.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	ole2nls.c \
+	version.rc
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 4a16469a456..52002402b25 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -2,9 +2,8 @@ MODULE    = oledlg.dll
 IMPORTLIB = oledlg
 IMPORTS   = ole32 comdlg32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	insobjdlg.c \
+	oledlg.rc \
 	oledlg_main.c \
 	pastespl.c
-
-RC_SRCS = oledlg.rc
diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in
index 124ae2cd60c..55a826a6012 100644
--- a/dlls/olethk32/Makefile.in
+++ b/dlls/olethk32/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = olethk32.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 6dcd5ef7b30..847491eb78f 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -8,10 +8,9 @@ UNIX_LIBS    = -lwin32u
 
 EXTRADLLFLAGS = -Wl,--image-base,0x7a800000
 
-C_SRCS = \
+SOURCES = \
 	thunks.c \
 	unix_thunks.c \
 	unix_wgl.c \
+	version.rc \
 	wgl.c
-
-RC_SRCS = version.rc
diff --git a/dlls/photometadatahandler/Makefile.in b/dlls/photometadatahandler/Makefile.in
index d25dfea500b..4287844035f 100644
--- a/dlls/photometadatahandler/Makefile.in
+++ b/dlls/photometadatahandler/Makefile.in
@@ -2,4 +2,5 @@ MODULE = photometadatahandler.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = photometadatahandler.rc
+SOURCES = \
+	photometadatahandler.rc
diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in
index d4afe16d494..c2c716cb44e 100644
--- a/dlls/pidgen/Makefile.in
+++ b/dlls/pidgen/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = pidgen.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	main.c \
+	rsrc.rc
diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in
index c504f190b2f..7c58c19ebcb 100644
--- a/dlls/printui/Makefile.in
+++ b/dlls/printui/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = shell32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	printui.c
-
-RC_SRCS = printui.rc
+SOURCES = \
+	printui.c \
+	printui.rc
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index f187d55f169..f8f89bbda37 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = psapi.dll
 IMPORTLIB = psapi
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/pwrshplugin/Makefile.in b/dlls/pwrshplugin/Makefile.in
index a7348d4b8c5..77715e5e942 100644
--- a/dlls/pwrshplugin/Makefile.in
+++ b/dlls/pwrshplugin/Makefile.in
@@ -1,3 +1,4 @@
 MODULE    = pwrshplugin.dll
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/qasf/tests/Makefile.in b/dlls/qasf/tests/Makefile.in
index bc962ebb657..f1dc86e5344 100644
--- a/dlls/qasf/tests/Makefile.in
+++ b/dlls/qasf/tests/Makefile.in
@@ -1,8 +1,7 @@
 TESTDLL   = qasf.dll
 IMPORTS   = strmbase dmoguids strmiids uuid msdmo ole32
 
-C_SRCS = \
+SOURCES = \
 	asfreader.c \
-	dmowrapper.c
-
-RC_SRCS = resource.rc
+	dmowrapper.c \
+	resource.rc
diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in
index a1020f5052d..5f6fc2009d9 100644
--- a/dlls/qedit/tests/Makefile.in
+++ b/dlls/qedit/tests/Makefile.in
@@ -1,10 +1,9 @@
 TESTDLL   = qedit.dll
 IMPORTS   = strmbase strmiids uuid oleaut32 ole32
 
-C_SRCS = \
+SOURCES = \
 	mediadet.c \
 	nullrenderer.c \
+	qedit.rc \
 	samplegrabber.c \
 	timeline.c
-
-RC_SRCS = qedit.rc
diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in
index 1613907424c..5c50949f175 100644
--- a/dlls/quartz/tests/Makefile.in
+++ b/dlls/quartz/tests/Makefile.in
@@ -1,7 +1,7 @@
 TESTDLL   = quartz.dll
 IMPORTS   = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid winmm
 
-C_SRCS = \
+SOURCES = \
 	acmwrapper.c \
 	avidec.c \
 	avisplit.c \
@@ -14,12 +14,9 @@ C_SRCS = \
 	mpeglayer3.c \
 	mpegsplit.c \
 	passthrough.c \
+	rsrc.rc \
 	systemclock.c \
 	videorenderer.c \
 	vmr7.c \
 	vmr9.c \
 	waveparser.c
-
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/riched32/Makefile.in b/dlls/riched32/Makefile.in
index 6ea0f4d4167..9dc74713b16 100644
--- a/dlls/riched32/Makefile.in
+++ b/dlls/riched32/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = riched32.dll
 IMPORTS   = riched20 user32
 
-C_SRCS = \
-	richedit.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	richedit.c \
+	version.rc
diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in
index ca388787f41..edfe715cb4a 100644
--- a/dlls/rsabase/Makefile.in
+++ b/dlls/rsabase/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = rsabase.dll
 IMPORTS   = rsaenh
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 9997752ad3f..b7a2e3d7f29 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = rsaenh.dll
 IMPORTLIB = rsaenh
 IMPORTS   = bcrypt crypt32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	aes.c \
 	des.c \
 	handle.c \
@@ -11,6 +11,5 @@ C_SRCS = \
 	rc2.c \
 	rc4.c \
 	rsa.c \
-	rsaenh.c
-
-RC_SRCS = rsrc.rc
+	rsaenh.c \
+	rsrc.rc
diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in
index cfedbcf1e16..eed1acdf918 100644
--- a/dlls/sane.ds/Makefile.in
+++ b/dlls/sane.ds/Makefile.in
@@ -4,13 +4,12 @@ IMPORTS   = comctl32 user32 gdi32
 UNIX_LIBS    = $(SANE_LIBS)
 UNIX_CFLAGS  = $(SANE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	capability.c \
 	ds_ctrl.c \
 	ds_image.c \
 	options.c \
+	sane.rc \
 	sane_main.c \
 	ui.c \
 	unixlib.c
-
-RC_SRCS = sane.rc
diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in
index 84c4480cf2d..a42b6730f50 100644
--- a/dlls/schannel/Makefile.in
+++ b/dlls/schannel/Makefile.in
@@ -3,9 +3,8 @@ IMPORTS   = secur32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	lsamode.c \
 	schannel_main.c \
-	usermode.c
-
-RC_SRCS = version.rc
+	usermode.c \
+	version.rc
diff --git a/dlls/scrobj/tests/Makefile.in b/dlls/scrobj/tests/Makefile.in
index 4e517caefe6..15cb574e0bb 100644
--- a/dlls/scrobj/tests/Makefile.in
+++ b/dlls/scrobj/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = scrobj.dll
 IMPORTS   = oleaut32 ole32 advapi32 uuid
 
-C_SRCS = \
+SOURCES = \
+	rsrc.rc \
 	scrobj.c
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 6c22afda68e..4a89229c164 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = serialui.dll
 IMPORTS   = user32 advapi32
 
-C_SRCS = \
-	confdlg.c
-
-RC_SRCS = serialui.rc
+SOURCES = \
+	confdlg.c \
+	serialui.rc
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index b18b58cd13a..571ea88da95 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = setupapi
 IMPORTS   = uuid advapi32 rpcrt4 kernelbase
 DELAYIMPORTS = cabinet shell32 wintrust ole32 comdlg32 user32
 
-C_SRCS = \
+SOURCES = \
 	devinst.c \
 	dialog.c \
 	dirid.c \
@@ -14,8 +14,7 @@ C_SRCS = \
 	parser.c \
 	query.c \
 	queue.c \
+	setupapi.rc \
 	setupcab.c \
 	stringtable.c \
 	stubs.c
-
-RC_SRCS = setupapi.rc
diff --git a/dlls/shdoclc/Makefile.in b/dlls/shdoclc/Makefile.in
index 33d975304d8..28e21be85cf 100644
--- a/dlls/shdoclc/Makefile.in
+++ b/dlls/shdoclc/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = shdoclc.dll
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS = shdoclc.rc
+SOURCES = \
+	shdoclc.rc
diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in
index dad637e6081..41066eec562 100644
--- a/dlls/shell.dll16/Makefile.in
+++ b/dlls/shell.dll16/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = shell32 user32 gdi32 advapi32
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll
 
-C_SRCS = shell.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	shell.c \
+	version.rc
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 08a7d3af3a6..b7bc53524a2 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -1,7 +1,7 @@
 TESTDLL   = shell32.dll
 IMPORTS   = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi
 
-C_SRCS = \
+SOURCES = \
 	appbar.c \
 	assoc.c \
 	autocomplete.c \
@@ -10,6 +10,7 @@ C_SRCS = \
 	generated.c \
 	progman_dde.c \
 	recyclebin.c \
+	rsrc.rc \
 	shelldispatch.c \
 	shelllink.c \
 	shellole.c \
@@ -21,5 +22,3 @@ C_SRCS = \
 	shlview.c \
 	string.c \
 	systray.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in
index a83794fdf61..9edf62cb243 100644
--- a/dlls/shfolder/Makefile.in
+++ b/dlls/shfolder/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = shfolder.dll
 IMPORTLIB = shfolder
 IMPORTS   = shell32
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 2a93c495d14..2c94cfefce1 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -4,7 +4,7 @@ IMPORTLIB = shlwapi
 IMPORTS   = uuid shcore user32 gdi32 advapi32 kernelbase
 DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm
 
-C_SRCS = \
+SOURCES = \
 	assoc.c \
 	clist.c \
 	istream.c \
@@ -13,11 +13,10 @@ C_SRCS = \
 	path.c \
 	reg.c \
 	regstream.c \
+	shlwapi.rc \
 	shlwapi_main.c \
 	stopwatch.c \
 	string.c \
 	thread.c \
 	url.c \
 	wsprintf.c
-
-RC_SRCS = shlwapi.rc
diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in
index e224b6f4a51..13b189f2cf7 100644
--- a/dlls/strmdll/Makefile.in
+++ b/dlls/strmdll/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = strmdll.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in
index 031374270bc..063718160d8 100644
--- a/dlls/tdh/Makefile.in
+++ b/dlls/tdh/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = tdh.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	tdh_main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	tdh_main.c \
+	version.rc
diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index c82b5a74453..b4ac1e27729 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -1,8 +1,7 @@
 MODULE    = twain_32.dll
 IMPORTS   = user32
 
-C_SRCS = \
+SOURCES = \
 	dsm_ctrl.c \
+	twain.rc \
 	twain32_main.c
-
-RC_SRCS = twain.rc
diff --git a/dlls/tzres/Makefile.in b/dlls/tzres/Makefile.in
index 8d4710e7b78..76e8cbc50aa 100644
--- a/dlls/tzres/Makefile.in
+++ b/dlls/tzres/Makefile.in
@@ -2,4 +2,5 @@ MODULE = tzres.dll
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS = tzres.rc
+SOURCES = \
+	tzres.rc
diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in
index e9cdf6127a0..433ca5d4b48 100644
--- a/dlls/ucrtbase/Makefile.in
+++ b/dlls/ucrtbase/Makefile.in
@@ -5,7 +5,7 @@ IMPORTS   = $(MUSL_PE_LIBS) ntdll
 DELAYIMPORTS = advapi32 user32
 PARENTSRC = ../msvcrt
 
-C_SRCS = \
+SOURCES = \
 	console.c \
 	cpp.c \
 	crt_gccmain.c \
@@ -43,6 +43,5 @@ C_SRCS = \
 	thread.c \
 	time.c \
 	undname.c \
+	version.rc \
 	wcs.c
-
-RC_SRCS = version.rc
diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index 7e2438d033f..35c8617f69b 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = user.exe16
 IMPORTS   = mpr user32 gdi32 win32u
 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
 
-C_SRCS = \
+SOURCES = \
 	bidi.c \
 	comm.c \
 	dialog.c \
@@ -10,6 +10,5 @@ C_SRCS = \
 	message.c \
 	network.c \
 	user.c \
+	version.rc \
 	window.c
-
-RC_SRCS = version.rc
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index e4727e08fc8..e7ca6d14aeb 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = uxtheme
 IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = msimg32
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	dialog.c \
 	draw.c \
@@ -15,6 +15,5 @@ C_SRCS = \
 	stylemap.c \
 	system.c \
 	uxini.c \
+	version.rc \
 	window.c
-
-RC_SRCS = version.rc
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index e26069e18c4..3b056243a98 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = version.dll
 IMPORTLIB = version
 IMPORTS   = kernelbase
 
-C_SRCS = \
-	version.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	version.c \
+	version.rc
diff --git a/dlls/version/tests/Makefile.in b/dlls/version/tests/Makefile.in
index a1e24f9be22..20e922b1794 100644
--- a/dlls/version/tests/Makefile.in
+++ b/dlls/version/tests/Makefile.in
@@ -1,8 +1,7 @@
 TESTDLL   = version.dll
 IMPORTS   = version shell32
 
-C_SRCS = \
+SOURCES = \
 	info.c \
-	install.c
-
-RC_SRCS = version.rc
+	install.c \
+	version.rc
diff --git a/dlls/vga/Makefile.in b/dlls/vga/Makefile.in
index 223b607f22e..2cb9d12947a 100644
--- a/dlls/vga/Makefile.in
+++ b/dlls/vga/Makefile.in
@@ -1,3 +1,4 @@
 MODULE    = vga.dll
 
-RC_SRCS   = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in
index 9c4dca9a880..185d03d32aa 100644
--- a/dlls/vulkan-1/Makefile.in
+++ b/dlls/vulkan-1/Makefile.in
@@ -4,7 +4,6 @@ IMPORTLIB = vulkan-1
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
-
-C_SRCS = \
+SOURCES = \
+	version.rc \
 	vulkan.c
diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in
index b58714d3253..78b7e06af4b 100644
--- a/dlls/webservices/Makefile.in
+++ b/dlls/webservices/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = webservices.dll
 IMPORTLIB = webservices
 IMPORTS   = winhttp rpcrt4 user32 ws2_32
 
-C_SRCS = \
+SOURCES = \
 	channel.c \
 	error.c \
 	heap.c \
@@ -10,8 +10,7 @@ C_SRCS = \
 	msg.c \
 	proxy.c \
 	reader.c \
+	rsrc.rc \
 	string.c \
 	url.c \
 	writer.c
-
-RC_SRCS = rsrc.rc
diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in
index da02ae06870..db32faee5b3 100644
--- a/dlls/winebus.sys/Makefile.in
+++ b/dlls/winebus.sys/Makefile.in
@@ -6,12 +6,11 @@ UNIX_CFLAGS  = $(UDEV_CFLAGS) $(SDL2_CFLAGS)
 
 EXTRADLLFLAGS = -Wl,--subsystem,native
 
-C_SRCS = \
+SOURCES = \
 	bus_iohid.c \
 	bus_sdl.c \
 	bus_udev.c \
 	hid.c \
 	main.c \
-	unixlib.c
-
-RC_SRCS = winebus.rc
+	unixlib.c \
+	winebus.rc
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 07431281259..35de4aec8da 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = wined3d
 IMPORTS   = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32
 EXTRAINCL = $(VKD3D_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	adapter_gl.c \
 	adapter_vk.c \
 	arb_program_shader.c \
@@ -32,8 +32,7 @@ C_SRCS = \
 	swapchain.c \
 	texture.c \
 	utils.c \
+	version.rc \
 	vertexdeclaration.c \
 	view.c \
 	wined3d_main.c
-
-RC_SRCS = version.rc
diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in
index 0ae026647c9..c37e59f0d26 100644
--- a/dlls/winehid.sys/Makefile.in
+++ b/dlls/winehid.sys/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = hidclass ntoskrnl
 
 EXTRADLLFLAGS = -Wl,--subsystem,native
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = winehid.rc
+SOURCES = \
+	main.c \
+	winehid.rc
diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in
index 8ba3b998c36..02822403ce4 100644
--- a/dlls/wineps.drv/Makefile.in
+++ b/dlls/wineps.drv/Makefile.in
@@ -3,7 +3,7 @@ UNIXLIB   = wineps.so
 IMPORTS   = user32 gdi32 winspool advapi32 win32u
 UNIX_LIBS = -lwin32u -lm
 
-C_SRCS = \
+SOURCES = \
 	afm.c \
 	bitblt.c \
 	bitmap.c \
@@ -64,6 +64,5 @@ C_SRCS = \
 	type1afm.c \
 	type42.c \
 	unixlib.c \
-	vertical.c
-
-RC_SRCS = wineps.rc
+	vertical.c \
+	wineps.rc
diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in
index a7c93f24c8e..0c6bb77f143 100644
--- a/dlls/wineusb.sys/Makefile.in
+++ b/dlls/wineusb.sys/Makefile.in
@@ -6,8 +6,7 @@ UNIX_CFLAGS  = $(USB_CFLAGS)
 
 EXTRADLLFLAGS = -Wl,--subsystem,native
 
-C_SRCS = \
+SOURCES = \
 	unixlib.c \
-	wineusb.c
-
-RC_SRCS = wineusb.rc
+	wineusb.c \
+	wineusb.rc
diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in
index 732bf5493a9..52bffca2843 100644
--- a/dlls/winevulkan/Makefile.in
+++ b/dlls/winevulkan/Makefile.in
@@ -4,10 +4,9 @@ IMPORTLIB = winevulkan
 IMPORTS   = user32 gdi32 advapi32 setupapi win32u
 UNIX_LIBS = -lwin32u $(PTHREAD_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	loader.c \
 	loader_thunks.c \
 	vulkan.c \
-	vulkan_thunks.c
-
-RC_SRCS = winevulkan.rc
+	vulkan_thunks.c \
+	winevulkan.rc
diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in
index 1fb38c91144..6439c78e2e9 100644
--- a/dlls/winex11.drv/Makefile.in
+++ b/dlls/winex11.drv/Makefile.in
@@ -5,7 +5,7 @@ DELAYIMPORTS = comctl32 ole32 shell32 imm32
 UNIX_CFLAGS  = $(X_CFLAGS)
 UNIX_LIBS    = -lwin32u $(X_LIBS) $(X_EXTRA_LIBS) $(PTHREAD_LIBS) -lm
 
-C_SRCS = \
+SOURCES = \
 	bitblt.c \
 	brush.c \
 	clipboard.c \
@@ -21,6 +21,7 @@ C_SRCS = \
 	palette.c \
 	pen.c \
 	systray.c \
+	version.rc \
 	vulkan.c \
 	window.c \
 	wintab.c \
@@ -31,5 +32,3 @@ C_SRCS = \
 	xrandr.c \
 	xrender.c \
 	xvidmode.c
-
-RC_SRCS = version.rc
diff --git a/dlls/winexinput.sys/Makefile.in b/dlls/winexinput.sys/Makefile.in
index e115235920a..64241631552 100644
--- a/dlls/winexinput.sys/Makefile.in
+++ b/dlls/winexinput.sys/Makefile.in
@@ -2,7 +2,6 @@ MODULE        = winexinput.sys
 IMPORTS       = ntoskrnl hidparse
 EXTRADLLFLAGS = -Wl,--subsystem,native
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = winexinput.rc
+SOURCES = \
+	main.c \
+	winexinput.rc
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 81519a58853..3fd26853459 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = winmm
 IMPORTS   = uuid user32 advapi32 ole32 msacm32
 DELAYIMPORTS = dinput8
 
-C_SRCS = \
+SOURCES = \
 	driver.c \
 	joystick.c \
 	lolvldrv.c \
@@ -12,8 +12,6 @@ C_SRCS = \
 	playsound.c \
 	time.c \
 	waveform.c \
-	winmm.c
-
-RC_SRCS = \
+	winmm.c \
 	winmm.rc \
 	winmm_res.rc
diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in
index 2b475dd89c3..23e63f5ab1a 100644
--- a/dlls/winmm/tests/Makefile.in
+++ b/dlls/winmm/tests/Makefile.in
@@ -1,7 +1,7 @@
 TESTDLL   = winmm.dll
 IMPORTS   = winmm ole32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	capture.c \
 	generated.c \
 	joystick.c \
@@ -10,8 +10,6 @@ C_SRCS = \
 	midi.c \
 	mixer.c \
 	mmio.c \
+	rsrc.rc \
 	timer.c \
 	wave.c
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in
index f8213728d22..39471044756 100644
--- a/dlls/winscard/Makefile.in
+++ b/dlls/winscard/Makefile.in
@@ -3,9 +3,7 @@ IMPORTLIB = winscard
 UNIXLIB   = winscard.so
 UNIX_LIBS = $(PCSCLITE_LIBS)
 
-C_SRCS = \
+SOURCES = \
+	rsrc.rc \
 	unixlib.c \
 	winscard.c
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 3f6d32cb44d..1c48f0073f3 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -5,9 +5,8 @@ IMPORTS   = user32 gdi32 advapi32 compstui
 UNIX_CFLAGS  = $(CUPS_CFLAGS)
 UNIX_LIBS    = $(APPLICATIONSERVICES_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	cups.c \
 	info.c \
+	winspool.rc \
 	wspool.c
-
-RC_SRCS = winspool.rc
diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in
index 244f17f0728..e3d311c9284 100644
--- a/dlls/wintrust/Makefile.in
+++ b/dlls/wintrust/Makefile.in
@@ -3,12 +3,10 @@ IMPORTLIB = wintrust
 IMPORTS   = crypt32 user32 advapi32
 DELAYIMPORTS = cryptui imagehlp
 
-C_SRCS = \
+SOURCES = \
 	asn.c \
 	crypt.c \
 	register.c \
 	softpub.c \
+	version.rc \
 	wintrust_main.c
-
-RC_SRCS = \
-	version.rc
diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 903f6f67666..30b1c389b60 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = wldap32
 IMPORTS   = $(LDAP_PE_LIBS) crypt32 secur32 ws2_32 user32
 EXTRAINCL = $(LDAP_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	add.c \
 	ber.c \
 	bind.c \
@@ -23,6 +23,5 @@ C_SRCS = \
 	parse.c \
 	rename.c \
 	search.c \
-	value.c
-
-RC_SRCS = wldap32.rc
+	value.c \
+	wldap32.rc
diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in
index 089d9e7f3e1..3dc5f45b0f6 100644
--- a/dlls/wmp/tests/Makefile.in
+++ b/dlls/wmp/tests/Makefile.in
@@ -1,9 +1,7 @@
 TESTDLL   = wmp.dll
 IMPORTS   = ole32 oleaut32 user32 gdi32
 
-C_SRCS = \
+SOURCES = \
 	media.c \
-	oleobj.c
-
-RC_SRCS = \
+	oleobj.c \
 	rsrc.rc
diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
index c8902fab100..5751e68afac 100644
--- a/dlls/wmvcore/Makefile.in
+++ b/dlls/wmvcore/Makefile.in
@@ -5,9 +5,8 @@ DELAYIMPORTS = winegstreamer
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	async_reader.c \
+	version.rc \
 	wmvcore_main.c \
 	writer.c
-
-RC_SRCS = version.rc
diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in
index 856e02d45d5..8d78d50601e 100644
--- a/dlls/wmvcore/tests/Makefile.in
+++ b/dlls/wmvcore/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = wmvcore.dll
 IMPORTS   = ole32 wmvcore
 
-C_SRCS = \
+SOURCES = \
+	rsrc.rc \
 	wmvcore.c
-
-RC_SRCS = \
-	rsrc.rc
diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in
index 8617f3e2a87..3dfc5e5b869 100644
--- a/dlls/wpcap/Makefile.in
+++ b/dlls/wpcap/Makefile.in
@@ -4,8 +4,7 @@ IMPORTS   = iphlpapi
 DELAYIMPORTS = ws2_32
 UNIX_LIBS    = $(PCAP_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	unixlib.c \
+	version.rc \
 	wpcap.c
-
-RC_SRCS = version.rc
diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in
index fc13323b930..e80def64881 100644
--- a/dlls/ws2_32/Makefile.in
+++ b/dlls/ws2_32/Makefile.in
@@ -5,11 +5,10 @@ IMPORTLIB = ws2_32
 DELAYIMPORTS = dnsapi advapi32 iphlpapi user32
 UNIX_LIBS    = $(PTHREAD_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	inaddr.c \
 	protocol.c \
 	socket.c \
-	unixlib.c
-
-RC_SRCS = version.rc
+	unixlib.c \
+	version.rc
diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index b5a9c437825..275be194fde 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -2,9 +2,8 @@ MODULE    = wsock32.dll
 IMPORTLIB = wsock32
 IMPORTS   = mswsock ws2_32 iphlpapi
 
-C_SRCS = \
+SOURCES = \
 	protocol.c \
 	service.c \
-	socket.c
-
-RC_SRCS = version.rc
+	socket.c \
+	version.rc
diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in
index e710511ab51..03325f5d740 100644
--- a/dlls/wuaueng/Makefile.in
+++ b/dlls/wuaueng/Makefile.in
@@ -2,4 +2,5 @@ MODULE    = wuaueng.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc
diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in
index cc2825d0d19..b5c13cde8df 100644
--- a/dlls/xinput1_1/Makefile.in
+++ b/dlls/xinput1_1/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = xinput1_1.dll
 IMPORTS   = hid setupapi advapi32 user32
 PARENTSRC = ../xinput1_3
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in
index 1c4b48cdbda..f49e8f53191 100644
--- a/dlls/xinput1_2/Makefile.in
+++ b/dlls/xinput1_2/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = xinput1_2.dll
 IMPORTS   = hid setupapi advapi32 user32
 PARENTSRC = ../xinput1_3
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in
index a1c58a7452a..28d46d8c97f 100644
--- a/dlls/xinput1_3/Makefile.in
+++ b/dlls/xinput1_3/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = xinput1_3.dll
 IMPORTLIB = xinput
 IMPORTS   = hid setupapi advapi32 user32
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in
index 393a416af9e..69d6b9c018f 100644
--- a/dlls/xinput1_4/Makefile.in
+++ b/dlls/xinput1_4/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = xinput1_4.dll
 IMPORTS   = hid setupapi advapi32 user32
 PARENTSRC = ../xinput1_3
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in
index 55ea44ba666..d5f2adfa3ff 100644
--- a/dlls/xinput9_1_0/Makefile.in
+++ b/dlls/xinput9_1_0/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = xinput9_1_0.dll
 IMPORTS   = hid setupapi advapi32 user32
 PARENTSRC = ../xinput1_3
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/xinputuap/Makefile.in b/dlls/xinputuap/Makefile.in
index 5d311fe7c31..290f0831348 100644
--- a/dlls/xinputuap/Makefile.in
+++ b/dlls/xinputuap/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = xinputuap.dll
 IMPORTS   = hid setupapi advapi32 user32
 PARENTSRC = ../xinput1_3
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/dlls/xpsprint/Makefile.in b/dlls/xpsprint/Makefile.in
index 9240d324ff4..dcb56fac158 100644
--- a/dlls/xpsprint/Makefile.in
+++ b/dlls/xpsprint/Makefile.in
@@ -2,4 +2,5 @@ MODULE = xpsprint.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-RC_SRCS = xpsprint.rc
+SOURCES = \
+	xpsprint.rc
diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in
index 2c2eade6b69..2c874085531 100644
--- a/programs/attrib/Makefile.in
+++ b/programs/attrib/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = attrib.c
-
-RC_SRCS = attrib.rc
+SOURCES = \
+	attrib.c \
+	attrib.rc
diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in
index c7037abb10f..9af362fb843 100644
--- a/programs/chcp.com/Makefile.in
+++ b/programs/chcp.com/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = kernelbase
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
+SOURCES = \
+	chcp.rc \
 	main.c
-
-RC_SRCS = chcp.rc
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index d9b37e6e25e..7c55396dfc8 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -3,8 +3,7 @@ IMPORTS   = comdlg32 shell32 user32 gdi32 comctl32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
+	clock.rc \
 	main.c \
 	winclock.c
-
-RC_SRCS = clock.rc
diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in
index 9f50cbe042b..7eca0f23176 100644
--- a/programs/cmd/tests/Makefile.in
+++ b/programs/cmd/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = cmd.exe
 
-C_SRCS = \
+SOURCES = \
 	batch.c \
-	directory.c
-
-RC_SRCS   = rsrc.rc
+	directory.c \
+	rsrc.rc
diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in
index 2a407006697..f607ccc1d35 100644
--- a/programs/conhost/Makefile.in
+++ b/programs/conhost/Makefile.in
@@ -4,8 +4,7 @@ DELAYIMPORTS = comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
 	conhost.c \
+	conhost.rc \
 	window.c
-
-RC_SRCS = conhost.rc
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 2382680e759..52979d1892f 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = shell32 user32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = control.c
-
-RC_SRCS = control.rc
+SOURCES = \
+	control.c \
+	control.rc
diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in
index d00f23c3dd7..d4cd1c1d70c 100644
--- a/programs/dism/Makefile.in
+++ b/programs/dism/Makefile.in
@@ -2,6 +2,6 @@ MODULE    = dism.exe
 
 EXTRADLLFLAGS = -mconsole -municode
 
-RC_SRCS = version.rc
-
-C_SRCS = dism.c
+SOURCES = \
+	dism.c \
+	version.rc
diff --git a/programs/dplaysvr/Makefile.in b/programs/dplaysvr/Makefile.in
index 6b686f889d3..9820d633e5b 100644
--- a/programs/dplaysvr/Makefile.in
+++ b/programs/dplaysvr/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = dplaysvr.exe
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in
index 317c8d839db..a1e31ab7d51 100644
--- a/programs/dpnsvr/Makefile.in
+++ b/programs/dpnsvr/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = dpnsvr.exe
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/programs/dpvsetup/Makefile.in b/programs/dpvsetup/Makefile.in
index 7028b4b5c52..6a0e9ca2c14 100644
--- a/programs/dpvsetup/Makefile.in
+++ b/programs/dpvsetup/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = dpvsetup.exe
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in
index 2ea7a084d19..c1cc96c43c2 100644
--- a/programs/dxdiag/Makefile.in
+++ b/programs/dxdiag/Makefile.in
@@ -3,9 +3,8 @@ IMPORTS   = dxguid ole32 oleaut32 user32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
+	dxdiag.rc \
 	information.c \
 	main.c \
 	output.c
-
-RC_SRCS = dxdiag.rc
diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in
index 3a2ddec3fd4..e6668da7e99 100644
--- a/programs/explorer/Makefile.in
+++ b/programs/explorer/Makefile.in
@@ -4,11 +4,10 @@ DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
 	appbar.c \
 	desktop.c \
 	explorer.c \
+	explorer.rc \
 	startmenu.c \
 	systray.c
-
-RC_SRCS = explorer.rc
diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in
index f0cefde4625..9faa3812c56 100644
--- a/programs/extrac32/Makefile.in
+++ b/programs/extrac32/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = shell32 setupapi shlwapi user32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	extrac32.c
-
-RC_SRCS = extrac32.rc
+SOURCES = \
+	extrac32.c \
+	extrac32.rc
diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in
index 438792a72d7..2d8469f6317 100644
--- a/programs/find/Makefile.in
+++ b/programs/find/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = find.c
-
-RC_SRCS = find.rc
+SOURCES = \
+	find.c \
+	find.rc
diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in
index d3f8f728854..e9085cfeb20 100644
--- a/programs/findstr/Makefile.in
+++ b/programs/findstr/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
+SOURCES = \
+	findstr.rc \
 	main.c
-
-RC_SRCS = findstr.rc
diff --git a/programs/hostname/Makefile.in b/programs/hostname/Makefile.in
index 44857264ec5..3ff3fb1a102 100644
--- a/programs/hostname/Makefile.in
+++ b/programs/hostname/Makefile.in
@@ -3,6 +3,6 @@ DELAYIMPORTS = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = hostname.c
-
-RC_SRCS = hostname.rc
+SOURCES = \
+	hostname.c \
+	hostname.rc
diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in
index 3634cf3c055..2eb15a5dfc7 100644
--- a/programs/ipconfig/Makefile.in
+++ b/programs/ipconfig/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = iphlpapi ws2_32 user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = ipconfig.c
-
-RC_SRCS = ipconfig.rc
+SOURCES = \
+	ipconfig.c \
+	ipconfig.rc
diff --git a/programs/klist/Makefile.in b/programs/klist/Makefile.in
index d9777562091..ef657eeda24 100644
--- a/programs/klist/Makefile.in
+++ b/programs/klist/Makefile.in
@@ -3,8 +3,6 @@ IMPORTS   = secur32 advapi32 user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
+SOURCES = \
+	klist.rc \
 	main.c
-
-RC_SRCS = \
-	klist.rc
diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in
index acf8bc8882f..e543dacec01 100644
--- a/programs/msinfo32/Makefile.in
+++ b/programs/msinfo32/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = shell32 user32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = msinfo32.rc
+SOURCES = \
+	main.c \
+	msinfo32.rc
diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in
index eb8e1e48ff3..20678855ab2 100644
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = netapi32 user32 advapi32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = net.c
-
-RC_SRCS = net.rc
+SOURCES = \
+	net.c \
+	net.rc
diff --git a/programs/netstat/Makefile.in b/programs/netstat/Makefile.in
index e16d01ba4e9..bd63830430e 100644
--- a/programs/netstat/Makefile.in
+++ b/programs/netstat/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = iphlpapi user32 ws2_32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = netstat.c
-
-RC_SRCS = netstat.rc
+SOURCES = \
+	netstat.c \
+	netstat.rc
diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in
index c706f7309ae..0a67bc8111c 100644
--- a/programs/oleview/Makefile.in
+++ b/programs/oleview/Makefile.in
@@ -3,12 +3,11 @@ IMPORTS   = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
 	details.c \
 	interface.c \
 	oleview.c \
+	oleview.rc \
 	pane.c \
 	tree.c \
 	typelib.c
-
-RC_SRCS = oleview.rc
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index f9dbcab835a..beac24d0023 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -3,12 +3,11 @@ IMPORTS   = shell32 comdlg32 user32 gdi32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
 	dialog.c \
 	group.c \
 	grpfile.c \
 	main.c \
+	progman.rc \
 	program.c \
 	string.c
-
-RC_SRCS = progman.rc
diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index d7e4e4b65ce..98aa302c677 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -4,13 +4,12 @@ DELAYIMPORTS = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
+SOURCES = \
 	add.c \
 	copy.c \
 	delete.c \
 	export.c \
 	import.c \
 	query.c \
-	reg.c
-
-RC_SRCS = reg.rc
+	reg.c \
+	reg.rc
diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in
index f5d9dff6e4d..9ecc395c0f5 100644
--- a/programs/robocopy/Makefile.in
+++ b/programs/robocopy/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = robocopy.exe
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = robocopy.rc
+SOURCES = \
+	main.c \
+	robocopy.rc
diff --git a/programs/setx/Makefile.in b/programs/setx/Makefile.in
index 1a556abd511..56de3e29585 100644
--- a/programs/setx/Makefile.in
+++ b/programs/setx/Makefile.in
@@ -2,8 +2,6 @@ MODULE    = setx.exe
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = \
+SOURCES = \
+	main.c \
 	version.rc
diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in
index 04bc38808bf..927c4f3259f 100644
--- a/programs/start/Makefile.in
+++ b/programs/start/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = shell32 user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = start.c
-
-RC_SRCS = start.rc
+SOURCES = \
+	start.c \
+	start.rc
diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in
index 9bf5879833b..aed54c75bf3 100644
--- a/programs/taskkill/Makefile.in
+++ b/programs/taskkill/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = taskkill.c
-
-RC_SRCS = taskkill.rc
+SOURCES = \
+	taskkill.c \
+	taskkill.rc
diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in
index 8b1c206fe0e..75c24d94ade 100644
--- a/programs/tasklist/Makefile.in
+++ b/programs/tasklist/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = tasklist.c
-
-RC_SRCS = tasklist.rc
+SOURCES = \
+	tasklist.c \
+	tasklist.rc
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 5cc35b19dc3..f3cc40b84e7 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -4,7 +4,6 @@ DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = uninstaller.rc
+SOURCES = \
+	main.c \
+	uninstaller.rc
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 457fcbf171e..2854d5395eb 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = comdlg32 user32 gdi32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	view.c
-
-RC_SRCS = view.rc
+SOURCES = \
+	view.c \
+	view.rc
diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in
index 67420b81759..0a878a42dbb 100644
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = user32 kernel
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
-	winevdm.c
-
-RC_SRCS = winevdm.rc
+SOURCES = \
+	winevdm.c \
+	winevdm.rc
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 70d65d36e27..171e981bf7f 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = shell32 comctl32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = winver.c
-
-RC_SRCS = version.rc
+SOURCES = \
+	version.rc \
+	winver.c
diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in
index 1c4785c7059..973232f8480 100644
--- a/programs/wmic/Makefile.in
+++ b/programs/wmic/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = oleaut32 ole32 user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = wmic.rc
+SOURCES = \
+	main.c \
+	wmic.rc
diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in
index 6ba939c8a3c..f5d39e11d77 100644
--- a/programs/wmplayer/Makefile.in
+++ b/programs/wmplayer/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = wmplayer.exe
 
 EXTRADLLFLAGS = -mwindows -municode
 
-RC_SRCS = version.rc
-
-C_SRCS = \
-	main.c
+SOURCES = \
+	main.c \
+	version.rc
diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in
index b97e1c9b96a..ac34a16666e 100644
--- a/programs/write/Makefile.in
+++ b/programs/write/Makefile.in
@@ -3,6 +3,6 @@ IMPORTS   = user32 gdi32 shell32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = write.c
-
-RC_SRCS = write.rc
+SOURCES = \
+	write.c \
+	write.rc
diff --git a/programs/wscript/tests/Makefile.in b/programs/wscript/tests/Makefile.in
index 1f038b04588..f2303340073 100644
--- a/programs/wscript/tests/Makefile.in
+++ b/programs/wscript/tests/Makefile.in
@@ -1,7 +1,6 @@
 TESTDLL   = wscript.exe
 IMPORTS   = ole32 oleaut32 psapi advapi32
 
-C_SRCS = \
+SOURCES = \
+	rsrc.rc \
 	run.c
-
-RC_SRCS   = rsrc.rc
diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in
index b22ff7814ec..7357c0cbe69 100644
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@@ -3,7 +3,6 @@ IMPORTS   = shell32 user32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
-	xcopy.c
-
-RC_SRCS = xcopy.rc
+SOURCES = \
+	xcopy.c \
+	xcopy.rc
diff --git a/tools/make_makefiles b/tools/make_makefiles
index e74f9c7dd7a..0008f70297e 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@)
         my $make = $makefiles{"$dir/Makefile.in"};
         my $name = substr( $file, length($dir) + 1 );
 
-        if ($name =~ /\.(in|l|m|mc|po|sfd|svg|y)$/)
+        if ($name =~ /\.(in|l|m|mc|po|rc|sfd|svg|y)$/)
         {
             push @{${$make}{"=SOURCES"}}, $name;
             next;
@@ -351,10 +351,6 @@ sub assign_sources_to_makefiles(@)
         {
             next if $dir ne "include";
         }
-        elsif ($name =~ /\.rc$/)
-        {
-            push @{${$make}{"=RC_SRCS"}}, $name;
-        }
         elsif ($name =~ /\.idl$/)
         {
             die "no makedep flags specified in $file" unless $dir eq "include" || get_makedep_flags($file);
@@ -392,7 +388,6 @@ sub assign_sources_to_makefiles(@)
         next unless $parent;
         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" );
     }
 }