diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in
index e873f7aeaa8..08e29be63b1 100644
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@@ -3,12 +3,9 @@ IMPORTS   = msi ole32 advapi32 user32 comctl32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
 	msiexec.c \
+	msiexec.man.in \
+	msiexec.svg \
+	rsrc.rc \
 	service.c
-
-RC_SRCS = rsrc.rc
-
-MANPAGES = msiexec.man.in
-
-SVG_SRCS = msiexec.svg
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 1185f269ec3..d9ea42ac26f 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -3,12 +3,9 @@ IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32 comctl32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
 	dialog.c \
-	main.c
-
-RC_SRCS = notepad.rc
-
-MANPAGES = notepad.man.in
-
-SVG_SRCS = notepad.svg
+	main.c \
+	notepad.man.in \
+	notepad.rc \
+	notepad.svg
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 77ef7b3163a..c3118ec543a 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -4,7 +4,7 @@ DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
 	about.c \
 	childwnd.c \
 	edit.c \
@@ -13,11 +13,8 @@ C_SRCS = \
 	listview.c \
 	main.c \
 	regedit.c \
+	regedit.man.in \
+	regedit.rc \
+	regedit.svg \
 	regproc.c \
 	treeview.c
-
-RC_SRCS = regedit.rc
-
-MANPAGES = regedit.man.in
-
-SVG_SRCS = regedit.svg
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index 38779634408..60b2494ef2b 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -3,9 +3,7 @@ IMPORTS   = ole32 user32 kernelbase
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	regsvr32.c
-
-RC_SRCS = regsvr32.rc
-
-MANPAGES = regsvr32.man.in
+SOURCES = \
+	regsvr32.c \
+	regsvr32.man.in \
+	regsvr32.rc
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 667f8f48702..7c61102c40e 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -4,10 +4,8 @@ DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
 
 EXTRADLLFLAGS = -mconsole
 
-C_SRCS = \
+SOURCES = \
 	shutdown.c \
-	wineboot.c
-
-RC_SRCS = wineboot.rc
-
-MANPAGES = wineboot.man.in
+	wineboot.c \
+	wineboot.man.in \
+	wineboot.rc
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 84be34eab10..780f0e7e183 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -3,22 +3,18 @@ IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gd
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
 	about.c \
 	appdefaults.c \
 	audio.c \
 	drive.c \
 	driveui.c \
 	libraries.c \
+	logo.svg \
 	main.c \
 	theme.c \
 	winecfg.c \
+	winecfg.man.in \
+	winecfg.rc \
+	winecfg.svg \
 	x11drvdlg.c
-
-RC_SRCS = winecfg.rc
-
-MANPAGES = winecfg.man.in
-
-SVG_SRCS = \
-	logo.svg \
-	winecfg.svg
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index b859ef8a27a..9be7617323a 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -4,9 +4,7 @@ DELAYIMPORTS = comctl32 user32 gdi32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	wineconsole.c
-
-RC_SRCS = wineconsole.rc
-
-MANPAGES = wineconsole.man.in
+SOURCES = \
+	wineconsole.c \
+	wineconsole.man.in \
+	wineconsole.rc
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 0c7e69730f3..97fae9359dc 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -5,13 +5,15 @@ DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 ws2_32
 
 EXTRADLLFLAGS = -mconsole
 
-C_SRCS = \
+SOURCES = \
 	be_arm.c \
 	be_arm64.c \
 	be_i386.c \
 	be_x86_64.c \
 	break.c \
 	crashdlg.c \
+	dbg.y \
+	debug.l \
 	display.c \
 	expr.c \
 	gdbproxy.c \
@@ -24,11 +26,6 @@ C_SRCS = \
 	tgt_minidump.c \
 	tgt_module.c \
 	types.c \
-	winedbg.c
-
-RC_SRCS = winedbg.rc
-
-LEX_SRCS   = debug.l
-BISON_SRCS = dbg.y
-
-MANPAGES = winedbg.man.in
+	winedbg.c \
+	winedbg.man.in \
+	winedbg.rc
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index fe42af68461..fd85a573fcb 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -3,11 +3,8 @@ IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
-	winefile.c
-
-RC_SRCS = winefile.rc
-
-MANPAGES = winefile.man.in
-
-SVG_SRCS = winefile.svg
+SOURCES = \
+	winefile.c \
+	winefile.man.in \
+	winefile.rc \
+	winefile.svg
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index 304c7f5f036..6787d582a47 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -4,12 +4,9 @@ DELAYIMPORTS = shell32
 
 EXTRADLLFLAGS = -mwindows -municode
 
-C_SRCS = \
+SOURCES = \
 	dialog.c \
-	main.c
-
-RC_SRCS = winemine.rc
-
-MANPAGES = winemine.man.in
-
-SVG_SRCS = winemine.svg
+	main.c \
+	winemine.man.in \
+	winemine.rc \
+	winemine.svg
diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in
index e43420d7c79..03aa1cd5710 100644
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@@ -2,6 +2,6 @@ MODULE    = winepath.exe
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = winepath.c
-
-MANPAGES = winepath.man.in
+SOURCES = \
+	winepath.c \
+	winepath.man.in
diff --git a/server/Makefile.in b/server/Makefile.in
index c62edbdb892..7b46b924c46 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,6 +1,6 @@
 PROGRAMS = wineserver
 
-C_SRCS = \
+SOURCES = \
 	async.c \
 	atom.c \
 	change.c \
@@ -42,12 +42,10 @@ C_SRCS = \
 	unicode.c \
 	user.c \
 	window.c \
-	winstation.c
-
-MANPAGES = \
 	wineserver.de.UTF-8.man.in \
 	wineserver.fr.UTF-8.man.in \
