diff --git a/dlls/.gitignore b/dlls/.gitignore
index a768d5948b4..cec394a813f 100644
--- a/dlls/.gitignore
+++ b/dlls/.gitignore
@@ -55,3 +55,117 @@
 /winsock.dll16
 /wintab.dll16
 /wprocs.dll16
+activeds/libactiveds.def
+advapi32/libadvapi32.def
+advpack/libadvpack.def
+atl/libatl.def
+avicap32/libavicap32.def
+avifil32/libavifil32.def
+cabinet/libcabinet.def
+capi2032/libcapi2032.def
+cards/libcards.def
+cfgmgr32/libcfgmgr32.def
+comctl32/libcomctl32.def
+comdlg32/libcomdlg32.def
+compstui/libcompstui.def
+crtdll/libcrtdll.def
+crypt32/libcrypt32.def
+cryptdll/libcryptdll.def
+ctl3d32/libctl3d32.def
+d3d8/libd3d8.def
+d3d9/libd3d9.def
+d3dim/libd3dim.def
+d3drm/libd3drm.def
+d3dx8/libd3dx8.def
+d3dxof/libd3dxof.def
+dbghelp/libdbghelp.def
+dciman32/libdciman32.def
+ddraw/libddraw.def
+dinput/libdinput.def
+dinput8/libdinput8.def
+dmusic32/libdmusic32.def
+dnsapi/libdnsapi.def
+dplay/libdplay.def
+dplayx/libdplayx.def
+dpnet/libdpnet.def
+dsound/libdsound.def
+gdi/libgdi32.def
+glu32/libglu32.def
+glut32/libglut32.def
+icmp/libicmp.def
+imagehlp/libimagehlp.def
+imm32/libimm32.def
+iphlpapi/libiphlpapi.def
+kernel/libkernel32.def
+lz32/liblz32.def
+mapi32/libmapi32.def
+mlang/libmlang.def
+mpr/libmpr.def
+mprapi/libmprapi.def
+msacm32/libmsacm32.def
+mscms/libmscms.def
+msdmo/libmsdmo.def
+mshtml/libmshtml.def
+msi/libmsi.def
+msimg32/libmsimg32.def
+msvcrt/libmsvcrt.def
+msvcrt20/libmsvcrt20.def
+msvcrt40/libmsvcrt40.def
+msvcrtd/libmsvcrtd.def
+msvfw32/libmsvfw32.def
+mswsock/libmswsock.def
+netapi32/libnetapi32.def
+newdev/libnewdev.def
+ntdll/libntdll.def
+ntdsapi/libntdsapi.def
+odbc32/libodbc32.def
+odbccp32/libodbccp32.def
+ole32/libole32.def
+oleacc/liboleacc.def
+oleaut32/liboleaut32.def
+olecli32/libolecli32.def
+oledlg/liboledlg.def
+olepro32/libolepro32.def
+olesvr32/libolesvr32.def
+opengl32/libopengl32.def
+powrprof/libpowrprof.def
+psapi/libpsapi.def
+quartz/libquartz.def
+rasapi32/librasapi32.def
+riched20/libriched20.def
+rpcrt4/librpcrt4.def
+rsaenh/librsaenh.def
+secur32/libsecur32.def
+sensapi/libsensapi.def
+serialui/libserialui.def
+setupapi/libsetupapi.def
+sfc/libsfc.def
+shdocvw/libshdocvw.def
+shell32/libshell32.def
+shfolder/libshfolder.def
+shlwapi/libshlwapi.def
+snmpapi/libsnmpapi.def
+sti/libsti.def
+tapi32/libtapi32.def
+unicows/libunicows.def
+url/liburl.def
+urlmon/liburlmon.def
+user/libuser32.def
+usp10/libusp10.def
+uxtheme/libuxtheme.def
+vdmdbg/libvdmdbg.def
+version/libversion.def
+wined3d/libwined3d.def
+winedos/libwinedos.def
+wininet/libwininet.def
+winmm/libwinmm.def
+winnls32/libwinnls32.def
+winspool.drv/libwinspool.def
+wintab32/libwintab32.def
+wintrust/libwintrust.def
+wldap32/libwldap32.def
+wnaspi32/libwnaspi32.def
+wow32/libwow32.def
+ws2_32/libws2_32.def
+wsock32/libwsock32.def
+wtsapi32/libwtsapi32.def
diff --git a/dlls/activeds/.gitignore b/dlls/activeds/.gitignore
deleted file mode 100644
index dbf84fba1a7..00000000000
--- a/dlls/activeds/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libactiveds.def
diff --git a/dlls/advapi32/.gitignore b/dlls/advapi32/.gitignore
deleted file mode 100644
index 5a58b2ed218..00000000000
--- a/dlls/advapi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libadvapi32.def
diff --git a/dlls/advpack/.gitignore b/dlls/advpack/.gitignore
deleted file mode 100644
index 08c996c7b75..00000000000
--- a/dlls/advpack/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libadvpack.def
diff --git a/dlls/atl/.gitignore b/dlls/atl/.gitignore
index 606894caf02..ab0753635b1 100644
--- a/dlls/atl/.gitignore
+++ b/dlls/atl/.gitignore
@@ -1,3 +1,2 @@
 /atliface.h
