diff --git a/.gitignore b/.gitignore
index 1abc9e7d9bd..d2910e94aef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Automatically generated by make_makefiles; DO NOT EDIT!!
 *.[oa]
+*.res
 *.so
 /Make.rules
 /TAGS
@@ -22,45 +23,34 @@ dlls/advapi32/libadvapi32.def
 dlls/advapi32/tests/*.ok
 dlls/advapi32/tests/advapi32_crosstest.exe
 dlls/advapi32/tests/testlist.c
-dlls/advapi32/version.res
 dlls/advpack/libadvpack.def
 dlls/advpack/tests/*.ok
 dlls/advpack/tests/advpack_crosstest.exe
 dlls/advpack/tests/testlist.c
-dlls/amstream/version.res
 dlls/atl/atliface.h
 dlls/atl/libatl.def
-dlls/atl/rsrc.res
 dlls/avicap32/libavicap32.def
 dlls/avifil32/libavifil32.def
-dlls/avifil32/rsrc.res
 dlls/avifile.dll16
-dlls/browseui/rsrc.res
 dlls/browseui/tests/*.ok
 dlls/browseui/tests/browseui_crosstest.exe
 dlls/browseui/tests/testlist.c
-dlls/cabinet/cabinet.res
 dlls/cabinet/libcabinet.def
 dlls/cabinet/tests/*.ok
 dlls/cabinet/tests/cabinet_crosstest.exe
 dlls/cabinet/tests/testlist.c
 dlls/capi2032/libcapi2032.def
-dlls/cards/cards.res
 dlls/cards/libcards.def
 dlls/cfgmgr32/libcfgmgr32.def
 dlls/clusapi/libclusapi.def
 dlls/comcat/tests/*.ok
 dlls/comcat/tests/comcat_crosstest.exe
 dlls/comcat/tests/testlist.c
-dlls/comcat/version.res
 dlls/comctl32/libcomctl32.def
-dlls/comctl32/rsrc.res
 dlls/comctl32/tests/*.ok
 dlls/comctl32/tests/comctl32_crosstest.exe
-dlls/comctl32/tests/rsrc.res
 dlls/comctl32/tests/testlist.c
 dlls/comdlg32/libcomdlg32.def
-dlls/comdlg32/rsrc.res
 dlls/comdlg32/tests/*.ok
 dlls/comdlg32/tests/comdlg32_crosstest.exe
 dlls/comdlg32/tests/testlist.c
@@ -68,13 +58,11 @@ dlls/comm.drv16
 dlls/commdlg.dll16
 dlls/compobj.dll16
 dlls/compstui/libcompstui.def
-dlls/credui/credui.res
 dlls/credui/libcredui.def
 dlls/credui/tests/*.ok
 dlls/credui/tests/credui_crosstest.exe
 dlls/credui/tests/testlist.c
 dlls/crtdll/libcrtdll.def
-dlls/crypt32/crypt32.res
 dlls/crypt32/libcrypt32.def
 dlls/crypt32/tests/*.ok
 dlls/crypt32/tests/crypt32_crosstest.exe
@@ -87,31 +75,25 @@ dlls/cryptnet/tests/testlist.c
 dlls/ctl3d.dll16
 dlls/ctl3d32/libctl3d32.def
 dlls/ctl3dv2.dll16
-dlls/d3d10/version.res
 dlls/d3d8/libd3d8.def
 dlls/d3d8/tests/*.ok
 dlls/d3d8/tests/d3d8_crosstest.exe
 dlls/d3d8/tests/testlist.c
-dlls/d3d8/version.res
 dlls/d3d9/libd3d9.def
 dlls/d3d9/tests/*.ok
 dlls/d3d9/tests/d3d9_crosstest.exe
 dlls/d3d9/tests/testlist.c
-dlls/d3d9/version.res
 dlls/d3dim/libd3dim.def
-dlls/d3dim/version.res
 dlls/d3drm/libd3drm.def
 dlls/d3drm/tests/*.ok
 dlls/d3drm/tests/d3drm_crosstest.exe
 dlls/d3drm/tests/testlist.c
-dlls/d3drm/version.res
 dlls/d3dx8/libd3dx8.def
 dlls/d3dx8/tests/*.ok
 dlls/d3dx8/tests/d3dx8_crosstest.exe
 dlls/d3dx8/tests/testlist.c
 dlls/d3dx9_36/libd3dx9.def
 dlls/d3dxof/libd3dxof.def
-dlls/d3dxof/version.res
 dlls/dbghelp/libdbghelp.def
 dlls/dciman32/libdciman32.def
 dlls/ddeml.dll16
@@ -119,73 +101,44 @@ dlls/ddraw/libddraw.def
 dlls/ddraw/tests/*.ok
 dlls/ddraw/tests/ddraw_crosstest.exe
 dlls/ddraw/tests/testlist.c
-dlls/ddraw/version.res
-dlls/devenum/devenum.res
 dlls/dinput/libdinput.def
 dlls/dinput/tests/*.ok
 dlls/dinput/tests/dinput_crosstest.exe
 dlls/dinput/tests/testlist.c
-dlls/dinput/version.res
 dlls/dinput8/libdinput8.def
-dlls/dinput8/version.res
 dlls/dispdib.dll16
 dlls/display.drv16
-dlls/dmband/version.res
-dlls/dmcompos/version.res
-dlls/dmime/version.res
-dlls/dmloader/version.res
-dlls/dmscript/version.res
-dlls/dmstyle/version.res
-dlls/dmsynth/version.res
-dlls/dmusic/version.res
 dlls/dmusic32/libdmusic32.def
-dlls/dmusic32/version.res
 dlls/dnsapi/libdnsapi.def
 dlls/dnsapi/tests/*.ok
 dlls/dnsapi/tests/dnsapi_crosstest.exe
 dlls/dnsapi/tests/testlist.c
 dlls/dplay/libdplay.def
-dlls/dplay/version.res
 dlls/dplayx/libdplayx.def
 dlls/dplayx/tests/*.ok
 dlls/dplayx/tests/dplayx_crosstest.exe
 dlls/dplayx/tests/testlist.c
-dlls/dplayx/version.res
-dlls/dpnaddr/version.res
 dlls/dpnet/libdpnet.def
-dlls/dpnet/version.res
-dlls/dpnhpast/version.res
-dlls/dpnlobby/version.res
 dlls/dsound/libdsound.def
 dlls/dsound/tests/*.ok
 dlls/dsound/tests/dsound_crosstest.exe
 dlls/dsound/tests/testlist.c
-dlls/dsound/version.res
-dlls/dswave/version.res
 dlls/dwmapi/libdwmapi.def
-dlls/dwmapi/version.res
-dlls/dxdiagn/version.res
 dlls/gdi.exe16
 dlls/gdi32/libgdi32.def
 dlls/gdi32/tests/*.ok
 dlls/gdi32/tests/gdi32_crosstest.exe
 dlls/gdi32/tests/testlist.c
-dlls/gdi32/version.res
-dlls/gdi32/version16.res
 dlls/gdiplus/libgdiplus.def
 dlls/gdiplus/tests/*.ok
 dlls/gdiplus/tests/gdiplus_crosstest.exe
 dlls/gdiplus/tests/testlist.c
 dlls/glu32/libglu32.def
-dlls/gphoto2.ds/rsrc.res
-dlls/hhctrl.ocx/hhctrl.res
 dlls/hid/libhid.def
-dlls/hid/version.res
 dlls/hlink/libhlink.def
 dlls/hlink/tests/*.ok
 dlls/hlink/tests/hlink_crosstest.exe
 dlls/hlink/tests/testlist.c
-dlls/iccvid/rsrc.res
 dlls/icmp/libicmp.def
 dlls/imagehlp/libimagehlp.def
 dlls/imm.dll16
@@ -193,7 +146,6 @@ dlls/imm32/libimm32.def
 dlls/imm32/tests/*.ok
 dlls/imm32/tests/imm32_crosstest.exe
 dlls/imm32/tests/testlist.c
-dlls/imm32/version.res
 dlls/inetcomm/libinetcomm.def
 dlls/inetcomm/tests/*.ok
 dlls/inetcomm/tests/inetcomm_crosstest.exe
@@ -205,13 +157,9 @@ dlls/iphlpapi/libiphlpapi.def
 dlls/iphlpapi/tests/*.ok
 dlls/iphlpapi/tests/iphlpapi_crosstest.exe
 dlls/iphlpapi/tests/testlist.c
-dlls/iphlpapi/version.res
-dlls/itss/rsrc.res
 dlls/itss/tests/*.ok
 dlls/itss/tests/itss_crosstest.exe
-dlls/itss/tests/rsrc.res
 dlls/itss/tests/testlist.c
-dlls/kernel32/kernel.res
 dlls/kernel32/libkernel32.def
 dlls/kernel32/nls/winerr_deu.mc.rc
 dlls/kernel32/nls/winerr_enu.mc.rc
@@ -220,16 +168,13 @@ dlls/kernel32/nls/winerr_kor.mc.rc
 dlls/kernel32/tests/*.ok
 dlls/kernel32/tests/kernel32_crosstest.exe
 dlls/kernel32/tests/testlist.c
-dlls/kernel32/version16.res
 dlls/keyboard.drv16
 dlls/krnl386.exe16
 dlls/libd3dx9.def
 dlls/libwinspool.def
-dlls/localspl/localspl.res
 dlls/localspl/tests/*.ok
 dlls/localspl/tests/localspl_crosstest.exe
 dlls/localspl/tests/testlist.c
-dlls/localui/localui.res
 dlls/localui/tests/*.ok
 dlls/localui/tests/localui_crosstest.exe
 dlls/localui/tests/testlist.c
@@ -237,13 +182,11 @@ dlls/lz32/liblz32.def
 dlls/lz32/tests/*.ok
 dlls/lz32/tests/lz32_crosstest.exe
 dlls/lz32/tests/testlist.c
-dlls/lz32/version.res
 dlls/lzexpand.dll16
 dlls/mapi32/libmapi32.def
 dlls/mapi32/tests/*.ok
 dlls/mapi32/tests/mapi32_crosstest.exe
 dlls/mapi32/tests/testlist.c
-dlls/mciavi32/mciavi_res.res
 dlls/mlang/libmlang.def
 dlls/mlang/tests/*.ok
 dlls/mlang/tests/mlang_crosstest.exe
@@ -251,11 +194,9 @@ dlls/mlang/tests/testlist.c
 dlls/mmsystem.dll16
 dlls/mouse.drv16
 dlls/mpr/libmpr.def
-dlls/mpr/mpr.res
 dlls/mprapi/libmprapi.def
 dlls/msacm.dll16
 dlls/msacm32/libmsacm32.def
-dlls/msacm32/msacm.res
 dlls/msacm32/tests/*.ok
 dlls/msacm32/tests/msacm32_crosstest.exe
 dlls/msacm32/tests/testlist.c
@@ -263,21 +204,16 @@ dlls/mscms/libmscms.def
 dlls/mscms/tests/*.ok
 dlls/mscms/tests/mscms_crosstest.exe
 dlls/mscms/tests/testlist.c
-dlls/mscms/version.res
 dlls/msdmo/libmsdmo.def
-dlls/msdmo/rsrc.res
 dlls/mshtml.tlb/mshtml_tlb.tlb
-dlls/mshtml.tlb/rsrc.res
 dlls/mshtml/libmshtml.def
 dlls/mshtml/nsiface.h
-dlls/mshtml/rsrc.res
 dlls/mshtml/tests/*.ok
 dlls/mshtml/tests/mshtml_crosstest.exe
 dlls/mshtml/tests/testlist.c
 dlls/msi/cond.tab.c
 dlls/msi/cond.tab.h
 dlls/msi/libmsi.def
-dlls/msi/msi.res
 dlls/msi/msiserver.h
 dlls/msi/msiserver.tlb
 dlls/msi/msiserver_i.c
@@ -287,11 +223,8 @@ dlls/msi/tests/*.ok
 dlls/msi/tests/msi_crosstest.exe
 dlls/msi/tests/testlist.c
 dlls/msimg32/libmsimg32.def
-dlls/msimtf/rsrc.res
-dlls/msrle32/rsrc.res
 dlls/msvcr71/libmsvcr71.def
 dlls/msvcrt/libmsvcrt.def
-dlls/msvcrt/rsrc.res
 dlls/msvcrt/tests/*.ok
 dlls/msvcrt/tests/msvcrt_crosstest.exe
 dlls/msvcrt/tests/testlist.c
@@ -302,16 +235,12 @@ dlls/msvcrtd/tests/*.ok
 dlls/msvcrtd/tests/msvcrtd_crosstest.exe
 dlls/msvcrtd/tests/testlist.c
 dlls/msvfw32/libmsvfw32.def
-dlls/msvfw32/rsrc.res
-dlls/msvidc32/rsrc.res
 dlls/msvideo.dll16
 dlls/mswsock/libmswsock.def
-dlls/mswsock/version.res
 dlls/msxml3/msxml3_v1.tlb
 dlls/msxml3/tests/*.ok
 dlls/msxml3/tests/msxml3_crosstest.exe
 dlls/msxml3/tests/testlist.c
-dlls/msxml3/version.res
 dlls/nddeapi/libnddeapi.def
 dlls/netapi32/libnetapi32.def
 dlls/netapi32/tests/*.ok
@@ -322,17 +251,14 @@ dlls/ntdll/libntdll.def
 dlls/ntdll/tests/*.ok
 dlls/ntdll/tests/ntdll_crosstest.exe
 dlls/ntdll/tests/testlist.c
-dlls/ntdll/version.res
 dlls/ntdsapi/libntdsapi.def
 dlls/ntdsapi/tests/*.ok
 dlls/ntdsapi/tests/ntdsapi_crosstest.exe
 dlls/ntdsapi/tests/testlist.c
 dlls/ntoskrnl.exe/libntoskrnl.exe.def
-dlls/ntprint/ntprint.res
 dlls/ntprint/tests/*.ok
 dlls/ntprint/tests/ntprint_crosstest.exe
 dlls/ntprint/tests/testlist.c
-dlls/objsel/objsel.res
 dlls/odbc32/libodbc32.def
 dlls/odbccp32/libodbccp32.def
 dlls/odbccp32/tests/*.ok
@@ -348,14 +274,11 @@ dlls/ole32/dcom.h
 dlls/ole32/irot.h
 dlls/ole32/irot_c.c
 dlls/ole32/libole32.def
-dlls/ole32/ole32res.res
 dlls/ole32/tests/*.ok
 dlls/ole32/tests/ole32_crosstest.exe
 dlls/ole32/tests/testlist.c
-dlls/ole32/version16.res
 dlls/oleacc/liboleacc.def
 dlls/oleaut32/liboleaut32.def
-dlls/oleaut32/oleaut32.res
 dlls/oleaut32/oleaut32_oaidl.h
 dlls/oleaut32/oleaut32_oaidl_p.c
 dlls/oleaut32/tests/*.ok
@@ -363,40 +286,32 @@ dlls/oleaut32/tests/oleaut32_crosstest.exe
 dlls/oleaut32/tests/test_tlb.tlb
 dlls/oleaut32/tests/testlist.c
 dlls/oleaut32/tests/tmarshal.h
-dlls/oleaut32/tests/tmarshal.res
 dlls/oleaut32/tests/tmarshal.tlb
 dlls/oleaut32/tests/tmarshal_i.c
 dlls/olecli.dll16
 dlls/olecli32/libolecli32.def
 dlls/oledlg/liboledlg.def
-dlls/oledlg/rsrc.res
 dlls/olepro32/libolepro32.def
-dlls/olepro32/version.res
 dlls/olesvr.dll16
 dlls/olesvr32/libolesvr32.def
-dlls/olethk32/version.res
 dlls/opengl32/libopengl32.def
 dlls/opengl32/tests/*.ok
 dlls/opengl32/tests/opengl32_crosstest.exe
 dlls/opengl32/tests/testlist.c
-dlls/opengl32/version.res
 dlls/pdh/libpdh.def
 dlls/pdh/tests/*.ok
 dlls/pdh/tests/pdh_crosstest.exe
 dlls/pdh/tests/testlist.c
 dlls/powrprof/libpowrprof.def
-dlls/printui/printui.res
 dlls/psapi/libpsapi.def
 dlls/psapi/tests/*.ok
 dlls/psapi/tests/psapi_crosstest.exe
 dlls/psapi/tests/testlist.c
-dlls/qcap/version.res
 dlls/qedit/tests/*.ok
 dlls/qedit/tests/qedit_crosstest.exe
 dlls/qedit/tests/testlist.c
 dlls/qmgr/qmgr_local.h
 dlls/qmgr/qmgr_local_i.c
-dlls/qmgr/rsrc.res
 dlls/qmgr/tests/*.ok
 dlls/qmgr/tests/qmgr_crosstest.exe
 dlls/qmgr/tests/testlist.c
@@ -407,7 +322,6 @@ dlls/quartz/libquartz.def
 dlls/quartz/tests/*.ok
 dlls/quartz/tests/quartz_crosstest.exe
 dlls/quartz/tests/testlist.c
-dlls/quartz/version.res
 dlls/rasapi16.dll16
 dlls/rasapi32/librasapi32.def
 dlls/resutils/libresutils.def
@@ -415,11 +329,9 @@ dlls/riched20/libriched20.def
 dlls/riched20/tests/*.ok
 dlls/riched20/tests/riched20_crosstest.exe
 dlls/riched20/tests/testlist.c
-dlls/riched20/version.res
 dlls/riched32/tests/*.ok
 dlls/riched32/tests/riched32_crosstest.exe
 dlls/riched32/tests/testlist.c
-dlls/riched32/version.res
 dlls/rpcrt4/librpcrt4.def
 dlls/rpcrt4/tests/*.ok
 dlls/rpcrt4/tests/rpcrt4_crosstest.exe
@@ -427,57 +339,44 @@ dlls/rpcrt4/tests/server.h
 dlls/rpcrt4/tests/server_c.c
 dlls/rpcrt4/tests/server_s.c
 dlls/rpcrt4/tests/testlist.c
-dlls/rpcrt4/version.res
 dlls/rsabase/tests/*.ok
 dlls/rsabase/tests/rsabase_crosstest.exe
 dlls/rsabase/tests/testlist.c
-dlls/rsabase/version.res
 dlls/rsaenh/librsaenh.def
 dlls/rsaenh/tests/*.ok
 dlls/rsaenh/tests/rsaenh_crosstest.exe
 dlls/rsaenh/tests/testlist.c
-dlls/rsaenh/version.res
-dlls/sane.ds/rsrc.res
 dlls/schannel/tests/*.ok
 dlls/schannel/tests/schannel_crosstest.exe
 dlls/schannel/tests/testlist.c
-dlls/schannel/version.res
 dlls/secur32/libsecur32.def
 dlls/secur32/tests/*.ok
 dlls/secur32/tests/secur32_crosstest.exe
 dlls/secur32/tests/testlist.c
 dlls/sensapi/libsensapi.def
 dlls/serialui/libserialui.def
-dlls/serialui/serialui_rc.res
 dlls/serialui/tests/*.ok
 dlls/serialui/tests/serialui_crosstest.exe
 dlls/serialui/tests/testlist.c
 dlls/setupapi/libsetupapi.def
-dlls/setupapi/setupapi.res
 dlls/setupapi/tests/*.ok
 dlls/setupapi/tests/setupapi_crosstest.exe
 dlls/setupapi/tests/testlist.c
 dlls/setupx.dll16
 dlls/sfc/libsfc.def
 dlls/sfc_os/libsfc_os.def
-dlls/shdoclc/rsrc.res
 dlls/shdocvw/libshdocvw.def
-dlls/shdocvw/shdocvw.res
 dlls/shdocvw/shdocvw_v1.tlb
 dlls/shdocvw/tests/*.ok
 dlls/shdocvw/tests/shdocvw_crosstest.exe
 dlls/shdocvw/tests/testlist.c
 dlls/shell.dll16
 dlls/shell32/libshell32.def
-dlls/shell32/shres.res
 dlls/shell32/tests/*.ok
 dlls/shell32/tests/shell32_crosstest.exe
 dlls/shell32/tests/testlist.c
-dlls/shell32/version16.res
 dlls/shfolder/libshfolder.def
-dlls/shfolder/version.res
 dlls/shlwapi/libshlwapi.def
-dlls/shlwapi/shlwapi.res
 dlls/shlwapi/tests/*.ok
 dlls/shlwapi/tests/shlwapi_crosstest.exe
 dlls/shlwapi/tests/testlist.c
@@ -491,9 +390,7 @@ dlls/spoolss/libspoolss.def
 dlls/spoolss/tests/*.ok
 dlls/spoolss/tests/spoolss_crosstest.exe
 dlls/spoolss/tests/testlist.c
-dlls/stdole2.tlb/rsrc.res
 dlls/stdole2.tlb/std_ole_v2.tlb
-dlls/stdole32.tlb/rsrc.res
 dlls/stdole32.tlb/std_ole_v1.tlb
 dlls/sti/libsti.def
 dlls/storage.dll16
@@ -506,18 +403,12 @@ dlls/typelib.dll16
 dlls/unicows/libunicows.def
 dlls/url/liburl.def
 dlls/urlmon/liburlmon.def
-dlls/urlmon/rsrc.res
 dlls/urlmon/tests/*.ok
 dlls/urlmon/tests/testlist.c
 dlls/urlmon/tests/urlmon_crosstest.exe
 dlls/user.exe16
 dlls/user32/libuser32.def
-dlls/user32/resources/display.res
-dlls/user32/resources/mouse.res
-dlls/user32/resources/user32.res
-dlls/user32/resources/version16.res
 dlls/user32/tests/*.ok
-dlls/user32/tests/resource.res
 dlls/user32/tests/testlist.c
 dlls/user32/tests/user32_crosstest.exe
 dlls/usp10/libusp10.def
@@ -528,15 +419,12 @@ dlls/uxtheme/libuxtheme.def
 dlls/uxtheme/tests/*.ok
 dlls/uxtheme/tests/testlist.c
 dlls/uxtheme/tests/uxtheme_crosstest.exe
-dlls/uxtheme/version.res
 dlls/vdmdbg/libvdmdbg.def
 dlls/ver.dll16
 dlls/version/libversion.def
 dlls/version/tests/*.ok
 dlls/version/tests/testlist.c
-dlls/version/tests/version.res
 dlls/version/tests/version_crosstest.exe
-dlls/version/version.res
 dlls/w32sys.dll16
 dlls/win32s16.dll16
 dlls/win87em.dll16
@@ -544,41 +432,32 @@ dlls/winaspi.dll16
 dlls/windebug.dll16
 dlls/wined3d/libwined3d.def
 dlls/winedos/libwinedos.def
-dlls/wineps.drv/rsrc.res
 dlls/wineps16.drv16
-dlls/winex11.drv/version.res
 dlls/wing.dll16
 dlls/wininet/libwininet.def
-dlls/wininet/rsrc.res
 dlls/wininet/tests/*.ok
 dlls/wininet/tests/testlist.c
 dlls/wininet/tests/wininet_crosstest.exe
-dlls/wininet/version.res
 dlls/winmm/libwinmm.def
 dlls/winmm/tests/*.ok
 dlls/winmm/tests/testlist.c
 dlls/winmm/tests/winmm_crosstest.exe
-dlls/winmm/winmm_res.res
 dlls/winnls.dll16
 dlls/winnls32/libwinnls32.def
 dlls/winoldap.mod16
 dlls/winscard/libwinscard.def
-dlls/winscard/rsrc.res
 dlls/winsock.dll16
 dlls/winspool.drv/libwinspool.def
 dlls/winspool.drv/tests/*.ok
 dlls/winspool.drv/tests/testlist.c
 dlls/winspool.drv/tests/winspool.drv_crosstest.exe
-dlls/winspool.drv/winspool.res
 dlls/wintab.dll16
 dlls/wintab32/libwintab32.def
 dlls/wintrust/libwintrust.def
 dlls/wintrust/tests/*.ok
 dlls/wintrust/tests/testlist.c
 dlls/wintrust/tests/wintrust_crosstest.exe
-dlls/wintrust/version.res
 dlls/wldap32/libwldap32.def
-dlls/wldap32/wldap32.res
 dlls/wnaspi32/libwnaspi32.def
 dlls/wow32/libwow32.def
 dlls/wprocs.dll16
@@ -586,9 +465,7 @@ dlls/ws2_32/libws2_32.def
 dlls/ws2_32/tests/*.ok
 dlls/ws2_32/tests/testlist.c
 dlls/ws2_32/tests/ws2_32_crosstest.exe
-dlls/ws2_32/version.res
 dlls/wsock32/libwsock32.def
-dlls/wsock32/version.res
 dlls/wtsapi32/libwtsapi32.def
 include/activaut.h
 include/activscp.h
@@ -675,10 +552,7 @@ loader/wine.fr.man
 loader/wine.man
 programs/Makeprog.rules
 programs/clock/clock
-programs/clock/rsrc.res
 programs/cmd/cmd
-programs/cmd/wcmdrc.res
-programs/cmdlgtst/cmdlgr.res
 programs/cmdlgtst/cmdlgtst
 programs/control/control
 programs/eject/eject
@@ -687,55 +561,38 @@ programs/explorer/explorer
 programs/hh/hh
 programs/icinfo/icinfo
 programs/iexplore/iexplore
-programs/iexplore/version.res
 programs/msiexec/msiexec
-programs/msiexec/rsrc.res
 programs/net/net
-programs/net/rsrc.res
 programs/notepad/notepad
-programs/notepad/rsrc.res
 programs/oleview/oleview
-programs/oleview/rsrc.res
 programs/progman/progman
-programs/progman/rsrc.res
 programs/regedit/regedit
-programs/regedit/rsrc.res
 programs/regsvr32/regsvr32
-programs/regsvr32/regsvr32.res
 programs/rpcss/irot.h
 programs/rpcss/irot_s.c
 programs/rpcss/rpcss
 programs/rundll32/rundll32
 programs/secedit/secedit
 programs/spoolsv/spoolsv
-programs/start/rsrc.res
 programs/start/start
 programs/svchost/svchost
 programs/taskmgr/taskmgr
-programs/taskmgr/taskmgr.res
-programs/uninstaller/rsrc.res
 programs/uninstaller/uninstaller
 programs/view/view
-programs/view/viewrc.res
 programs/wineapploader
 programs/wineboot/wineboot
-programs/wineboot/wineboot.res
 programs/winebrowser/winebrowser
 programs/winecfg/winecfg
-programs/winecfg/winecfg.res
 programs/wineconsole/wineconsole
-programs/wineconsole/wineconsole_res.res
 programs/winedbg/dbg.tab.c
 programs/winedbg/dbg.tab.h
 programs/winedbg/debug.yy.c
 programs/winedbg/winedbg
 programs/winedbg/winedbg.man
 programs/winedevice/winedevice
-programs/winefile/rsrc.res
 programs/winefile/winefile
 programs/winelauncher
 programs/winemenubuilder/winemenubuilder
-programs/winemine/rsrc.res
 programs/winemine/winemine
 programs/winepath/winepath
 programs/winetest/advapi32_test.exe
@@ -811,7 +668,6 @@ programs/winetest/usp10_test.exe
 programs/winetest/uxtheme_test.exe
 programs/winetest/version_test.exe
 programs/winetest/winetest
-programs/winetest/winetest.res
 programs/winetest/wininet_test.exe
 programs/winetest/winmm_test.exe
 programs/winetest/winspool.drv_test.exe
@@ -819,14 +675,10 @@ programs/winetest/wintrust_test.exe
 programs/winetest/ws2_32_test.exe
 programs/winevdm/winevdm
 programs/winhelp/macro.lex.yy.c
-programs/winhelp/rsrc.res
 programs/winhelp/winhelp
 programs/winver/winver
-programs/wordpad/rsrc.res
 programs/wordpad/wordpad
-programs/write/rsrc.res
 programs/write/write
-programs/xcopy/rsrc.res
 programs/xcopy/xcopy
 server/wineserver
 server/wineserver-installed
diff --git a/Make.rules.in b/Make.rules.in
index d4b6aaf450e..b224ef16fc1 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -108,7 +108,7 @@ dlldir          = @libdir@/wine
 prog_manext     = 1
 api_manext      = 3w
 conf_manext     = 5
-CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core
+CLEAN_FILES     = *.o *.a *.so *.ln *.res *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core
 
 IDL_GEN_C_SRCS  = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \
                   $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c)
@@ -116,8 +116,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=
                   $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h)
 
 CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \
-                $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \
-                $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res)
+                $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc)
 
 OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
 
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 041875f02e8..f7272881324 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -69,6 +69,7 @@ my %special_dlls =
 # Default patterns for top-level .gitignore
 my @ignores = (
     "*.[oa]",
+    "*.res",
     "*.so",
     "/autom4te.cache",
     "/config.cache",
@@ -88,8 +89,6 @@ my @ignore_srcs = (
     [ 'BISON_SRCS',   '\.y',   '.tab.h' ],
     [ 'LEX_SRCS',     '\.l',   '.yy.c' ],
     [ 'MC_SRCS',      '\.mc',  '.mc.rc' ],
-    [ 'RC_SRCS',      '\.rc',  '.res' ],
-    [ 'RC_SRCS16',    '\.rc',  '.res' ],
     [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ],
     [ 'IDL_H_SRCS',   '\.idl', '.h' ],
     [ 'IDL_C_SRCS',   '\.idl', '.h' ],