-	wineserver.man.in
+	wineserver.man.in \
+	winstation.c
 
 UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS)
 
diff --git a/tools/make_makefiles b/tools/make_makefiles
index c114c30ed57..3c225eac860 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 =~ /\.(m|mc|po|sfd)$/)
+        if ($name =~ /\.(in|m|mc|po|sfd)$/)
         {
             push @{${$make}{"=SOURCES"}}, $name;
             next;
@@ -363,15 +363,6 @@ sub assign_sources_to_makefiles(@)
             die "no makedep flags specified in $file" unless $dir eq "include" || get_makedep_flags($file);
             push @{${$make}{"=IDL_SRCS"}}, $name;
         }
-        elsif ($name =~ /\.man\.in$/)
-        {
-            push @{${$make}{"=MANPAGES"}}, $name;
-        }
-        elsif ($name =~ /\.in$/)
-        {
-            push @{${$make}{"=SOURCES"}}, $name;
-            next;
-        }
         elsif ($name =~ /\.spec$/)
         {
             my $dllflags = ${$make}{"EXTRADLLFLAGS"} || "";
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index d18c127adb0..cde27db942c 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -1,12 +1,16 @@
 PROGRAMS = widl
 PARENTSRC = ../wrc
 
-C_SRCS = \
+SOURCES = \
 	attribute.c \
 	client.c \
 	expr.c \
 	hash.c \
 	header.c \
+	parser.l \
+	parser.y \
+	ppl.l \
+	ppy.y \
 	proxy.c \
 	register.c \
 	server.c \
@@ -15,19 +19,10 @@ C_SRCS = \
 	typetree.c \
 	utils.c \
 	widl.c \
+	widl.man.in \
 	wpp.c \
 	write_msft.c
 
-LEX_SRCS = \
-	parser.l \
-	ppl.l
-
-BISON_SRCS = \
-	parser.y \
-	ppy.y
-
-MANPAGES = widl.man.in
-
 widl_EXTRADEFS = \
 	-DINCLUDEDIR="\"${includedir}\"" \
 	-DDLLDIR="\"${dlldir}\"" \
diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
index 0511012742e..d2bdc53d422 100644
--- a/tools/winebuild/Makefile.in
+++ b/tools/winebuild/Makefile.in
@@ -1,7 +1,6 @@
 PROGRAMS = winebuild
-MANPAGES = winebuild.man.in
 
-C_SRCS = \
+SOURCES = \
 	import.c \
 	main.c \
 	parser.c \
@@ -10,6 +9,7 @@ C_SRCS = \
 	res32.c \
 	spec16.c \
 	spec32.c \
-	utils.c
+	utils.c \
+	winebuild.man.in
 
 INSTALL_DEV = $(PROGRAMS)
diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in
index 1e58b1a839a..272520005d6 100644
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@ -1,8 +1,7 @@
 PROGRAMS = winedump
-MANPAGES = winedump.man.in
 SCRIPTS  = function_grep.pl
 
-C_SRCS = \
+SOURCES = \
 	debug.c \
 	dos.c \
 	dump.c \
@@ -26,6 +25,7 @@ C_SRCS = \
 	reg.c \
 	search.c \
 	symbol.c \
-	tlb.c
+	tlb.c \
+	winedump.man.in
 
 INSTALL_DEV = $(PROGRAMS) $(SCRIPTS)
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index c4ef77da33c..37749545807 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -1,13 +1,12 @@
 PROGRAMS = winegcc
 
-MANPAGES = winegcc.man.in
+SOURCES = \
+	utils.c \
+	winegcc.c \
+	winegcc.man.in
 
 winegcc_SYMLINKS = winecpp wineg++
 
-C_SRCS = \
-	utils.c \
-	winegcc.c
-
 winegcc_EXTRADEFS = \
 	-DINCLUDEDIR="\"${includedir}\"" \
 	-DLIBDIR="\"${libdir}\"" \
diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in
index 37e345dd792..5e2983bc002 100644
--- a/tools/winemaker/Makefile.in
+++ b/tools/winemaker/Makefile.in
@@ -1,6 +1,6 @@
 SCRIPTS = winemaker
 
-MANPAGES = \
+SOURCES = \
 	winemaker.de.UTF-8.man.in \
 	winemaker.fr.UTF-8.man.in \
 	winemaker.man.in
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index 4fd99804f56..022315c8ce1 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -1,17 +1,16 @@
 PROGRAMS = wmc
-MANPAGES = wmc.man.in
 UNIX_LIBS = $(GETTEXTPO_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	lang.c \
 	mcl.c \
+	mcy.y \
 	po.c \
 	utils.c \
 	wmc.c \
+	wmc.man.in \
 	write.c
 
-BISON_SRCS = mcy.y
-
 wmc_EXTRADEFS = \
 	-DNLSDIR="\"${nlsdir}\"" \
 	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\"
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 1a05a55f8d1..06547d2b851 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -1,23 +1,18 @@
 PROGRAMS = wrc
 UNIX_LIBS = $(GETTEXTPO_LIBS)
 
-C_SRCS = \
+SOURCES = \
 	genres.c \
 	newstruc.c \
+	parser.l \
+	parser.y \
 	po.c \
+	ppl.l \
+	ppy.y \
 	utils.c \
 	wpp.c \
-	wrc.c
-
-LEX_SRCS = \
-	parser.l \
-	ppl.l
-
-BISON_SRCS = \
-	parser.y \
-	ppy.y
-
-MANPAGES = wrc.man.in
+	wrc.c \
+	wrc.man.in
 
 wrc_EXTRADEFS = \
 	-DNLSDIR="\"${nlsdir}\"" \