-/libatl.def
 /rsrc.res
diff --git a/dlls/avicap32/.gitignore b/dlls/avicap32/.gitignore
deleted file mode 100644
index 7e78cc85589..00000000000
--- a/dlls/avicap32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libavicap32.def
diff --git a/dlls/avifil32/.gitignore b/dlls/avifil32/.gitignore
index 2baa9cbce67..2a5104452f2 100644
--- a/dlls/avifil32/.gitignore
+++ b/dlls/avifil32/.gitignore
@@ -1,2 +1 @@
-/libavifil32.def
 /rsrc.res
diff --git a/dlls/cabinet/.gitignore b/dlls/cabinet/.gitignore
index ce8b8d52a2c..254b2eb0e54 100644
--- a/dlls/cabinet/.gitignore
+++ b/dlls/cabinet/.gitignore
@@ -1,2 +1 @@
 /cabinet.res
-/libcabinet.def
diff --git a/dlls/capi2032/.gitignore b/dlls/capi2032/.gitignore
deleted file mode 100644
index 1d1857ee1f2..00000000000
--- a/dlls/capi2032/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libcapi2032.def
diff --git a/dlls/cards/.gitignore b/dlls/cards/.gitignore
index bcf67894d52..a8ab8293be4 100644
--- a/dlls/cards/.gitignore
+++ b/dlls/cards/.gitignore
@@ -41,7 +41,6 @@
 /hj.bmp
 /hk.bmp
 /hq.bmp
-/libcards.def
 /s1.bmp
 /s10.bmp
 /s2.bmp
diff --git a/dlls/cfgmgr32/.gitignore b/dlls/cfgmgr32/.gitignore
deleted file mode 100644
index e116d6011f8..00000000000
--- a/dlls/cfgmgr32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libcfgmgr32.def
diff --git a/dlls/comctl32/.gitignore b/dlls/comctl32/.gitignore
index 1ce9ba43a33..9668417db16 100644
--- a/dlls/comctl32/.gitignore
+++ b/dlls/comctl32/.gitignore
@@ -13,5 +13,4 @@
 /idi_tt_info_sm.ico
 /idi_tt_warn_sm.ico
 /idt_check.bmp
-/libcomctl32.def
 /rsrc.res
diff --git a/dlls/comdlg32/.gitignore b/dlls/comdlg32/.gitignore
index d0beb9cb646..4f8c8f524e7 100644
--- a/dlls/comdlg32/.gitignore
+++ b/dlls/comdlg32/.gitignore
@@ -5,7 +5,6 @@
 /folder2.ico
 /fontpics.bmp
 /hdisk.ico
-/libcomdlg32.def
 /network.ico
 /pd32_collate.ico
 /pd32_landscape.ico
diff --git a/dlls/compstui/.gitignore b/dlls/compstui/.gitignore
deleted file mode 100644
index 8dcc51d5c01..00000000000
--- a/dlls/compstui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libcompstui.def
diff --git a/dlls/crtdll/.gitignore b/dlls/crtdll/.gitignore
deleted file mode 100644
index de227292a71..00000000000
--- a/dlls/crtdll/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libcrtdll.def
diff --git a/dlls/crypt32/.gitignore b/dlls/crypt32/.gitignore
index 2e29be1e174..baad4ccbe7a 100644
--- a/dlls/crypt32/.gitignore
+++ b/dlls/crypt32/.gitignore
@@ -1,2 +1 @@
 /crypt32.res
