diff --git a/.gitignore b/.gitignore
index d0f13ec47e9..766d4d5125f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Automatically generated by make_makefiles; DO NOT EDIT!!
 *.[oa]
+*.ok
 *.res
 *.so
 /Make.rules
@@ -12,272 +13,52 @@
 /wine
 Makefile
 dlldata.c
+dlls/*/*.def
+dlls/*/tests/*crosstest.exe
+dlls/*/tests/testlist.c
 dlls/Makedll.rules
 dlls/Makeimplib.rules
 dlls/Maketest.rules
-dlls/activeds/libactiveds.def
 dlls/actxprxy/actxprxy_servprov.h
 dlls/actxprxy/actxprxy_servprov_i.c
 dlls/actxprxy/actxprxy_servprov_p.c
-dlls/advapi32/libadvapi32.def
 dlls/advapi32/svcctl.h
 dlls/advapi32/svcctl_c.c
-dlls/advapi32/tests/*.ok
-dlls/advapi32/tests/advapi32_crosstest.exe
-dlls/advapi32/tests/testlist.c
-dlls/advpack/libadvpack.def
-dlls/advpack/tests/*.ok
-dlls/advpack/tests/advpack_crosstest.exe
-dlls/advpack/tests/testlist.c
 dlls/atl/atliface.h
-dlls/atl/libatl.def
-dlls/avicap32/libavicap32.def
-dlls/avifil32/libavifil32.def
 dlls/avifile.dll16
-dlls/browseui/tests/*.ok
-dlls/browseui/tests/browseui_crosstest.exe
-dlls/browseui/tests/testlist.c
-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/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/comctl32/libcomctl32.def
-dlls/comctl32/tests/*.ok
-dlls/comctl32/tests/comctl32_crosstest.exe
-dlls/comctl32/tests/testlist.c
-dlls/comdlg32/libcomdlg32.def
-dlls/comdlg32/tests/*.ok
-dlls/comdlg32/tests/comdlg32_crosstest.exe
-dlls/comdlg32/tests/testlist.c
 dlls/comm.drv16
 dlls/commdlg.dll16
 dlls/compobj.dll16
-dlls/compstui/libcompstui.def
-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/libcrypt32.def
-dlls/crypt32/tests/*.ok
-dlls/crypt32/tests/crypt32_crosstest.exe
-dlls/crypt32/tests/testlist.c
-dlls/cryptdll/libcryptdll.def
-dlls/cryptnet/libcryptnet.def
-dlls/cryptnet/tests/*.ok
-dlls/cryptnet/tests/cryptnet_crosstest.exe
-dlls/cryptnet/tests/testlist.c
 dlls/ctl3d.dll16
-dlls/ctl3d32/libctl3d32.def
 dlls/ctl3dv2.dll16
-dlls/d3d8/libd3d8.def
-dlls/d3d8/tests/*.ok
-dlls/d3d8/tests/d3d8_crosstest.exe
-dlls/d3d8/tests/testlist.c
-dlls/d3d9/libd3d9.def
-dlls/d3d9/tests/*.ok
-dlls/d3d9/tests/d3d9_crosstest.exe
-dlls/d3d9/tests/testlist.c
-dlls/d3dim/libd3dim.def
-dlls/d3drm/libd3drm.def
-dlls/d3drm/tests/*.ok
-dlls/d3drm/tests/d3drm_crosstest.exe
-dlls/d3drm/tests/testlist.c
-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/d3dx9_36/tests/*.ok
-dlls/d3dx9_36/tests/d3dx9_36_crosstest.exe
-dlls/d3dx9_36/tests/testlist.c
-dlls/d3dxof/libd3dxof.def
-dlls/dbghelp/libdbghelp.def
-dlls/dciman32/libdciman32.def
 dlls/ddeml.dll16
-dlls/ddraw/libddraw.def
-dlls/ddraw/tests/*.ok
-dlls/ddraw/tests/ddraw_crosstest.exe
-dlls/ddraw/tests/testlist.c
-dlls/dinput/libdinput.def
-dlls/dinput/tests/*.ok
-dlls/dinput/tests/dinput_crosstest.exe
-dlls/dinput/tests/testlist.c
-dlls/dinput8/libdinput8.def
 dlls/dispdib.dll16
 dlls/display.drv16
-dlls/dmusic32/libdmusic32.def
-dlls/dnsapi/libdnsapi.def
-dlls/dnsapi/tests/*.ok
-dlls/dnsapi/tests/dnsapi_crosstest.exe
-dlls/dnsapi/tests/testlist.c
-dlls/dplay/libdplay.def
-dlls/dplayx/libdplayx.def
-dlls/dplayx/tests/*.ok
-dlls/dplayx/tests/dplayx_crosstest.exe
-dlls/dplayx/tests/testlist.c
-dlls/dpnet/libdpnet.def
-dlls/dsound/libdsound.def
-dlls/dsound/tests/*.ok
-dlls/dsound/tests/dsound_crosstest.exe
-dlls/dsound/tests/testlist.c
-dlls/dwmapi/libdwmapi.def
-dlls/fusion/tests/*.ok
-dlls/fusion/tests/fusion_crosstest.exe
-dlls/fusion/tests/testlist.c
 dlls/gdi.exe16
-dlls/gdi32/libgdi32.def
-dlls/gdi32/tests/*.ok
-dlls/gdi32/tests/gdi32_crosstest.exe
-dlls/gdi32/tests/testlist.c
-dlls/gdiplus/libgdiplus.def
-dlls/gdiplus/tests/*.ok
-dlls/gdiplus/tests/gdiplus_crosstest.exe
-dlls/gdiplus/tests/testlist.c
-dlls/glu32/libglu32.def
-dlls/hid/libhid.def
-dlls/hlink/libhlink.def
-dlls/hlink/tests/*.ok
-dlls/hlink/tests/hlink_crosstest.exe
-dlls/hlink/tests/testlist.c
-dlls/icmp/libicmp.def
-dlls/imagehlp/libimagehlp.def
 dlls/imm.dll16
-dlls/imm32/libimm32.def
-dlls/imm32/tests/*.ok
-dlls/imm32/tests/imm32_crosstest.exe
-dlls/imm32/tests/testlist.c
-dlls/inetcomm/libinetcomm.def
-dlls/inetcomm/tests/*.ok
-dlls/inetcomm/tests/inetcomm_crosstest.exe
-dlls/inetcomm/tests/testlist.c
-dlls/inetmib1/tests/*.ok
-dlls/inetmib1/tests/inetmib1_crosstest.exe
-dlls/inetmib1/tests/testlist.c
-dlls/infosoft/tests/*.ok
-dlls/infosoft/tests/infosoft_crosstest.exe
-dlls/infosoft/tests/testlist.c
-dlls/iphlpapi/libiphlpapi.def
-dlls/iphlpapi/tests/*.ok
-dlls/iphlpapi/tests/iphlpapi_crosstest.exe
-dlls/iphlpapi/tests/testlist.c
-dlls/itss/tests/*.ok
-dlls/itss/tests/itss_crosstest.exe
-dlls/itss/tests/testlist.c
-dlls/jscript/tests/*.ok
-dlls/jscript/tests/jscript_crosstest.exe
-dlls/jscript/tests/testlist.c
-dlls/kernel32/libkernel32.def
 dlls/kernel32/nls/winerr_deu.mc.rc
 dlls/kernel32/nls/winerr_enu.mc.rc
 dlls/kernel32/nls/winerr_fra.mc.rc
 dlls/kernel32/nls/winerr_kor.mc.rc
-dlls/kernel32/tests/*.ok
-dlls/kernel32/tests/kernel32_crosstest.exe
-dlls/kernel32/tests/testlist.c
 dlls/keyboard.drv16
 dlls/krnl386.exe16
 dlls/libd3dx9.def
 dlls/libwinspool.def
-dlls/localspl/tests/*.ok
-dlls/localspl/tests/localspl_crosstest.exe
-dlls/localspl/tests/testlist.c
-dlls/localui/tests/*.ok
-dlls/localui/tests/localui_crosstest.exe
-dlls/localui/tests/testlist.c
-dlls/lz32/liblz32.def
-dlls/lz32/tests/*.ok
-dlls/lz32/tests/lz32_crosstest.exe
-dlls/lz32/tests/testlist.c
 dlls/lzexpand.dll16
-dlls/mapi32/libmapi32.def
-dlls/mapi32/tests/*.ok
-dlls/mapi32/tests/mapi32_crosstest.exe
-dlls/mapi32/tests/testlist.c
-dlls/mlang/libmlang.def
-dlls/mlang/tests/*.ok
-dlls/mlang/tests/mlang_crosstest.exe
-dlls/mlang/tests/testlist.c
 dlls/mmsystem.dll16
 dlls/mouse.drv16
-dlls/mpr/libmpr.def
-dlls/mprapi/libmprapi.def
 dlls/msacm.dll16
-dlls/msacm32/libmsacm32.def
-dlls/msacm32/tests/*.ok
-dlls/msacm32/tests/msacm32_crosstest.exe
-dlls/msacm32/tests/testlist.c
-dlls/mscms/libmscms.def
-dlls/mscms/tests/*.ok
-dlls/mscms/tests/mscms_crosstest.exe
-dlls/mscms/tests/testlist.c
-dlls/msdmo/libmsdmo.def
 dlls/mshtml.tlb/mshtml_tlb.tlb
-dlls/mshtml/libmshtml.def
 dlls/mshtml/nsiface.h
-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/msiserver.h
 dlls/msi/msiserver.tlb
 dlls/msi/msiserver_i.c
 dlls/msi/sql.tab.c
 dlls/msi/sql.tab.h
-dlls/msi/tests/*.ok
-dlls/msi/tests/msi_crosstest.exe
-dlls/msi/tests/testlist.c
-dlls/msimg32/libmsimg32.def
-dlls/msvcr71/libmsvcr71.def
-dlls/msvcrt/libmsvcrt.def
-dlls/msvcrt/tests/*.ok
-dlls/msvcrt/tests/msvcrt_crosstest.exe
-dlls/msvcrt/tests/testlist.c
-dlls/msvcrt20/libmsvcrt20.def
-dlls/msvcrt40/libmsvcrt40.def
-dlls/msvcrtd/libmsvcrtd.def
-dlls/msvcrtd/tests/*.ok
-dlls/msvcrtd/tests/msvcrtd_crosstest.exe
-dlls/msvcrtd/tests/testlist.c
-dlls/msvfw32/libmsvfw32.def
 dlls/msvideo.dll16
-dlls/mswsock/libmswsock.def
 dlls/msxml3/msxml3_v1.tlb
-dlls/msxml3/tests/*.ok
-dlls/msxml3/tests/msxml3_crosstest.exe
-dlls/msxml3/tests/testlist.c
-dlls/nddeapi/libnddeapi.def
-dlls/netapi32/libnetapi32.def
-dlls/netapi32/tests/*.ok
-dlls/netapi32/tests/netapi32_crosstest.exe
-dlls/netapi32/tests/testlist.c
-dlls/newdev/libnewdev.def
-dlls/ntdll/libntdll.def
-dlls/ntdll/tests/*.ok
-dlls/ntdll/tests/ntdll_crosstest.exe
-dlls/ntdll/tests/testlist.c
-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/tests/*.ok
-dlls/ntprint/tests/ntprint_crosstest.exe
-dlls/ntprint/tests/testlist.c
-dlls/odbc32/libodbc32.def
-dlls/odbccp32/libodbccp32.def
-dlls/odbccp32/tests/*.ok
-dlls/odbccp32/tests/odbccp32_crosstest.exe
-dlls/odbccp32/tests/testlist.c
 dlls/ole2.dll16
 dlls/ole2conv.dll16
 dlls/ole2disp.dll16
@@ -287,205 +68,52 @@ dlls/ole2thk.dll16
 dlls/ole32/dcom.h
 dlls/ole32/irot.h
 dlls/ole32/irot_c.c
-dlls/ole32/libole32.def
-dlls/ole32/tests/*.ok
-dlls/ole32/tests/ole32_crosstest.exe
-dlls/ole32/tests/testlist.c
-dlls/oleacc/liboleacc.def
-dlls/oleaut32/liboleaut32.def
 dlls/oleaut32/oleaut32_oaidl.h
 dlls/oleaut32/oleaut32_oaidl_p.c
-dlls/oleaut32/tests/*.ok
-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.tlb
 dlls/oleaut32/tests/tmarshal_i.c
 dlls/olecli.dll16
-dlls/olecli32/libolecli32.def
-dlls/oledlg/liboledlg.def
-dlls/olepro32/libolepro32.def
 dlls/olesvr.dll16
-dlls/olesvr32/libolesvr32.def
-dlls/opengl32/libopengl32.def
-dlls/opengl32/tests/*.ok
-dlls/opengl32/tests/opengl32_crosstest.exe
-dlls/opengl32/tests/testlist.c
-dlls/pdh/libpdh.def
-dlls/pdh/tests/*.ok
-dlls/pdh/tests/pdh_crosstest.exe
-dlls/pdh/tests/testlist.c
-dlls/powrprof/libpowrprof.def
-dlls/psapi/libpsapi.def
-dlls/psapi/tests/*.ok
-dlls/psapi/tests/psapi_crosstest.exe
-dlls/psapi/tests/testlist.c
-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/tests/*.ok
-dlls/qmgr/tests/qmgr_crosstest.exe
-dlls/qmgr/tests/testlist.c
 dlls/qmgrprxy/qmgrprxy.h
 dlls/qmgrprxy/qmgrprxy_i.c
 dlls/qmgrprxy/qmgrprxy_p.c
-dlls/quartz/libquartz.def
-dlls/quartz/tests/*.ok
-dlls/quartz/tests/quartz_crosstest.exe
-dlls/quartz/tests/testlist.c
 dlls/rasapi16.dll16
-dlls/rasapi32/librasapi32.def
-dlls/resutils/libresutils.def
-dlls/riched20/libriched20.def
-dlls/riched20/tests/*.ok
-dlls/riched20/tests/riched20_crosstest.exe
-dlls/riched20/tests/testlist.c
-dlls/riched32/tests/*.ok
-dlls/riched32/tests/riched32_crosstest.exe
-dlls/riched32/tests/testlist.c
 dlls/rpcrt4/epm.h
 dlls/rpcrt4/epm_c.c
-dlls/rpcrt4/librpcrt4.def
-dlls/rpcrt4/tests/*.ok
-dlls/rpcrt4/tests/rpcrt4_crosstest.exe
 dlls/rpcrt4/tests/server.h
 dlls/rpcrt4/tests/server_c.c
 dlls/rpcrt4/tests/server_s.c
-dlls/rpcrt4/tests/testlist.c
-dlls/rsaenh/librsaenh.def
-dlls/rsaenh/tests/*.ok
-dlls/rsaenh/tests/rsaenh_crosstest.exe
-dlls/rsaenh/tests/testlist.c
-dlls/schannel/tests/*.ok
-dlls/schannel/tests/schannel_crosstest.exe
-dlls/schannel/tests/testlist.c
-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/tests/*.ok
-dlls/serialui/tests/serialui_crosstest.exe
-dlls/serialui/tests/testlist.c
-dlls/setupapi/libsetupapi.def
-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/shdocvw/libshdocvw.def
 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/tests/*.ok
-dlls/shell32/tests/shell32_crosstest.exe
-dlls/shell32/tests/testlist.c
-dlls/shfolder/libshfolder.def
-dlls/shlwapi/libshlwapi.def
-dlls/shlwapi/tests/*.ok
-dlls/shlwapi/tests/shlwapi_crosstest.exe
-dlls/shlwapi/tests/testlist.c
-dlls/slc/libslc.def
-dlls/snmpapi/libsnmpapi.def
-dlls/snmpapi/tests/*.ok
-dlls/snmpapi/tests/snmpapi_crosstest.exe
-dlls/snmpapi/tests/testlist.c
 dlls/sound.drv16
-dlls/spoolss/libspoolss.def
-dlls/spoolss/tests/*.ok
-dlls/spoolss/tests/spoolss_crosstest.exe
-dlls/spoolss/tests/testlist.c
 dlls/stdole2.tlb/std_ole_v2.tlb
 dlls/stdole32.tlb/std_ole_v1.tlb
-dlls/sti/libsti.def
 dlls/storage.dll16
 dlls/stress.dll16
 dlls/system.drv16
-dlls/tapi32/libtapi32.def
 dlls/toolhelp.dll16
 dlls/twain.dll16
 dlls/typelib.dll16
-dlls/unicows/libunicows.def
-dlls/url/liburl.def
-dlls/urlmon/liburlmon.def
-dlls/urlmon/tests/*.ok
-dlls/urlmon/tests/testlist.c
-dlls/urlmon/tests/urlmon_crosstest.exe
 dlls/user.exe16
-dlls/user32/libuser32.def
-dlls/user32/tests/*.ok
-dlls/user32/tests/testlist.c
-dlls/user32/tests/user32_crosstest.exe
-dlls/userenv/libuserenv.def
-dlls/userenv/tests/*.ok
-dlls/userenv/tests/testlist.c
-dlls/userenv/tests/userenv_crosstest.exe
-dlls/usp10/libusp10.def
-dlls/usp10/tests/*.ok
-dlls/usp10/tests/testlist.c
-dlls/usp10/tests/usp10_crosstest.exe
-dlls/uxtheme/libuxtheme.def
-dlls/uxtheme/tests/*.ok
-dlls/uxtheme/tests/testlist.c
-dlls/uxtheme/tests/uxtheme_crosstest.exe
-dlls/vdmdbg/libvdmdbg.def
 dlls/ver.dll16
-dlls/version/libversion.def
-dlls/version/tests/*.ok
-dlls/version/tests/testlist.c
-dlls/version/tests/version_crosstest.exe
 dlls/w32sys.dll16
 dlls/win32s16.dll16
 dlls/win87em.dll16
 dlls/winaspi.dll16
 dlls/windebug.dll16
-dlls/wined3d/libwined3d.def
-dlls/winedos/libwinedos.def
 dlls/wineps16.drv16
 dlls/wing.dll16
 dlls/winhelp.exe16
-dlls/winhttp/libwinhttp.def
-dlls/wininet/libwininet.def
-dlls/wininet/tests/*.ok
-dlls/wininet/tests/testlist.c
-dlls/wininet/tests/wininet_crosstest.exe
-dlls/winmm/libwinmm.def
-dlls/winmm/tests/*.ok
-dlls/winmm/tests/testlist.c
-dlls/winmm/tests/winmm_crosstest.exe
 dlls/winnls.dll16
-dlls/winnls32/libwinnls32.def
 dlls/winoldap.mod16
-dlls/winscard/libwinscard.def
 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/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/wldap32/libwldap32.def
-dlls/wnaspi32/libwnaspi32.def
-dlls/wow32/libwow32.def
 dlls/wprocs.dll16
-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/wsock32/libwsock32.def
-dlls/wtsapi32/libwtsapi32.def
 include/activaut.h
 include/activdbg.h
 include/activscp.h
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 175c127ba61..d49b2c1366b 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -68,6 +68,7 @@ my %special_dlls =
 # Default patterns for top-level .gitignore
 my @ignores = (
     "*.[oa]",
+    "*.ok",
     "*.res",
     "*.so",
     "/autom4te.cache",
@@ -78,6 +79,9 @@ my @ignores = (
     "/tags",
     "Makefile",
     "dlldata.c",
+    "dlls/*/*.def",
+    "dlls/*/tests/*crosstest.exe",
+    "dlls/*/tests/testlist.c",
     "include/config.h",
     "include/stamp-h"
 );
@@ -377,9 +381,6 @@ sub update_dlls(@)
         {
             $testdirs{$1} = "$1/tests";
             (my $crosstest = $makefile{"TESTDLL"}) =~ s/\.dll$//;
-            push @ignores, $makefile{"=dir"} . $crosstest . "_crosstest.exe";
-            push @ignores, $makefile{"=dir"} . "testlist.c";
-            push @ignores, $makefile{"=dir"} . "*.ok";
             next;
         }
 
@@ -587,10 +588,6 @@ sub update_dlls(@)
         next unless defined $altnames{$mod};
         push @ignores, map { "dlls/" . $_ . "16"; } @{$altnames{$mod}};
     }
-    foreach my $mod (sort keys %importlibs)
-    {
-        push @ignores, "dlls/$directories{$mod}/lib$importlibs{$mod}.def";
-    }
 
     return @ignores;
 }