-/libcrypt32.def
diff --git a/dlls/cryptdll/.gitignore b/dlls/cryptdll/.gitignore
deleted file mode 100644
index 2a84b08ed6b..00000000000
--- a/dlls/cryptdll/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libcryptdll.def
diff --git a/dlls/ctl3d32/.gitignore b/dlls/ctl3d32/.gitignore
deleted file mode 100644
index 31e2b663bc3..00000000000
--- a/dlls/ctl3d32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libctl3d32.def
diff --git a/dlls/d3d8/.gitignore b/dlls/d3d8/.gitignore
index 60a5c708034..7210776c86b 100644
--- a/dlls/d3d8/.gitignore
+++ b/dlls/d3d8/.gitignore
@@ -1,2 +1 @@
-/libd3d8.def
 /version.res
diff --git a/dlls/d3d9/.gitignore b/dlls/d3d9/.gitignore
index 217d442c923..7210776c86b 100644
--- a/dlls/d3d9/.gitignore
+++ b/dlls/d3d9/.gitignore
@@ -1,2 +1 @@
-/libd3d9.def
 /version.res
diff --git a/dlls/d3dim/.gitignore b/dlls/d3dim/.gitignore
index d913c35e044..7210776c86b 100644
--- a/dlls/d3dim/.gitignore
+++ b/dlls/d3dim/.gitignore
@@ -1,2 +1 @@
-/libd3dim.def
 /version.res
diff --git a/dlls/d3drm/.gitignore b/dlls/d3drm/.gitignore
index dc2cefd77c9..7210776c86b 100644
--- a/dlls/d3drm/.gitignore
+++ b/dlls/d3drm/.gitignore
@@ -1,2 +1 @@
-/libd3drm.def
 /version.res
diff --git a/dlls/d3dx8/.gitignore b/dlls/d3dx8/.gitignore
deleted file mode 100644
index 9cbc7ffd1b4..00000000000
--- a/dlls/d3dx8/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libd3dx8.def
diff --git a/dlls/d3dxof/.gitignore b/dlls/d3dxof/.gitignore
index 086592a3ccf..7210776c86b 100644
--- a/dlls/d3dxof/.gitignore
+++ b/dlls/d3dxof/.gitignore
@@ -1,2 +1 @@
-/libd3dxof.def
 /version.res
diff --git a/dlls/dbghelp/.gitignore b/dlls/dbghelp/.gitignore
deleted file mode 100644
index dee9968c821..00000000000
--- a/dlls/dbghelp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libdbghelp.def
diff --git a/dlls/dciman32/.gitignore b/dlls/dciman32/.gitignore
deleted file mode 100644
index 5e3f1e03937..00000000000
--- a/dlls/dciman32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libdciman32.def
diff --git a/dlls/ddraw/.gitignore b/dlls/ddraw/.gitignore
index 4bde9de9774..7210776c86b 100644
--- a/dlls/ddraw/.gitignore
+++ b/dlls/ddraw/.gitignore
@@ -1,2 +1 @@
-/libddraw.def
 /version.res
diff --git a/dlls/dinput/.gitignore b/dlls/dinput/.gitignore
index 2579234cf1d..7210776c86b 100644
--- a/dlls/dinput/.gitignore
+++ b/dlls/dinput/.gitignore
@@ -1,2 +1 @@
-/libdinput.def
 /version.res
diff --git a/dlls/dinput8/.gitignore b/dlls/dinput8/.gitignore
index 936694b9e76..7210776c86b 100644
--- a/dlls/dinput8/.gitignore
+++ b/dlls/dinput8/.gitignore
@@ -1,2 +1 @@
-/libdinput8.def
 /version.res
diff --git a/dlls/dmusic32/.gitignore b/dlls/dmusic32/.gitignore
index 892b0a9844e..7210776c86b 100644
--- a/dlls/dmusic32/.gitignore
+++ b/dlls/dmusic32/.gitignore
@@ -1,2 +1 @@
-/libdmusic32.def
 /version.res
diff --git a/dlls/dnsapi/.gitignore b/dlls/dnsapi/.gitignore
deleted file mode 100644
index e2d14f0aab8..00000000000
--- a/dlls/dnsapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libdnsapi.def
diff --git a/dlls/dplay/.gitignore b/dlls/dplay/.gitignore
index 1a96eed879d..7210776c86b 100644
--- a/dlls/dplay/.gitignore
+++ b/dlls/dplay/.gitignore
@@ -1,2 +1 @@
-/libdplay.def
 /version.res
diff --git a/dlls/dplayx/.gitignore b/dlls/dplayx/.gitignore
index 98da161b812..7210776c86b 100644
--- a/dlls/dplayx/.gitignore
+++ b/dlls/dplayx/.gitignore
@@ -1,2 +1 @@
-/libdplayx.def
 /version.res
diff --git a/dlls/dpnet/.gitignore b/dlls/dpnet/.gitignore
index 8864d0cbaa2..7210776c86b 100644
--- a/dlls/dpnet/.gitignore
+++ b/dlls/dpnet/.gitignore
@@ -1,2 +1 @@
-/libdpnet.def
 /version.res
diff --git a/dlls/dsound/.gitignore b/dlls/dsound/.gitignore
index bc7935b03e5..7210776c86b 100644
--- a/dlls/dsound/.gitignore
+++ b/dlls/dsound/.gitignore
@@ -1,2 +1 @@
-/libdsound.def
 /version.res
diff --git a/dlls/gdi/.gitignore b/dlls/gdi/.gitignore
index 22e65fd5395..25c6fa11e67 100644
--- a/dlls/gdi/.gitignore
+++ b/dlls/gdi/.gitignore
@@ -1,3 +1,2 @@
-/libgdi32.def
 /version.res
 /version16.res
diff --git a/dlls/glu32/.gitignore b/dlls/glu32/.gitignore
deleted file mode 100644
index fc54ccc1359..00000000000
--- a/dlls/glu32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libglu32.def
diff --git a/dlls/glut32/.gitignore b/dlls/glut32/.gitignore
deleted file mode 100644
index 66bbdbae127..00000000000
--- a/dlls/glut32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libglut32.def
diff --git a/dlls/icmp/.gitignore b/dlls/icmp/.gitignore
deleted file mode 100644
index 18f1d823ef2..00000000000
--- a/dlls/icmp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libicmp.def
diff --git a/dlls/imagehlp/.gitignore b/dlls/imagehlp/.gitignore
deleted file mode 100644
index 5062d6464c3..00000000000
--- a/dlls/imagehlp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libimagehlp.def
diff --git a/dlls/imm32/.gitignore b/dlls/imm32/.gitignore
deleted file mode 100644
index 378138a9596..00000000000
--- a/dlls/imm32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libimm32.def
diff --git a/dlls/iphlpapi/.gitignore b/dlls/iphlpapi/.gitignore
deleted file mode 100644
index 97000c2e09c..00000000000
--- a/dlls/iphlpapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libiphlpapi.def
diff --git a/dlls/kernel/.gitignore b/dlls/kernel/.gitignore
index 708ae4371c6..8f4dc44b034 100644
--- a/dlls/kernel/.gitignore
+++ b/dlls/kernel/.gitignore
@@ -1,3 +1,2 @@
 /kernel.res
-/libkernel32.def
 /version16.res
diff --git a/dlls/lz32/.gitignore b/dlls/lz32/.gitignore
deleted file mode 100644
index f3cd5d7b060..00000000000
--- a/dlls/lz32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/liblz32.def
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 31a0fa3bebd..da0b90cbdb8 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -374,6 +374,14 @@ foreach my $mod (sort keys %directories)
     next unless defined $altnames{$mod};
     push @ignores, map { "/" . $_ . "16"; } @{$altnames{$mod}};
 }
+foreach my $mod (sort keys %importlibs)
+{
+    my $dir = $directories{$mod};
+    my $def = $mod;
+    $def =~ s/\.(dll|drv)$//;
+    push @ignores, "$dir/lib$def.def";
+}
+
 print GITIGNORE join("\n", sort @ignores) . "\n";
 
 close GITIGNORE;
diff --git a/dlls/mapi32/.gitignore b/dlls/mapi32/.gitignore
deleted file mode 100644
index c1d1dc0e7ad..00000000000
--- a/dlls/mapi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmapi32.def
diff --git a/dlls/mlang/.gitignore b/dlls/mlang/.gitignore
deleted file mode 100644
index cfbcb224833..00000000000
--- a/dlls/mlang/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmlang.def
diff --git a/dlls/mpr/.gitignore b/dlls/mpr/.gitignore
index 1e77446d8d7..4359e4fb74d 100644
--- a/dlls/mpr/.gitignore
+++ b/dlls/mpr/.gitignore
@@ -1,2 +1 @@
-/libmpr.def
 /mpr.res
diff --git a/dlls/mprapi/.gitignore b/dlls/mprapi/.gitignore
deleted file mode 100644
index 28609f1f601..00000000000
--- a/dlls/mprapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmprapi.def
diff --git a/dlls/msacm32/.gitignore b/dlls/msacm32/.gitignore
index 08d92a64501..a750df7be52 100644
--- a/dlls/msacm32/.gitignore
+++ b/dlls/msacm32/.gitignore
@@ -1,2 +1 @@
-/libmsacm32.def
 /msacm.res
diff --git a/dlls/mscms/.gitignore b/dlls/mscms/.gitignore
index 56e8ed4df26..7210776c86b 100644
--- a/dlls/mscms/.gitignore
+++ b/dlls/mscms/.gitignore
@@ -1,2 +1 @@
-/libmscms.def
 /version.res
diff --git a/dlls/msdmo/.gitignore b/dlls/msdmo/.gitignore
index b8d794db5f3..2a5104452f2 100644
--- a/dlls/msdmo/.gitignore
+++ b/dlls/msdmo/.gitignore
@@ -1,2 +1 @@
-/libmsdmo.def
 /rsrc.res
diff --git a/dlls/msftedit/.gitignore b/dlls/msftedit/.gitignore
deleted file mode 100644
index 6365ccc7d36..00000000000
--- a/dlls/msftedit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmsftedit.def
diff --git a/dlls/mshtml/.gitignore b/dlls/mshtml/.gitignore
index 17fd573ceef..ed3d6989e45 100644
--- a/dlls/mshtml/.gitignore
+++ b/dlls/mshtml/.gitignore
@@ -1,3 +1,2 @@
-/libmshtml.def
 /nsiface.h
 /rsrc.res
diff --git a/dlls/msi/.gitignore b/dlls/msi/.gitignore
index 4038039f49b..64ac6c7b3ee 100644
--- a/dlls/msi/.gitignore
+++ b/dlls/msi/.gitignore
@@ -3,7 +3,6 @@
 /instabsent.bmp
 /instadvert.bmp
 /instlocal.bmp
-/libmsi.def
 /msi.res
 /sql.tab.c
 /sql.tab.h
diff --git a/dlls/msimg32/.gitignore b/dlls/msimg32/.gitignore
deleted file mode 100644
index 2c0f7c2975b..00000000000
--- a/dlls/msimg32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmsimg32.def
diff --git a/dlls/msvcrt/.gitignore b/dlls/msvcrt/.gitignore
index 69453b958fb..2a5104452f2 100644
--- a/dlls/msvcrt/.gitignore
+++ b/dlls/msvcrt/.gitignore
@@ -1,2 +1 @@
-/libmsvcrt.def
 /rsrc.res
diff --git a/dlls/msvcrt20/.gitignore b/dlls/msvcrt20/.gitignore
deleted file mode 100644
index 035bf4dfac7..00000000000
--- a/dlls/msvcrt20/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmsvcrt20.def
diff --git a/dlls/msvcrt40/.gitignore b/dlls/msvcrt40/.gitignore
deleted file mode 100644
index 1e6571e5753..00000000000
--- a/dlls/msvcrt40/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmsvcrt40.def
diff --git a/dlls/msvcrtd/.gitignore b/dlls/msvcrtd/.gitignore
deleted file mode 100644
index dc363c1ab5e..00000000000
--- a/dlls/msvcrtd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libmsvcrtd.def
diff --git a/dlls/msvfw32/.gitignore b/dlls/msvfw32/.gitignore
index a5fbc938e48..2a5104452f2 100644
--- a/dlls/msvfw32/.gitignore
+++ b/dlls/msvfw32/.gitignore
@@ -1,2 +1 @@
-/libmsvfw32.def
 /rsrc.res
diff --git a/dlls/mswsock/.gitignore b/dlls/mswsock/.gitignore
index 494b552553f..7210776c86b 100644
--- a/dlls/mswsock/.gitignore
+++ b/dlls/mswsock/.gitignore
@@ -1,2 +1 @@
-/libmswsock.def
 /version.res
diff --git a/dlls/netapi32/.gitignore b/dlls/netapi32/.gitignore
deleted file mode 100644
index e96c9cdb2f4..00000000000
--- a/dlls/netapi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libnetapi32.def
diff --git a/dlls/newdev/.gitignore b/dlls/newdev/.gitignore
deleted file mode 100644
index a4523ac085e..00000000000
--- a/dlls/newdev/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libnewdev.def
diff --git a/dlls/ntdll/.gitignore b/dlls/ntdll/.gitignore
deleted file mode 100644
index 45482ff72b5..00000000000
--- a/dlls/ntdll/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libntdll.def
diff --git a/dlls/ntdsapi/.gitignore b/dlls/ntdsapi/.gitignore
deleted file mode 100644
index 4eae128329c..00000000000
--- a/dlls/ntdsapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libntdsapi.def
diff --git a/dlls/odbc32/.gitignore b/dlls/odbc32/.gitignore
deleted file mode 100644
index 11a4a902e01..00000000000
--- a/dlls/odbc32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libodbc32.def
diff --git a/dlls/odbccp32/.gitignore b/dlls/odbccp32/.gitignore
deleted file mode 100644
index c580a1c7811..00000000000
--- a/dlls/odbccp32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libodbccp32.def
diff --git a/dlls/ole32/.gitignore b/dlls/ole32/.gitignore
index 5d67d9df034..d18fd15b1f0 100644
--- a/dlls/ole32/.gitignore
+++ b/dlls/ole32/.gitignore
@@ -2,6 +2,5 @@
 /drag_copy.cur
 /drag_link.cur
 /drag_move.cur
-/libole32.def
 /nodrop.cur
 /ole32res.res
diff --git a/dlls/oleacc/.gitignore b/dlls/oleacc/.gitignore
deleted file mode 100644
index b4f89f70730..00000000000
--- a/dlls/oleacc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/liboleacc.def
diff --git a/dlls/oleaut32/.gitignore b/dlls/oleaut32/.gitignore
index 5e1cca5364b..1aa85d513e9 100644
--- a/dlls/oleaut32/.gitignore
+++ b/dlls/oleaut32/.gitignore
@@ -1,2 +1 @@
-/liboleaut32.def
 /oleaut32.res
diff --git a/dlls/olecli32/.gitignore b/dlls/olecli32/.gitignore
deleted file mode 100644
index a65ac3f27b1..00000000000
--- a/dlls/olecli32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libolecli32.def
diff --git a/dlls/oledlg/.gitignore b/dlls/oledlg/.gitignore
index deee295ef16..2a5104452f2 100644
--- a/dlls/oledlg/.gitignore
+++ b/dlls/oledlg/.gitignore
@@ -1,2 +1 @@
-/liboledlg.def
 /rsrc.res
diff --git a/dlls/olepro32/.gitignore b/dlls/olepro32/.gitignore
deleted file mode 100644
index bc350e39f46..00000000000
--- a/dlls/olepro32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libolepro32.def
diff --git a/dlls/olesvr32/.gitignore b/dlls/olesvr32/.gitignore
deleted file mode 100644
index 10d07700ca2..00000000000
--- a/dlls/olesvr32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libolesvr32.def
diff --git a/dlls/opengl32/.gitignore b/dlls/opengl32/.gitignore
index 9c89f1f0d8d..7210776c86b 100644
--- a/dlls/opengl32/.gitignore
+++ b/dlls/opengl32/.gitignore
@@ -1,2 +1 @@
-/libopengl32.def
 /version.res
diff --git a/dlls/powrprof/.gitignore b/dlls/powrprof/.gitignore
deleted file mode 100644
index a0f8bcf1700..00000000000
--- a/dlls/powrprof/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libpowrprof.def
diff --git a/dlls/psapi/.gitignore b/dlls/psapi/.gitignore
deleted file mode 100644
index d5370939dd7..00000000000
--- a/dlls/psapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libpsapi.def
diff --git a/dlls/quartz/.gitignore b/dlls/quartz/.gitignore
index 5af5604dd04..7210776c86b 100644
--- a/dlls/quartz/.gitignore
+++ b/dlls/quartz/.gitignore
@@ -1,2 +1 @@
-/libquartz.def
 /version.res
diff --git a/dlls/rasapi32/.gitignore b/dlls/rasapi32/.gitignore
deleted file mode 100644
index da69258aa3d..00000000000
--- a/dlls/rasapi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/librasapi32.def
diff --git a/dlls/riched20/.gitignore b/dlls/riched20/.gitignore
index b8993ed7052..7210776c86b 100644
--- a/dlls/riched20/.gitignore
+++ b/dlls/riched20/.gitignore
@@ -1,2 +1 @@
-/libriched20.def
 /version.res
diff --git a/dlls/rpcrt4/.gitignore b/dlls/rpcrt4/.gitignore
deleted file mode 100644
index 51e35cbfa3d..00000000000
--- a/dlls/rpcrt4/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/librpcrt4.def
diff --git a/dlls/rsaenh/.gitignore b/dlls/rsaenh/.gitignore
deleted file mode 100644
index f8869007333..00000000000
--- a/dlls/rsaenh/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/librsaenh.def
diff --git a/dlls/secur32/.gitignore b/dlls/secur32/.gitignore
deleted file mode 100644
index 2e626a0113f..00000000000
--- a/dlls/secur32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libsecur32.def
diff --git a/dlls/sensapi/.gitignore b/dlls/sensapi/.gitignore
deleted file mode 100644
index 98e0d245fa7..00000000000
--- a/dlls/sensapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libsensapi.def
diff --git a/dlls/serialui/.gitignore b/dlls/serialui/.gitignore
index cfa083e5da6..280e15b66ae 100644
--- a/dlls/serialui/.gitignore
+++ b/dlls/serialui/.gitignore
@@ -1,2 +1 @@
-/libserialui.def
 /serialui_rc.res
diff --git a/dlls/setupapi/.gitignore b/dlls/setupapi/.gitignore
index 6e06e3cf928..a0b127c3474 100644
--- a/dlls/setupapi/.gitignore
+++ b/dlls/setupapi/.gitignore
@@ -1,2 +1 @@
-/libsetupapi.def
 /setupapi.res
diff --git a/dlls/sfc/.gitignore b/dlls/sfc/.gitignore
deleted file mode 100644
index d50179f0414..00000000000
--- a/dlls/sfc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libsfc.def
diff --git a/dlls/shdocvw/.gitignore b/dlls/shdocvw/.gitignore
index 7a0e57dff37..e4ed4538033 100644
--- a/dlls/shdocvw/.gitignore
+++ b/dlls/shdocvw/.gitignore
@@ -1,2 +1 @@
-/libshdocvw.def
 /shdocvw.res
diff --git a/dlls/shell32/.gitignore b/dlls/shell32/.gitignore
index b40e7f288a8..bc08cb22316 100644
--- a/dlls/shell32/.gitignore
+++ b/dlls/shell32/.gitignore
@@ -7,7 +7,6 @@
 /floppy.ico
 /folder.ico
 /folder_open.ico
-/libshell32.def
 /mycomputer.ico
 /mydocs.ico
 /netdrive.ico
diff --git a/dlls/shfolder/.gitignore b/dlls/shfolder/.gitignore
deleted file mode 100644
index d4c9f48cf66..00000000000
--- a/dlls/shfolder/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libshfolder.def
diff --git a/dlls/shlwapi/.gitignore b/dlls/shlwapi/.gitignore
index 503e680641c..22ec949ffb9 100644
--- a/dlls/shlwapi/.gitignore
+++ b/dlls/shlwapi/.gitignore
@@ -1,2 +1 @@
-/libshlwapi.def
 /shlwapi.res
diff --git a/dlls/snmpapi/.gitignore b/dlls/snmpapi/.gitignore
deleted file mode 100644
index 121d13e3ef6..00000000000
--- a/dlls/snmpapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libsnmpapi.def
diff --git a/dlls/sti/.gitignore b/dlls/sti/.gitignore
deleted file mode 100644
index 52f8b54f2f5..00000000000
--- a/dlls/sti/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libsti.def
diff --git a/dlls/tapi32/.gitignore b/dlls/tapi32/.gitignore
deleted file mode 100644
index 8e07144a367..00000000000
--- a/dlls/tapi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libtapi32.def
diff --git a/dlls/unicows/.gitignore b/dlls/unicows/.gitignore
deleted file mode 100644
index f5140cdd24e..00000000000
--- a/dlls/unicows/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libunicows.def
diff --git a/dlls/url/.gitignore b/dlls/url/.gitignore
deleted file mode 100644
index bf11fb8b177..00000000000
--- a/dlls/url/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/liburl.def
diff --git a/dlls/urlmon/.gitignore b/dlls/urlmon/.gitignore
index de36c13a59b..2a5104452f2 100644
--- a/dlls/urlmon/.gitignore
+++ b/dlls/urlmon/.gitignore
@@ -1,2 +1 @@
-/liburlmon.def
 /rsrc.res
diff --git a/dlls/user/.gitignore b/dlls/user/.gitignore
deleted file mode 100644
index da50bfb6758..00000000000
--- a/dlls/user/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libuser32.def
diff --git a/dlls/usp10/.gitignore b/dlls/usp10/.gitignore
deleted file mode 100644
index 8029d931a73..00000000000
--- a/dlls/usp10/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libusp10.def
diff --git a/dlls/uxtheme/.gitignore b/dlls/uxtheme/.gitignore
index e1ae658f43e..7210776c86b 100644
--- a/dlls/uxtheme/.gitignore
+++ b/dlls/uxtheme/.gitignore
@@ -1,2 +1 @@
-/libuxtheme.def
 /version.res
diff --git a/dlls/vdmdbg/.gitignore b/dlls/vdmdbg/.gitignore
deleted file mode 100644
index 011a44bc474..00000000000
--- a/dlls/vdmdbg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libvdmdbg.def
diff --git a/dlls/version/.gitignore b/dlls/version/.gitignore
deleted file mode 100644
index 8850a6e3ef7..00000000000
--- a/dlls/version/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libversion.def
diff --git a/dlls/wined3d/.gitignore b/dlls/wined3d/.gitignore
deleted file mode 100644
index 46d37b1981a..00000000000
--- a/dlls/wined3d/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwined3d.def
diff --git a/dlls/winedos/.gitignore b/dlls/winedos/.gitignore
deleted file mode 100644
index f6c73449a19..00000000000
--- a/dlls/winedos/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwinedos.def
diff --git a/dlls/wininet/.gitignore b/dlls/wininet/.gitignore
index fb8b0a29cd6..aac8273c439 100644
--- a/dlls/wininet/.gitignore
+++ b/dlls/wininet/.gitignore
@@ -1,3 +1,2 @@
-/libwininet.def
 /rsrc.res
 /version.res
diff --git a/dlls/winmm/.gitignore b/dlls/winmm/.gitignore
index 49051d05a48..334e1d34297 100644
--- a/dlls/winmm/.gitignore
+++ b/dlls/winmm/.gitignore
@@ -1,2 +1 @@
-/libwinmm.def
 /winmm_res.res
diff --git a/dlls/winnls32/.gitignore b/dlls/winnls32/.gitignore
deleted file mode 100644
index 8686f17f4f7..00000000000
--- a/dlls/winnls32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwinnls32.def
diff --git a/dlls/winspool.drv/.gitignore b/dlls/winspool.drv/.gitignore
index b4cff094eb3..f482f36031b 100644
--- a/dlls/winspool.drv/.gitignore
+++ b/dlls/winspool.drv/.gitignore
@@ -1,2 +1 @@
-/libwinspool.def
 /winspool.res
diff --git a/dlls/wintab32/.gitignore b/dlls/wintab32/.gitignore
deleted file mode 100644
index e21fcd48edd..00000000000
--- a/dlls/wintab32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwintab32.def
diff --git a/dlls/wintrust/.gitignore b/dlls/wintrust/.gitignore
index 9c2f2a6e972..7210776c86b 100644
--- a/dlls/wintrust/.gitignore
+++ b/dlls/wintrust/.gitignore
@@ -1,2 +1 @@
-/libwintrust.def
 /version.res
diff --git a/dlls/wldap32/.gitignore b/dlls/wldap32/.gitignore
index d6fb67ed715..411d7f75854 100644
--- a/dlls/wldap32/.gitignore
+++ b/dlls/wldap32/.gitignore
@@ -1,2 +1 @@
-/libwldap32.def
 /wldap32.res
diff --git a/dlls/wnaspi32/.gitignore b/dlls/wnaspi32/.gitignore
deleted file mode 100644
index 68488680d67..00000000000
--- a/dlls/wnaspi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwnaspi32.def
diff --git a/dlls/wow32/.gitignore b/dlls/wow32/.gitignore
deleted file mode 100644
index 7a1b843d4b4..00000000000
--- a/dlls/wow32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwow32.def
diff --git a/dlls/ws2_32/.gitignore b/dlls/ws2_32/.gitignore
index 402f9da7921..7210776c86b 100644
--- a/dlls/ws2_32/.gitignore
+++ b/dlls/ws2_32/.gitignore
@@ -1,2 +1 @@
-/libws2_32.def
 /version.res
diff --git a/dlls/wsock32/.gitignore b/dlls/wsock32/.gitignore
index 2e761d5c26c..7210776c86b 100644
--- a/dlls/wsock32/.gitignore
+++ b/dlls/wsock32/.gitignore
@@ -1,2 +1 @@
-/libwsock32.def
 /version.res
diff --git a/dlls/wtsapi32/.gitignore b/dlls/wtsapi32/.gitignore
deleted file mode 100644
index 1864ea15713..00000000000
--- a/dlls/wtsapi32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libwtsapi32.def