From 9ac0fa4e4d74a5e67030fc17e7c47526ce0d5185 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Tue, 21 Oct 2008 13:51:49 +0000
Subject: [PATCH] modified   tools/rbuild/backend/mingw/modulehandler.cpp
 modified   tools/rbuild/backend/mingw/modulehandler.h modified  
 tools/rbuild/module.cpp    Split rules for .spec files as input files vs
 import libraries. .spec files can now be specified independently as <file>s
 (to generate and compile a .stubs.c file) and <importlibrary> (to generate
 and compile a .spec.def file)    .spec files are now specified in
 <importlibrary>s directly (instead of pointing to the non-existing, generated
 .spec.def file. Whose idea was that? sounds like the doing of Arch Blackmann)
    Allow multiple modules to share a single .spec file without using
 <importlibrary base="...">    Allow static libraries to use .spec files in
 <importlibrary>    Emit comments in makefile.auto so rules can be traced back
 to the code that generated them
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

deleted    lib/debugsup/debugsup-ntos.def
added      lib/debugsup/debugsup-ntos.spec
modified   lib/debugsup/debugsup.rbuild
   .def -> .spec

<<hundreds of rbuild files>>
   Remove <file> entry for spec file if there are no stubs to compile
   .spec.def -> .spec in <importlibrary> entries

Soon: making all keyboard layouts use a single .spec file
Dedicated to: Samuel Serapión, Stefan Ginsberg, and all the fellow team members who'll have an aneurysm at this commit

See issue #3746 for more details.

svn path=/trunk/; revision=36870
---
 .../kbswitch/kbsdll/kbsdll.rbuild             |   3 +-
 .../base/applications/regedit/clb/clb.rbuild  |   3 +-
 .../screensavers/3dtext/3dtext.rbuild         |   3 +-
 .../screensavers/logon/logon.rbuild           |   3 +-
 reactos/dll/cpl/access/access.rbuild          |   3 +-
 reactos/dll/cpl/console/console.rbuild        |   3 +-
 reactos/dll/cpl/hdwwiz/hdwwiz.rbuild          |   3 +-
 reactos/dll/cpl/mmsys/mmsys.rbuild            |   3 +-
 reactos/dll/directx/d3d9/d3d9.rbuild          |   3 +-
 reactos/dll/directx/devenum/devenum.rbuild    |   3 +-
 reactos/dll/directx/dinput/dinput.rbuild      |   3 +-
 reactos/dll/directx/dinput8/dinput8.rbuild    |   3 +-
 reactos/dll/directx/dplay/dplay.rbuild        |   3 +-
 reactos/dll/directx/dplayx/dplayx.rbuild      |   3 +-
 reactos/dll/directx/dsound/dsound.rbuild      |   3 +-
 reactos/dll/directx/dxdiagn/dxdiagn.rbuild    |   3 +-
 reactos/dll/directx/ksproxy/ksproxy.rbuild    |   3 +-
 reactos/dll/directx/msdmo/msdmo.rbuild        |   2 +-
 reactos/dll/directx/qedit/qedit.rbuild        |   3 +-
 reactos/dll/directx/quartz/quartz.rbuild      |   2 +-
 reactos/dll/directx/wine/d3d8/d3d8.rbuild     |   3 +-
 reactos/dll/directx/wine/d3d9/d3d9.rbuild     |   2 +-
 reactos/dll/keyboard/kbda1/kbda1.rbuild       |   3 +-
 reactos/dll/keyboard/kbda2/kbda2.rbuild       |   3 +-
 reactos/dll/keyboard/kbda3/kbda3.rbuild       |   3 +-
 reactos/dll/keyboard/kbdal/kbdal.rbuild       |   3 +-
 reactos/dll/keyboard/kbdarme/kbdarme.rbuild   |   3 +-
 reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild   |   3 +-
 reactos/dll/keyboard/kbdaze/kbdaze.rbuild     |   3 +-
 reactos/dll/keyboard/kbdazel/kbdazel.rbuild   |   3 +-
 reactos/dll/keyboard/kbdbe/kbdbe.rbuild       |   3 +-
 reactos/dll/keyboard/kbdbga/kbdbga.rbuild     |   3 +-
 reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild     |   3 +-
 reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild     |   3 +-
 reactos/dll/keyboard/kbdblr/kbdblr.rbuild     |   3 +-
 reactos/dll/keyboard/kbdbr/kbdbr.rbuild       |   3 +-
 reactos/dll/keyboard/kbdbur/kbdbur.rbuild     |   3 +-
 reactos/dll/keyboard/kbdcan/kbdcan.rbuild     |   3 +-
 reactos/dll/keyboard/kbdcr/kbdcr.rbuild       |   3 +-
 reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild     |   3 +-
 reactos/dll/keyboard/kbdda/kbdda.rbuild       |   3 +-
 reactos/dll/keyboard/kbddv/kbddv.rbuild       |   3 +-
 reactos/dll/keyboard/kbdes/kbdes.rbuild       |   3 +-
 reactos/dll/keyboard/kbdest/kbdest.rbuild     |   3 +-
 reactos/dll/keyboard/kbdfc/kbdfc.rbuild       |   3 +-
 reactos/dll/keyboard/kbdfi/kbdfi.rbuild       |   3 +-
 reactos/dll/keyboard/kbdfr/kbdfr.rbuild       |   3 +-
 reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild     |   3 +-
 reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild   |   3 +-
 reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild   |   3 +-
 reactos/dll/keyboard/kbdgr/kbdgr.rbuild       |   3 +-
 reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild |   3 +-
 reactos/dll/keyboard/kbdhe/kbdhe.rbuild       |   3 +-
 reactos/dll/keyboard/kbdheb/kbdheb.rbuild     |   3 +-
 reactos/dll/keyboard/kbdhu/kbdhu.rbuild       |   3 +-
 reactos/dll/keyboard/kbdic/kbdic.rbuild       |   3 +-
 reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild |   3 +-
 reactos/dll/keyboard/kbdinben/kbdinben.rbuild |   3 +-
 reactos/dll/keyboard/kbdindev/kbdindev.rbuild |   3 +-
 reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild |   3 +-
 reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild |   3 +-
 reactos/dll/keyboard/kbdir/kbdir.rbuild       |   3 +-
 reactos/dll/keyboard/kbdit/kbdit.rbuild       |   3 +-
 reactos/dll/keyboard/kbdja/kbdja.rbuild       |   3 +-
 reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild     |   3 +-
 reactos/dll/keyboard/kbdko/kbdko.rbuild       |   3 +-
 reactos/dll/keyboard/kbdla/kbdla.rbuild       |   3 +-
 reactos/dll/keyboard/kbdlt/kbdlt.rbuild       |   3 +-
 reactos/dll/keyboard/kbdlv/kbdlv.rbuild       |   3 +-
 reactos/dll/keyboard/kbdmac/kbdmac.rbuild     |   3 +-
 reactos/dll/keyboard/kbdne/kbdne.rbuild       |   3 +-
 reactos/dll/keyboard/kbdno/kbdno.rbuild       |   3 +-
 reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild     |   3 +-
 reactos/dll/keyboard/kbdpo/kbdpo.rbuild       |   3 +-
 reactos/dll/keyboard/kbdro/kbdro.rbuild       |   3 +-
 reactos/dll/keyboard/kbdru/kbdru.rbuild       |   3 +-
 reactos/dll/keyboard/kbdru1/kbdru1.rbuild     |   3 +-
 reactos/dll/keyboard/kbdsg/kbdsg.rbuild       |   3 +-
 reactos/dll/keyboard/kbdsk/kbdsk.rbuild       |   3 +-
 reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild     |   3 +-
 reactos/dll/keyboard/kbdsw/kbdsw.rbuild       |   3 +-
 reactos/dll/keyboard/kbdtat/kbdtat.rbuild     |   3 +-
 reactos/dll/keyboard/kbdth0/kbdth0.rbuild     |   3 +-
 reactos/dll/keyboard/kbdth1/kbdth1.rbuild     |   3 +-
 reactos/dll/keyboard/kbdth2/kbdth2.rbuild     |   3 +-
 reactos/dll/keyboard/kbdth3/kbdth3.rbuild     |   3 +-
 reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild     |   3 +-
 reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild     |   3 +-
 reactos/dll/keyboard/kbduk/kbduk.rbuild       |   3 +-
 reactos/dll/keyboard/kbdur/kbdur.rbuild       |   3 +-
 reactos/dll/keyboard/kbdurs/kbdurs.rbuild     |   3 +-
 reactos/dll/keyboard/kbdus/kbdus.rbuild       |   3 +-
 reactos/dll/keyboard/kbdusa/kbdusa.rbuild     |   3 +-
 reactos/dll/keyboard/kbdusl/kbdusl.rbuild     |   3 +-
 reactos/dll/keyboard/kbdusr/kbdusr.rbuild     |   3 +-
 reactos/dll/keyboard/kbdusx/kbdusx.rbuild     |   3 +-
 reactos/dll/keyboard/kbduzb/kbduzb.rbuild     |   3 +-
 reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild   |   3 +-
 reactos/dll/keyboard/kbdycc/kbdycc.rbuild     |   3 +-
 reactos/dll/keyboard/kbdycl/kbdycl.rbuild     |   3 +-
 reactos/dll/shellext/deskadp/deskadp.rbuild   |   3 +-
 reactos/dll/shellext/deskmon/deskmon.rbuild   |   2 +-
 reactos/dll/shellext/fontext/fontext.rbuild   |   2 +-
 reactos/dll/win32/acledit/acledit.rbuild      |   2 +-
 reactos/dll/win32/aclui/aclui.rbuild          |   2 +-
 reactos/dll/win32/advpack/advpack.rbuild      |   2 +-
 reactos/dll/win32/atl/atl.rbuild              |   2 +-
 reactos/dll/win32/avifil32/avifil32.rbuild    |   2 +-
 reactos/dll/win32/browseui/browseui.rbuild    |   2 +-
 reactos/dll/win32/cabinet/cabinet.rbuild      |   2 +-
 reactos/dll/win32/cards/cards.rbuild          |   2 +-
 reactos/dll/win32/clusapi/clusapi.rbuild      |   2 +-
 reactos/dll/win32/comcat/comcat.rbuild        |   2 +-
 reactos/dll/win32/comctl32/comctl32.rbuild    |   2 +-
 reactos/dll/win32/comdlg32/comdlg32.rbuild    |   2 +-
 reactos/dll/win32/compstui/compstui.rbuild    |   2 +-
 reactos/dll/win32/credui/credui.rbuild        |   2 +-
 reactos/dll/win32/crypt32/crypt32.rbuild      |   2 +-
 reactos/dll/win32/cryptdll/cryptdll.rbuild    |   2 +-
 reactos/dll/win32/cryptnet/cryptnet.rbuild    |   2 +-
 reactos/dll/win32/cryptui/cryptui.rbuild      |   2 +-
 reactos/dll/win32/dbghelp/dbghelp.rbuild      |   2 +-
 reactos/dll/win32/dciman32/dciman32.rbuild    |   2 +-
 reactos/dll/win32/devmgr/devmgr.rbuild        |   2 +-
 reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild    |   2 +-
 reactos/dll/win32/fusion/fusion.rbuild        |   2 +-
 reactos/dll/win32/gdiplus/gdiplus.rbuild      |   2 +-
 reactos/dll/win32/getuname/getuname.rbuild    |   2 +-
 .../dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild    |   2 +-
 reactos/dll/win32/hlink/hlink.rbuild          |   2 +-
 reactos/dll/win32/icmp/icmp.rbuild            |   2 +-
 reactos/dll/win32/imagehlp/imagehlp.rbuild    |   2 +-
 reactos/dll/win32/imm32/imm32.rbuild          |   2 +-
 reactos/dll/win32/inetcomm/inetcomm.rbuild    |   2 +-
 reactos/dll/win32/inetmib1/inetmib1.rbuild    |   2 +-
 reactos/dll/win32/iphlpapi/iphlpapi.rbuild    |   2 +-
 reactos/dll/win32/jscript/jscript.rbuild      |   2 +-
 reactos/dll/win32/lpk/lpk.rbuild              |   2 +-
 reactos/dll/win32/lz32/lz32.rbuild            |   2 +-
 reactos/dll/win32/mapi32/mapi32.rbuild        |   2 +-
 reactos/dll/win32/mlang/mlang.rbuild          |   2 +-
 reactos/dll/win32/mmdrv/mmdrv.rbuild          |   2 +-
 reactos/dll/win32/modemui/modemui.rbuild      |   2 +-
 reactos/dll/win32/mpr/mpr.rbuild              |   2 +-
 reactos/dll/win32/mprapi/mprapi.rbuild        |   2 +-
 reactos/dll/win32/msacm32/msacm32.rbuild      |   2 +-
 reactos/dll/win32/mscoree/mscoree.rbuild      |   2 +-
 reactos/dll/win32/msgina/msgina.rbuild        |   2 +-
 .../dll/win32/mshtml.tlb/mshtml.tlb.rbuild    |   2 +-
 reactos/dll/win32/mshtml/mshtml.rbuild        |   2 +-
 reactos/dll/win32/msi/msi.rbuild              |   2 +-
 reactos/dll/win32/msimg32/msimg32.rbuild      |   2 +-
 reactos/dll/win32/mstask/mstask.rbuild        |   2 +-
 reactos/dll/win32/msvcrt20/msvcrt20.rbuild    |   2 +-
 reactos/dll/win32/msvcrt40/msvcrt40.rbuild    |   2 +-
 reactos/dll/win32/msvfw32/msvfw32.rbuild      |   2 +-
 reactos/dll/win32/msxml3/msxml3.rbuild        |   2 +-
 reactos/dll/win32/nddeapi/nddeapi.rbuild      |   2 +-
 reactos/dll/win32/netapi32/netapi32.rbuild    |   2 +-
 reactos/dll/win32/netcfgx/netcfgx.rbuild      |   2 +-
 reactos/dll/win32/netid/netid.rbuild          |   2 +-
 reactos/dll/win32/netshell/netshell.rbuild    |   2 +-
 reactos/dll/win32/newdev/newdev.rbuild        |   2 +-
 reactos/dll/win32/ntdsapi/ntdsapi.rbuild      |   2 +-
 reactos/dll/win32/ntmarta/ntmarta.rbuild      |   2 +-
 reactos/dll/win32/objsel/objsel.rbuild        |   2 +-
 reactos/dll/win32/odbc32/odbc32.rbuild        |   2 +-
 reactos/dll/win32/odbccp32/odbccp32.rbuild    |   2 +-
 reactos/dll/win32/ole32/ole32.rbuild          |   2 +-
 reactos/dll/win32/oleacc/oleacc.rbuild        |   2 +-
 reactos/dll/win32/oleaut32/oleaut32.rbuild    |   2 +-
 reactos/dll/win32/oledlg/oledlg.rbuild        |   2 +-
 reactos/dll/win32/olepro32/olepro32.rbuild    |   2 +-
 reactos/dll/win32/pdh/pdh.rbuild              |   2 +-
 reactos/dll/win32/powrprof/powrprof.rbuild    |   2 +-
 reactos/dll/win32/printui/printui.rbuild      |   2 +-
 reactos/dll/win32/pstorec/pstorec.rbuild      |   2 +-
 reactos/dll/win32/rasapi32/rasapi32.rbuild    |   2 +-
 reactos/dll/win32/rasdlg/rasdlg.rbuild        |   2 +-
 reactos/dll/win32/rasman/rasman.rbuild        |   2 +-
 reactos/dll/win32/riched20/riched20.rbuild    |   2 +-
 reactos/dll/win32/riched32/riched32.rbuild    |   2 +-
 reactos/dll/win32/rpcrt4/rpcrt4.rbuild        |   2 +-
 reactos/dll/win32/rsabase/rsabase.rbuild      |   2 +-
 reactos/dll/win32/rsaenh/rsaenh.rbuild        |   2 +-
 reactos/dll/win32/samsrv/samsrv.rbuild        |   2 +-
 reactos/dll/win32/schannel/schannel.rbuild    |   2 +-
 reactos/dll/win32/sensapi/sensapi.rbuild      |   2 +-
 reactos/dll/win32/serialui/serialui.rbuild    |   2 +-
 reactos/dll/win32/setupapi/setupapi.rbuild    |   2 +-
 reactos/dll/win32/sfc/sfc.rbuild              |   2 +-
 reactos/dll/win32/sfc_os/sfc_os.rbuild        |   2 +-
 reactos/dll/win32/shdocvw/shdocvw.rbuild      |   2 +-
 reactos/dll/win32/shell32/shell32.rbuild      |   2 +-
 reactos/dll/win32/shfolder/shfolder.rbuild    |   2 +-
 reactos/dll/win32/shimgvw/shimgvw.rbuild      |   2 +-
 reactos/dll/win32/shlwapi/shlwapi.rbuild      |   2 +-
 reactos/dll/win32/snmpapi/snmpapi.rbuild      |   2 +-
 reactos/dll/win32/stdole2.tlb/stdole2.rbuild  |   2 +-
 .../dll/win32/stdole32.tlb/stdole32.rbuild    |   2 +-
 reactos/dll/win32/sxs/sxs.rbuild              |   2 +-
 reactos/dll/win32/tapi32/tapi32.rbuild        |   2 +-
 reactos/dll/win32/urlmon/urlmon.rbuild        |   2 +-
 reactos/dll/win32/usp10/usp10.rbuild          |   2 +-
 reactos/dll/win32/uxtheme/uxtheme.rbuild      |   2 +-
 reactos/dll/win32/vdmdbg/vdmdbg.rbuild        |   2 +-
 reactos/dll/win32/version/version.rbuild      |   2 +-
 reactos/dll/win32/wdmaud.drv/wdmaud.rbuild    |   2 +-
 reactos/dll/win32/winhttp/winhttp.rbuild      |   2 +-
 reactos/dll/win32/wininet/wininet.rbuild      |   2 +-
 .../dll/win32/winmm/midimap/midimap.rbuild    |   2 +-
 .../dll/win32/winmm/wavemap/wavemap.rbuild    |   2 +-
 reactos/dll/win32/winmm/winmm.rbuild          |   2 +-
 reactos/dll/win32/wintrust/wintrust.rbuild    |   2 +-
 reactos/dll/win32/wldap32/wldap32.rbuild      |   2 +-
 reactos/dll/win32/wshtcpip/wshtcpip.rbuild    |   2 +-
 reactos/dll/win32/wtsapi32/wtsapi32.rbuild    |   2 +-
 reactos/drivers/base/bootvid/bootvid.rbuild   |   2 +-
 reactos/drivers/base/kdcom/kdcom.rbuild       |   2 +-
 reactos/drivers/directx/dxapi/dxapi.rbuild    |   2 +-
 reactos/drivers/directx/dxg/dxg.rbuild        |   2 +-
 reactos/drivers/directx/dxgthk/dxgthk.rbuild  |   2 +-
 reactos/drivers/ksfilter/ks/ks.rbuild         |   2 +-
 reactos/drivers/network/tcpip/tcpip.rbuild    |   2 +-
 .../storage/class/class2/class2.rbuild        |   2 +-
 .../storage/ide/pciidex/pciidex.rbuild        |   2 +-
 .../storage/port/diskdump/diskdump.rbuild     |   2 +-
 .../drivers/storage/scsiport/scsiport.rbuild  |   2 +-
 reactos/drivers/usb/usbd/usbd.rbuild          |   2 +-
 .../video/displays/framebuf/framebuf.rbuild   |   2 +-
 .../displays/framebufacc/framebufacc.rbuild   |   2 +-
 .../drivers/video/displays/vga/vgaddi.rbuild  |   2 +-
 .../drivers/video/videoprt/videoprt.rbuild    |   2 +-
 .../wdm/audio/backpln/portcls/portcls.rbuild  |   2 +-
 .../drivers/wdm/audio/drm/drmk/drmk.rbuild    |   2 +-
 reactos/drivers/wmi/wmilib.rbuild             |   2 +-
 reactos/hal/hal/hal.rbuild                    |   2 +-
 reactos/hal/halarm/up/halup.rbuild            |   2 +-
 reactos/hal/halx86/halmp.rbuild               |   2 +-
 reactos/hal/halx86/halup.rbuild               |   2 +-
 reactos/hal/halx86/halxbox.rbuild             |   2 +-
 reactos/lib/debugsup/debugsup-ntos.def        |  11 --
 reactos/lib/debugsup/debugsup-ntos.spec       |   8 +
 reactos/lib/debugsup/debugsup.rbuild          |   4 +-
 reactos/ntoskrnl/ntoskrnl-generic.rbuild      |   2 +-
 .../rbuild/backend/mingw/modulehandler.cpp    | 168 ++++++++++++------
 .../rbuild/backend/mingw/modulehandler.h      |   2 +
 reactos/tools/rbuild/module.cpp               |   6 -
 248 files changed, 368 insertions(+), 413 deletions(-)
 delete mode 100644 reactos/lib/debugsup/debugsup-ntos.def
 create mode 100644 reactos/lib/debugsup/debugsup-ntos.spec

diff --git a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
index c84b3edc5aa..bf0ef3bb216 100644
--- a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
+++ b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
-	<importlibrary definition="kbsdll.spec.def" />
+	<importlibrary definition="kbsdll.spec" />
 	<include base="kbsdll">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
@@ -11,5 +11,4 @@
 	<library>comctl32</library>
 	<file>kbsdll.c</file>
 	<file>kbsdll.rc</file>
-	<file>kbsdll.spec</file>
 </module>
diff --git a/reactos/base/applications/regedit/clb/clb.rbuild b/reactos/base/applications/regedit/clb/clb.rbuild
index 2e8d86aa7fb..f7086619344 100644
--- a/reactos/base/applications/regedit/clb/clb.rbuild
+++ b/reactos/base/applications/regedit/clb/clb.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes">
-	<importlibrary definition="clb.spec.def" />
+	<importlibrary definition="clb.spec" />
 	<include base="clb">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
@@ -13,6 +13,5 @@
 	<library>comctl32</library>
 	<file>clb.c</file>
 	<file>clb.rc</file>
-	<file>clb.spec</file>
 	<pch>precomp.h</pch>
 </module>
diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
index 03e2f504a12..365f917ef88 100644
--- a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes">
-	<importlibrary definition="3dtext.spec.def" />
+	<importlibrary definition="3dtext.spec" />
 	<library>scrnsave</library>
 	<library>kernel32</library>
 	<library>user32</library>
@@ -13,7 +13,6 @@
 	<file>3dtext.c</file>
 	<file>settings.c</file>
 	<file>rsrc.rc</file>
-	<file>3dtext.spec</file>
 
 	<metadata description="3D text OpenGL screensaver" />
 </module>
diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild
index 32085fbd859..6176f166a94 100644
--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
-	<importlibrary definition="logon.spec.def" />
+	<importlibrary definition="logon.spec" />
 	<include base="logon">.</include>
 	<library>scrnsave</library>
 	<library>kernel32</library>
@@ -12,5 +12,4 @@
 
 	<file>logon.c</file>
 	<file>logon.rc</file>
-	<file>logon.spec</file>
 </module>
diff --git a/reactos/dll/cpl/access/access.rbuild b/reactos/dll/cpl/access/access.rbuild
index 825eef4914b..2a900952614 100644
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
-	<importlibrary definition="access.spec.def" />
+	<importlibrary definition="access.spec" />
 	<include base="access">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
@@ -18,5 +18,4 @@
 	<file>mouse.c</file>
 	<file>sound.c</file>
 	<file>access.rc</file>
-	<file>access.spec</file>
 </module>
diff --git a/reactos/dll/cpl/console/console.rbuild b/reactos/dll/cpl/console/console.rbuild
index 7fce9201d08..7531fb381d8 100644
--- a/reactos/dll/cpl/console/console.rbuild
+++ b/reactos/dll/cpl/console/console.rbuild
@@ -1,5 +1,5 @@
 <module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
-	<importlibrary definition="console.spec.def" />
+	<importlibrary definition="console.spec" />
 	<include base="console">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
@@ -13,6 +13,5 @@
 	<file>layout.c</file>
 	<file>colors.c</file>
 	<file>console.rc</file>
-	<file>console.spec</file>
 	<pch>console.h</pch>
 </module>
diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
index 628c1012c15..65a4ad19db7 100644
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes">
-	<importlibrary definition="hdwwiz.spec.def" />
+	<importlibrary definition="hdwwiz.spec" />
 	<include base="hdwwiz">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
@@ -9,5 +9,4 @@
 	<library>kernel32</library>
 	<file>hdwwiz.c</file>
 	<file>hdwwiz.rc</file>
-	<file>hdwwiz.spec</file>
 </module>
diff --git a/reactos/dll/cpl/mmsys/mmsys.rbuild b/reactos/dll/cpl/mmsys/mmsys.rbuild
index 80d234d1332..4a6ffc38ef2 100644
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes">
-	<importlibrary definition="mmsys.spec.def" />
+	<importlibrary definition="mmsys.spec" />
 	<include base="mmsys">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
@@ -21,5 +21,4 @@
 	<file>audio.c</file>
 	<file>voice.c</file>
 	<file>mmsys.rc</file>
-	<file>mmsys.spec</file>
 </module>
diff --git a/reactos/dll/directx/d3d9/d3d9.rbuild b/reactos/dll/directx/d3d9/d3d9.rbuild
index 61369d65d50..6d273c7e415 100644
--- a/reactos/dll/directx/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/d3d9/d3d9.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll" baseaddress="0x4fdd0000">
-	<importlibrary definition="d3d9.spec.def" />
+	<importlibrary definition="d3d9.spec" />
 
 	<library>advapi32</library>
 	<library>kernel32</library>
@@ -31,5 +31,4 @@
 	<file>device.c</file>
 	<file>format.c</file>
 	<file>d3d9.rc</file>
-	<file>d3d9.spec</file>
 </module>
diff --git a/reactos/dll/directx/devenum/devenum.rbuild b/reactos/dll/directx/devenum/devenum.rbuild
index 98166aa5e19..85536a2934f 100644
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="devenum.spec.def" />
+	<importlibrary definition="devenum.spec" />
 	<include base="devenum">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -25,5 +25,4 @@
 	<file>factory.c</file>
 	<file>mediacatenum.c</file>
 	<file>parsedisplayname.c</file>
-	<file>devenum.spec</file>
 </module>
diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index 9ec004c3048..9d363d5c64d 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="dinput.spec.def" />
+	<importlibrary definition="dinput.spec" />
 	<include base="dinput">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -27,5 +27,4 @@
 	<file>keyboard.c</file>
 	<file>mouse.c</file>
 	<file>regsvr.c</file>
-	<file>dinput.spec</file>
 </module>
diff --git a/reactos/dll/directx/dinput8/dinput8.rbuild b/reactos/dll/directx/dinput8/dinput8.rbuild
index 539b9273ccc..6f10621ecda 100644
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="dinput8.spec.def" />
+	<importlibrary definition="dinput8.spec" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -20,5 +20,4 @@
 	<library>dinput</library>
 	<file>version.rc</file>
 	<file>dinput8_main.c</file>
-	<file>dinput8.spec</file>
 </module>
diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 81144bac274..337fa3925bc 100644
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll" unicode="yes">
-	<importlibrary definition="dplay.spec.def" />
+	<importlibrary definition="dplay.spec" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -19,5 +19,4 @@
 	<library>dinput</library>
 	<file>version.rc</file>
 	<file>dplay_main.c</file>
-	<file>dplay.spec</file>
 </module>
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index fb4bde9eff9..be389321d33 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true" unicode="yes">
 	<!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
-	<importlibrary definition="dplayx.spec.def" />
+	<importlibrary definition="dplayx.spec" />
 	<include base="dplayx">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -28,5 +28,4 @@
 	<file>lobbysp.c</file>
 	<file>name_server.c</file>
 	<file>regsvr.c</file>
-	<file>dplayx.spec</file>
 </module>
diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 3053ec1308c..6486281a0bc 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll" allowwarnings ="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="dsound.spec.def" />
+	<importlibrary definition="dsound.spec" />
 	<include base="dsound">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -35,5 +35,4 @@
 		<file>dxroslayer.c</file>
 		<file>getguidfromstring.c</file>
 	</directory>
-	<file>dsound.spec</file>
 </module>
diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
index df69d270643..1155eba1a42 100644
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="dxdiagn.spec.def" />
+	<importlibrary definition="dxdiagn.spec" />
 	<include base="dxdiagn">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -22,5 +22,4 @@
 	<file>dxdiag_main.c</file>
 	<file>provider.c</file>
 	<file>regsvr.c</file>
-	<file>dxdiagn.spec</file>
 </module>
diff --git a/reactos/dll/directx/ksproxy/ksproxy.rbuild b/reactos/dll/directx/ksproxy/ksproxy.rbuild
index fddad2c54ea..d5b065e6509 100644
--- a/reactos/dll/directx/ksproxy/ksproxy.rbuild
+++ b/reactos/dll/directx/ksproxy/ksproxy.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true">
-	<importlibrary definition="ksproxy.spec.def" />
+	<importlibrary definition="ksproxy.spec" />
 	<include base="ksproxy">.</include>
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
@@ -11,6 +11,5 @@
 	<library>ntdll</library>
 	<file>ksproxy.c</file>
 	<file>ksproxy.rc</file>
-	<file>ksproxy.spec</file>
 </module>
 </group>
diff --git a/reactos/dll/directx/msdmo/msdmo.rbuild b/reactos/dll/directx/msdmo/msdmo.rbuild
index 57670d04ac3..a74951d3260 100644
--- a/reactos/dll/directx/msdmo/msdmo.rbuild
+++ b/reactos/dll/directx/msdmo/msdmo.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true">
-	<importlibrary definition="msdmo.spec.def" />
+	<importlibrary definition="msdmo.spec" />
 	<include base="msdmo">.</include>
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
diff --git a/reactos/dll/directx/qedit/qedit.rbuild b/reactos/dll/directx/qedit/qedit.rbuild
index 6f2363b2051..30d54b21cf1 100644
--- a/reactos/dll/directx/qedit/qedit.rbuild
+++ b/reactos/dll/directx/qedit/qedit.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true">
-	<importlibrary definition="qedit.spec.def" />
+	<importlibrary definition="qedit.spec" />
 	<include base="qedit">.</include>
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
@@ -11,6 +11,5 @@
 	<library>ntdll</library>
 	<file>qedit.c</file>
 	<file>qedit.rc</file>
-	<file>qedit.spec</file>
 </module>
 </group>
diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 831eef5b9c4..a482805d839 100644
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="quartz.spec.def" />
+	<importlibrary definition="quartz.spec" />
 	<include base="quartz">.</include>
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index 65c823288c0..fb8183949c2 100644
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true" unicode="yes">
-	<importlibrary definition="d3d8.spec.def" />
+	<importlibrary definition="d3d8.spec" />
 	<include base="d3d8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
@@ -37,5 +37,4 @@
 	<file>volume.c</file>
 	<file>volumetexture.c</file>
 	<file>version.rc</file>
-	<file>d3d8.spec</file>
 </module>
diff --git a/reactos/dll/directx/wine/d3d9/d3d9.rbuild b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
index e6a43e34ea7..5c333aafcb1 100644
--- a/reactos/dll/directx/wine/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true" unicode="yes">
-	<importlibrary definition="d3d9.spec.def" />
+	<importlibrary definition="d3d9.spec" />
 	<include base="d3d9">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/keyboard/kbda1/kbda1.rbuild b/reactos/dll/keyboard/kbda1/kbda1.rbuild
index f4535a84a1d..0786e9f0786 100644
--- a/reactos/dll/keyboard/kbda1/kbda1.rbuild
+++ b/reactos/dll/keyboard/kbda1/kbda1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda1.dll" allowwarnings="true">
-	<importlibrary definition="kbda1.spec.def" />
+	<importlibrary definition="kbda1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda1.c</file>
 	<file>kbda1.rc</file>
-	<file>kbda1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbda2/kbda2.rbuild b/reactos/dll/keyboard/kbda2/kbda2.rbuild
index 13c311dae83..b173ed16c22 100644
--- a/reactos/dll/keyboard/kbda2/kbda2.rbuild
+++ b/reactos/dll/keyboard/kbda2/kbda2.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda2.dll" allowwarnings="true">
-	<importlibrary definition="kbda2.spec.def" />
+	<importlibrary definition="kbda2.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda2.c</file>
 	<file>kbda2.rc</file>
-	<file>kbda2.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbda3/kbda3.rbuild b/reactos/dll/keyboard/kbda3/kbda3.rbuild
index b3d213c52aa..6082e66c83e 100644
--- a/reactos/dll/keyboard/kbda3/kbda3.rbuild
+++ b/reactos/dll/keyboard/kbda3/kbda3.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda3.dll" allowwarnings="true">
-	<importlibrary definition="kbda3.spec.def" />
+	<importlibrary definition="kbda3.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda3.c</file>
 	<file>kbda3.rc</file>
-	<file>kbda3.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdal/kbdal.rbuild b/reactos/dll/keyboard/kbdal/kbdal.rbuild
index e45eb3d8862..bac4abe3cfb 100644
--- a/reactos/dll/keyboard/kbdal/kbdal.rbuild
+++ b/reactos/dll/keyboard/kbdal/kbdal.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true">
-	<importlibrary definition="kbdal.spec.def" />
+	<importlibrary definition="kbdal.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdal.c</file>
 	<file>kbdal.rc</file>
-	<file>kbdal.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
index 008efd44374..fd7bdd86f0a 100644
--- a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarme" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarme.dll" allowwarnings="true">
-	<importlibrary definition="kbdarme.spec.def" />
+	<importlibrary definition="kbdarme.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdarme.c</file>
 	<file>kbdarme.rc</file>
-	<file>kbdarme.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
index 37383830f23..56df98d708f 100644
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarmw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarmw.dll" allowwarnings="true">
-	<importlibrary definition="kbdarmw.spec.def" />
+	<importlibrary definition="kbdarmw.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdarmw.c</file>
 	<file>kbdarmw.rc</file>
-	<file>kbdarmw.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
index fdeeb8af0e0..52baa9e3012 100644
--- a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
+++ b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdaze" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdaze.dll" allowwarnings="true">
-	<importlibrary definition="kbdaze.spec.def" />
+	<importlibrary definition="kbdaze.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdaze.c</file>
 	<file>kbdaze.rc</file>
-	<file>kbdaze.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
index 3011162513c..f97e3440706 100644
--- a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
+++ b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdazel" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdazel.dll" allowwarnings="true">
-	<importlibrary definition="kbdazel.spec.def" />
+	<importlibrary definition="kbdazel.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdazel.c</file>
 	<file>kbdazel.rc</file>
-	<file>kbdazel.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
index d17d60ce6ca..efca0ec41da 100644
--- a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true">
-	<importlibrary definition="kbdbe.spec.def" />
+	<importlibrary definition="kbdbe.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbe.c</file>
 	<file>kbdbe.rc</file>
-	<file>kbdbe.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
index 70aabd09dd2..5a1c4cb64a9 100644
--- a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbga" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true">
-	<importlibrary definition="kbdbga.spec.def" />
+	<importlibrary definition="kbdbga.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbga.c</file>
 	<file>kbdbga.rc</file>
-	<file>kbdbga.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
index 1bad67104e9..c6ea382c38c 100644
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgm" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true">
-	<importlibrary definition="kbdbgm.spec.def" />
+	<importlibrary definition="kbdbgm.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbgm.c</file>
 	<file>kbdbgm.rc</file>
-	<file>kbdbgm.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
index 43d911488c9..e89c17c7f03 100644
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true">
-	<importlibrary definition="kbdbgt.spec.def" />
+	<importlibrary definition="kbdbgt.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbgt.c</file>
 	<file>kbdbgt.rc</file>
-	<file>kbdbgt.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
index 51303bb3408..a912d5aca07 100644
--- a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
+++ b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdblr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdblr.dll" allowwarnings="true">
-	<importlibrary definition="kbdblr.spec.def" />
+	<importlibrary definition="kbdblr.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdblr.c</file>
 	<file>kbdblr.rc</file>
-	<file>kbdblr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
index e0a2d6d7bb2..87a8230a8ce 100644
--- a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
+++ b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbr.dll" allowwarnings="true">
-	<importlibrary definition="kbdbr.spec.def" />
+	<importlibrary definition="kbdbr.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbr.c</file>
 	<file>kbdbr.rc</file>
-	<file>kbdbr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
index 81efd760fcb..c92f791f3fb 100644
--- a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true">
-	<importlibrary definition="kbdbur.spec.def" />
+	<importlibrary definition="kbdbur.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbur.c</file>
 	<file>kbdbur.rc</file>
-	<file>kbdbur.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
index 9857e8f2f3b..0646e3142fd 100644
--- a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
+++ b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcan" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcan.dll" allowwarnings="true">
-	<importlibrary definition="kbdcan.spec.def" />
+	<importlibrary definition="kbdcan.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcan.c</file>
 	<file>kbdcan.rc</file>
-	<file>kbdcan.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
index f709a9eb03c..5c157079f9a 100644
--- a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
+++ b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcr.dll" allowwarnings="true">
-	<importlibrary definition="kbdcr.spec.def" />
+	<importlibrary definition="kbdcr.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcr.c</file>
 	<file>kbdcr.rc</file>
-	<file>kbdcr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
index c9d22a60f84..378e7f5507c 100644
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcz1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true">
-	<importlibrary definition="kbdcz1.spec.def" />
+	<importlibrary definition="kbdcz1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcz1.c</file>
 	<file>kbdcz1.rc</file>
-	<file>kbdcz1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdda/kbdda.rbuild b/reactos/dll/keyboard/kbdda/kbdda.rbuild
index b3582afa281..6e87af1f15c 100644
--- a/reactos/dll/keyboard/kbdda/kbdda.rbuild
+++ b/reactos/dll/keyboard/kbdda/kbdda.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdda" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true">
-	<importlibrary definition="kbdda.spec.def" />
+	<importlibrary definition="kbdda.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdda.c</file>
 	<file>kbdda.rc</file>
-	<file>kbdda.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbddv/kbddv.rbuild b/reactos/dll/keyboard/kbddv/kbddv.rbuild
index 89a765ca6a0..5705ccc8853 100644
--- a/reactos/dll/keyboard/kbddv/kbddv.rbuild
+++ b/reactos/dll/keyboard/kbddv/kbddv.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbddv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true">
-	<importlibrary definition="kbddv.spec.def" />
+	<importlibrary definition="kbddv.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbddv.c</file>
 	<file>kbddv.rc</file>
-	<file>kbddv.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdes/kbdes.rbuild b/reactos/dll/keyboard/kbdes/kbdes.rbuild
index 45cfdf8cd34..9f760d13c47 100644
--- a/reactos/dll/keyboard/kbdes/kbdes.rbuild
+++ b/reactos/dll/keyboard/kbdes/kbdes.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdes" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true">
-	<importlibrary definition="kbdes.spec.def" />
+	<importlibrary definition="kbdes.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdes.c</file>
 	<file>kbdes.rc</file>
-	<file>kbdes.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdest/kbdest.rbuild b/reactos/dll/keyboard/kbdest/kbdest.rbuild
index 39c3b196b6b..ce719a5e7df 100644
--- a/reactos/dll/keyboard/kbdest/kbdest.rbuild
+++ b/reactos/dll/keyboard/kbdest/kbdest.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdest" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdest.dll" allowwarnings="true">
-	<importlibrary definition="kbdest.spec.def" />
+	<importlibrary definition="kbdest.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdest.c</file>
 	<file>kbdest.rc</file>
-	<file>kbdest.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
index 7d20ce4c4b1..1bf5206b146 100644
--- a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
+++ b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfc.dll" allowwarnings="true">
-	<importlibrary definition="kbdfc.spec.def" />
+	<importlibrary definition="kbdfc.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfc.c</file>
 	<file>kbdfc.rc</file>
-	<file>kbdfc.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
index 8def34916a1..847f5e72fd3 100644
--- a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfi" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfi.dll" allowwarnings="true">
-	<importlibrary definition="kbdfi.spec.def" />
+	<importlibrary definition="kbdfi.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfi.c</file>
 	<file>kbdfi.rc</file>
-	<file>kbdfi.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
index 3b9251409c1..dd364bf3084 100644
--- a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true">
-	<importlibrary definition="kbdfr.spec.def" />
+	<importlibrary definition="kbdfr.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfr.c</file>
 	<file>kbdfr.rc</file>
-	<file>kbdfr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
index cf930f80c1b..dc0e32d67a1 100644
--- a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
+++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgeo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgeo.dll" allowwarnings="true">
-	<importlibrary definition="kbdgeo.spec.def" />
+	<importlibrary definition="kbdgeo.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgeo.c</file>
 	<file>kbdgeo.rc</file>
-	<file>kbdgeo.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
index 5f282da5e46..4ac2eab4389 100644
--- a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
+++ b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgerg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgerg.dll" allowwarnings="true">
-	<importlibrary definition="kbdgerg.spec.def" />
+	<importlibrary definition="kbdgerg.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgerg.c</file>
 	<file>kbdgerg.rc</file>
-	<file>kbdgerg.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
index 44403a40538..724ae2f1da8 100644
--- a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
+++ b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgneo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgneo.dll" allowwarnings="true">
-	<importlibrary definition="kbdgneo.spec.def" />
+	<importlibrary definition="kbdgneo.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgneo.c</file>
 	<file>kbdgneo.rc</file>
-	<file>kbdgneo.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
index d992f6ec3e7..99d000934e0 100644
--- a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
+++ b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true">
-	<importlibrary definition="kbdgr.spec.def" />
+	<importlibrary definition="kbdgr.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgr.c</file>
 	<file>kbdgr.rc</file>
-	<file>kbdgr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
index 5f228231848..f3391e13738 100644
--- a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
+++ b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgrist" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgrist.dll" allowwarnings="true">
-	<importlibrary definition="kbdgrist.spec.def" />
+	<importlibrary definition="kbdgrist.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgrist.c</file>
 	<file>kbdgrist.rc</file>
-	<file>kbdgrist.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
index 8dfa25cde1f..6bcb456c8af 100644
--- a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true">
-	<importlibrary definition="kbdhe.spec.def" />
+	<importlibrary definition="kbdhe.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdhe.c</file>
 	<file>kbdhe.rc</file>
-	<file>kbdhe.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
index f163665fc92..a4c522b72e8 100644
--- a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdheb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true">
-	<importlibrary definition="kbdheb.spec.def" />
+	<importlibrary definition="kbdheb.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdheb.c</file>
 	<file>kbdheb.rc</file>
-	<file>kbdheb.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
index 33d5a8ae5fa..037c29b5325 100644
--- a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhu" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhu.dll" allowwarnings="true">
-	<importlibrary definition="kbdhu.spec.def" />
+	<importlibrary definition="kbdhu.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdhu.c</file>
 	<file>kbdhu.rc</file>
-	<file>kbdhu.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdic/kbdic.rbuild b/reactos/dll/keyboard/kbdic/kbdic.rbuild
index ca14176da38..765fe5473bf 100644
--- a/reactos/dll/keyboard/kbdic/kbdic.rbuild
+++ b/reactos/dll/keyboard/kbdic/kbdic.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdic" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdic.dll" allowwarnings="true">
-	<importlibrary definition="kbdic.spec.def" />
+	<importlibrary definition="kbdic.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdic.c</file>
 	<file>kbdic.rc</file>
-	<file>kbdic.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
index eb093ceb3e8..62d0874588f 100644
--- a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
+++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinasa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinasa.dll" allowwarnings="true">
-	<importlibrary definition="kbdinasa.spec.def" />
+	<importlibrary definition="kbdinasa.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinasa.c</file>
 	<file>kbdinasa.rc</file>
-	<file>kbdinasa.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
index 418fbe7e0ae..3114edcbc65 100644
--- a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
+++ b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinben" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinben.dll" allowwarnings="true">
-	<importlibrary definition="kbdinben.spec.def" />
+	<importlibrary definition="kbdinben.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinben.c</file>
 	<file>kbdinben.rc</file>
-	<file>kbdinben.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
index 67c41f377f3..a413b9fea5e 100644
--- a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
+++ b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdindev" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdindev.dll" allowwarnings="true">
-	<importlibrary definition="kbdindev.spec.def" />
+	<importlibrary definition="kbdindev.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdindev.c</file>
 	<file>kbdindev.rc</file>
-	<file>kbdindev.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
index aca7a777e64..ceb9e680381 100644
--- a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
+++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinguj" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinguj.dll" allowwarnings="true">
-	<importlibrary definition="kbdinguj.spec.def" />
+	<importlibrary definition="kbdinguj.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinguj.c</file>
 	<file>kbdinguj.rc</file>
-	<file>kbdinguj.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
index 4d4f50b79fb..f18261ae53d 100644
--- a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
+++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinmal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinmal.dll" allowwarnings="true">
-	<importlibrary definition="kbdinmal.spec.def" />
+	<importlibrary definition="kbdinmal.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinmal.c</file>
 	<file>kbdinmal.rc</file>
-	<file>kbdinmal.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdir/kbdir.rbuild b/reactos/dll/keyboard/kbdir/kbdir.rbuild
index 4d35719d649..98bf4f0ed04 100644
--- a/reactos/dll/keyboard/kbdir/kbdir.rbuild
+++ b/reactos/dll/keyboard/kbdir/kbdir.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdir" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdir.dll" allowwarnings="true">
-	<importlibrary definition="kbdir.spec.def" />
+	<importlibrary definition="kbdir.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdir.c</file>
 	<file>kbdir.rc</file>
-	<file>kbdir.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdit/kbdit.rbuild b/reactos/dll/keyboard/kbdit/kbdit.rbuild
index eeca81895ee..eedfc129454 100644
--- a/reactos/dll/keyboard/kbdit/kbdit.rbuild
+++ b/reactos/dll/keyboard/kbdit/kbdit.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdit" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdit.dll" allowwarnings="true">
-	<importlibrary definition="kbdit.spec.def" />
+	<importlibrary definition="kbdit.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdit.c</file>
 	<file>kbdit.rc</file>
-	<file>kbdit.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdja/kbdja.rbuild b/reactos/dll/keyboard/kbdja/kbdja.rbuild
index 3453ab78d76..1ab11a9d104 100644
--- a/reactos/dll/keyboard/kbdja/kbdja.rbuild
+++ b/reactos/dll/keyboard/kbdja/kbdja.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdja" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdja.dll" allowwarnings="true">
-	<importlibrary definition="kbdja.spec.def" />
+	<importlibrary definition="kbdja.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdja.c</file>
 	<file>kbdja.rc</file>
-	<file>kbdja.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
index 646a0738040..9e1754efa2b 100644
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdkaz" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdkaz.dll" allowwarnings="true">
-	<importlibrary definition="kbdkaz.spec.def" />
+	<importlibrary definition="kbdkaz.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdkaz.c</file>
 	<file>kbdkaz.rc</file>
-	<file>kbdkaz.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdko/kbdko.rbuild b/reactos/dll/keyboard/kbdko/kbdko.rbuild
index f6ad227e060..952be1f2718 100644
--- a/reactos/dll/keyboard/kbdko/kbdko.rbuild
+++ b/reactos/dll/keyboard/kbdko/kbdko.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdko" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdko.dll" allowwarnings="true">
-	<importlibrary definition="kbdko.spec.def" />
+	<importlibrary definition="kbdko.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdko.c</file>
 	<file>kbdko.rc</file>
-	<file>kbdko.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdla/kbdla.rbuild b/reactos/dll/keyboard/kbdla/kbdla.rbuild
index f6eff54f57c..80a223ae50c 100644
--- a/reactos/dll/keyboard/kbdla/kbdla.rbuild
+++ b/reactos/dll/keyboard/kbdla/kbdla.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdla" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdla.dll" allowwarnings="true">
-	<importlibrary definition="kbdla.spec.def" />
+	<importlibrary definition="kbdla.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdla.c</file>
 	<file>kbdla.rc</file>
-	<file>kbdla.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
index 682e2fcb547..7bf85785bff 100644
--- a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlt.dll" allowwarnings="true">
-	<importlibrary definition="kbdlt.spec.def" />
+	<importlibrary definition="kbdlt.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdlt.c</file>
 	<file>kbdlt.rc</file>
-	<file>kbdlt.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
index 9d099e8dc9f..779582a315c 100644
--- a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
+++ b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlv.dll" allowwarnings="true">
-	<importlibrary definition="kbdlv.spec.def" />
+	<importlibrary definition="kbdlv.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdlv.c</file>
 	<file>kbdlv.rc</file>
-	<file>kbdlv.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
index ed855b1ed3c..dde788de457 100644
--- a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
+++ b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdmac" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdmac.dll" allowwarnings="true">
-	<importlibrary definition="kbdmac.spec.def" />
+	<importlibrary definition="kbdmac.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdmac.c</file>
 	<file>kbdmac.rc</file>
-	<file>kbdmac.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdne/kbdne.rbuild b/reactos/dll/keyboard/kbdne/kbdne.rbuild
index 926c5b01d61..448491cddab 100644
--- a/reactos/dll/keyboard/kbdne/kbdne.rbuild
+++ b/reactos/dll/keyboard/kbdne/kbdne.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdne" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdne.dll" allowwarnings="true">
-	<importlibrary definition="kbdne.spec.def" />
+	<importlibrary definition="kbdne.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdne.c</file>
 	<file>kbdne.rc</file>
-	<file>kbdne.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdno/kbdno.rbuild b/reactos/dll/keyboard/kbdno/kbdno.rbuild
index 8c53f1afb43..65696b4402d 100644
--- a/reactos/dll/keyboard/kbdno/kbdno.rbuild
+++ b/reactos/dll/keyboard/kbdno/kbdno.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdno" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true">
-	<importlibrary definition="kbdno.spec.def" />
+	<importlibrary definition="kbdno.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdno.c</file>
 	<file>kbdno.rc</file>
-	<file>kbdno.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
index c67bec16713..a39be73c83a 100644
--- a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
+++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true">
-	<importlibrary definition="kbdpl1.spec.def" />
+	<importlibrary definition="kbdpl1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdpl1.c</file>
 	<file>kbdpl1.rc</file>
-	<file>kbdpl1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
index 2610aff858f..f5dc73a3d4f 100644
--- a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpo.dll" allowwarnings="true">
-	<importlibrary definition="kbdpo.spec.def" />
+	<importlibrary definition="kbdpo.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdpo.c</file>
 	<file>kbdpo.rc</file>
-	<file>kbdpo.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdro/kbdro.rbuild b/reactos/dll/keyboard/kbdro/kbdro.rbuild
index 15fee3807ef..84f2718c80d 100644
--- a/reactos/dll/keyboard/kbdro/kbdro.rbuild
+++ b/reactos/dll/keyboard/kbdro/kbdro.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdro" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true">
-	<importlibrary definition="kbdro.spec.def" />
+	<importlibrary definition="kbdro.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdro.c</file>
 	<file>kbdro.rc</file>
-	<file>kbdro.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdru/kbdru.rbuild b/reactos/dll/keyboard/kbdru/kbdru.rbuild
index 7d84ce5d932..a446920cf37 100644
--- a/reactos/dll/keyboard/kbdru/kbdru.rbuild
+++ b/reactos/dll/keyboard/kbdru/kbdru.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true">
-	<importlibrary definition="kbdru.spec.def" />
+	<importlibrary definition="kbdru.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdru.c</file>
 	<file>kbdru.rc</file>
-	<file>kbdru.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
index 104e57ba165..fe413e17238 100644
--- a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
+++ b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true">
-	<importlibrary definition="kbdru1.spec.def" />
+	<importlibrary definition="kbdru1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdru1.c</file>
 	<file>kbdru1.rc</file>
-	<file>kbdru1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
index dfb5dcabe71..0a883c31bf5 100644
--- a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
+++ b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true">
-	<importlibrary definition="kbdsg.spec.def" />
+	<importlibrary definition="kbdsg.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsg.c</file>
 	<file>kbdsg.rc</file>
-	<file>kbdsg.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
index db0938767a2..e2ee24e52a1 100644
--- a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true">
-	<importlibrary definition="kbdsk.spec.def" />
+	<importlibrary definition="kbdsk.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsk.c</file>
 	<file>kbdsk.rc</file>
-	<file>kbdsk.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
index e639566fd9c..7f15ccddcb4 100644
--- a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
+++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true">
-	<importlibrary definition="kbdsk1.spec.def" />
+	<importlibrary definition="kbdsk1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsk1.c</file>
 	<file>kbdsk1.rc</file>
-	<file>kbdsk1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
index 70733e95c0a..32cf47df585 100644
--- a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true">
-	<importlibrary definition="kbdsw.spec.def" />
+	<importlibrary definition="kbdsw.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsw.c</file>
 	<file>kbdsw.rc</file>
-	<file>kbdsw.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
index b158a4bed4d..ddffed3fad0 100644
--- a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
+++ b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtat" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true">
-	<importlibrary definition="kbdtat.spec.def" />
+	<importlibrary definition="kbdtat.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdtat.c</file>
 	<file>kbdtat.rc</file>
-	<file>kbdtat.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
index 57dac75db54..2083fbf53b1 100644
--- a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
+++ b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth0" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth0.dll" allowwarnings="true">
-	<importlibrary definition="kbdth0.spec.def" />
+	<importlibrary definition="kbdth0.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth0.c</file>
 	<file>kbdth0.rc</file>
-	<file>kbdth0.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
index 918ccaef910..ff027cf46cb 100644
--- a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
+++ b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth1.dll" allowwarnings="true">
-	<importlibrary definition="kbdth1.spec.def" />
+	<importlibrary definition="kbdth1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth1.c</file>
 	<file>kbdth1.rc</file>
-	<file>kbdth1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
index 23028cde79c..986a062abec 100644
--- a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true">
-	<importlibrary definition="kbdth2.spec.def" />
+	<importlibrary definition="kbdth2.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth2.c</file>
 	<file>kbdth2.rc</file>
-	<file>kbdth2.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
index 8d4599d7fbf..9cd3614ce5f 100644
--- a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
+++ b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth3.dll" allowwarnings="true">
-	<importlibrary definition="kbdth3.spec.def" />
+	<importlibrary definition="kbdth3.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth3.c</file>
 	<file>kbdth3.rc</file>
-	<file>kbdth3.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
index 5b0064c6adf..ba720c1f13f 100644
--- a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
+++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuf" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true">
-	<importlibrary definition="kbdtuf.spec.def" />
+	<importlibrary definition="kbdtuf.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdtuf.c</file>
 	<file>kbdtuf.rc</file>
-	<file>kbdtuf.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
index 1cc516fcce8..501ef71db18 100644
--- a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
+++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuq" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true">
-	<importlibrary definition="kbdtuq.spec.def" />
+	<importlibrary definition="kbdtuq.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdtuq.c</file>
 	<file>kbdtuq.rc</file>
-	<file>kbdtuq.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbduk/kbduk.rbuild b/reactos/dll/keyboard/kbduk/kbduk.rbuild
index 50cc9b84b18..a0eadb44a6f 100644
--- a/reactos/dll/keyboard/kbduk/kbduk.rbuild
+++ b/reactos/dll/keyboard/kbduk/kbduk.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true">
-	<importlibrary definition="kbduk.spec.def" />
+	<importlibrary definition="kbduk.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbduk.c</file>
 	<file>kbduk.rc</file>
-	<file>kbduk.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdur/kbdur.rbuild b/reactos/dll/keyboard/kbdur/kbdur.rbuild
index c38ab572c03..bc4e4a39dee 100644
--- a/reactos/dll/keyboard/kbdur/kbdur.rbuild
+++ b/reactos/dll/keyboard/kbdur/kbdur.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true">
-	<importlibrary definition="kbdur.spec.def" />
+	<importlibrary definition="kbdur.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdur.c</file>
 	<file>kbdur.rc</file>
-	<file>kbdur.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
index 91c94bdb1ef..069e3ee707e 100644
--- a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
+++ b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdurs" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true">
-	<importlibrary definition="kbdurs.spec.def" />
+	<importlibrary definition="kbdurs.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdurs.c</file>
 	<file>kbdurs.rc</file>
-	<file>kbdurs.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdus/kbdus.rbuild b/reactos/dll/keyboard/kbdus/kbdus.rbuild
index 42c7ca0e090..adb0126939c 100644
--- a/reactos/dll/keyboard/kbdus/kbdus.rbuild
+++ b/reactos/dll/keyboard/kbdus/kbdus.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdus" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true">
-	<importlibrary definition="kbdus.spec.def" />
+	<importlibrary definition="kbdus.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdus.c</file>
 	<file>kbdus.rc</file>
-	<file>kbdus.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
index c9dc1b90799..b3b451427c4 100644
--- a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
+++ b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusa.dll" allowwarnings="true">
-	<importlibrary definition="kbdusa.spec.def" />
+	<importlibrary definition="kbdusa.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusa.c</file>
 	<file>kbdusa.rc</file>
-	<file>kbdusa.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
index 80de56da78a..a93f20d8e1d 100644
--- a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
+++ b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true">
-	<importlibrary definition="kbdusl.spec.def" />
+	<importlibrary definition="kbdusl.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusl.c</file>
 	<file>kbdusl.rc</file>
-	<file>kbdusl.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
index 3fa2412a282..68a04241eaa 100644
--- a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
+++ b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true">
-	<importlibrary definition="kbdusr.spec.def" />
+	<importlibrary definition="kbdusr.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusr.c</file>
 	<file>kbdusr.rc</file>
-	<file>kbdusr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
index c2eb6e9bece..e6e5df680d9 100644
--- a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
+++ b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusx" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true">
-	<importlibrary definition="kbdusx.spec.def" />
+	<importlibrary definition="kbdusx.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusx.c</file>
 	<file>kbdusx.rc</file>
-	<file>kbdusx.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
index cf995a05315..da804ac5ec9 100644
--- a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
+++ b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduzb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true">
-	<importlibrary definition="kbduzb.spec.def" />
+	<importlibrary definition="kbduzb.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbduzb.c</file>
 	<file>kbduzb.rc</file>
-	<file>kbduzb.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
index 472e3f9ce11..b3b07712b88 100644
--- a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
+++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdvntc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true">
-	<importlibrary definition="kbdvntc.spec.def" />
+	<importlibrary definition="kbdvntc.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdvntc.c</file>
 	<file>kbdvntc.rc</file>
-	<file>kbdvntc.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
index bc81aa50ea5..18eba58c332 100644
--- a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
+++ b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true">
-	<importlibrary definition="kbdycc.spec.def" />
+	<importlibrary definition="kbdycc.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdycc.c</file>
 	<file>kbdycc.rc</file>
-	<file>kbdycc.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
index 4da9d79adb4..eff20bb5603 100644
--- a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
+++ b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true">
-	<importlibrary definition="kbdycl.spec.def" />
+	<importlibrary definition="kbdycl.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdycl.c</file>
 	<file>kbdycl.rc</file>
-	<file>kbdycl.spec</file>
 </module>
diff --git a/reactos/dll/shellext/deskadp/deskadp.rbuild b/reactos/dll/shellext/deskadp/deskadp.rbuild
index 7a3d3c23c30..30e5a44129d 100644
--- a/reactos/dll/shellext/deskadp/deskadp.rbuild
+++ b/reactos/dll/shellext/deskadp/deskadp.rbuild
@@ -1,5 +1,5 @@
 <module name="deskadp" type="win32dll" baseaddress="${BASEADDRESS_DESKADP}" installbase="system32" installname="deskadp.dll" unicode="yes">
-	<importlibrary definition="deskadp.spec.def" />
+	<importlibrary definition="deskadp.spec" />
 	<include base="deskadp">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
@@ -15,6 +15,5 @@
 	<file>deskadp.c</file>
 	<file>shxiface.c</file>
 	<file>deskadp.rc</file>
-	<file>deskadp.spec</file>
 	<pch>precomp.h</pch>
 </module>
diff --git a/reactos/dll/shellext/deskmon/deskmon.rbuild b/reactos/dll/shellext/deskmon/deskmon.rbuild
index 443df5546fa..63d237b6a19 100644
--- a/reactos/dll/shellext/deskmon/deskmon.rbuild
+++ b/reactos/dll/shellext/deskmon/deskmon.rbuild
@@ -1,5 +1,5 @@
 <module name="deskmon" type="win32dll" baseaddress="${BASEADDRESS_DESKMON}" installbase="system32" installname="deskmon.dll" unicode="yes">
-	<importlibrary definition="deskmon.spec.def" />
+	<importlibrary definition="deskmon.spec" />
 	<include base="deskmon">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
diff --git a/reactos/dll/shellext/fontext/fontext.rbuild b/reactos/dll/shellext/fontext/fontext.rbuild
index 7986fee6620..d27e1e47853 100644
--- a/reactos/dll/shellext/fontext/fontext.rbuild
+++ b/reactos/dll/shellext/fontext/fontext.rbuild
@@ -1,5 +1,5 @@
 <module name="fontext" type="win32dll" baseaddress="${BASEADDRESS_FONTEXT}" installbase="system32" installname="fontext.dll" unicode="yes">
-	<importlibrary definition="fontext.spec.def" />
+	<importlibrary definition="fontext.spec" />
 	<include base="fontext">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index cad5f42e0aa..047b0aceea9 100644
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -1,5 +1,5 @@
 <module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll" unicode="yes">
-	<importlibrary definition="acledit.spec.def" />
+	<importlibrary definition="acledit.spec" />
 	<include base="acledit">.</include>
 
 	<metadata description = "Access Control List Editor" />
diff --git a/reactos/dll/win32/aclui/aclui.rbuild b/reactos/dll/win32/aclui/aclui.rbuild
index 5dd969b4fe3..ecbffd50a63 100644
--- a/reactos/dll/win32/aclui/aclui.rbuild
+++ b/reactos/dll/win32/aclui/aclui.rbuild
@@ -1,5 +1,5 @@
 <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" unicode="yes">
-	<importlibrary definition="aclui.spec.def" />
+	<importlibrary definition="aclui.spec" />
 	<include base="aclui">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
diff --git a/reactos/dll/win32/advpack/advpack.rbuild b/reactos/dll/win32/advpack/advpack.rbuild
index de904cbb218..b0a4a121719 100644
--- a/reactos/dll/win32/advpack/advpack.rbuild
+++ b/reactos/dll/win32/advpack/advpack.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}" installbase="system32" installname="advpack.dll" allowwarnings="true">
-	<importlibrary definition="advpack.spec.def" />
+	<importlibrary definition="advpack.spec" />
 	<include base="advpack">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/atl/atl.rbuild b/reactos/dll/win32/atl/atl.rbuild
index eed64fffb52..cdbfa23cd10 100644
--- a/reactos/dll/win32/atl/atl.rbuild
+++ b/reactos/dll/win32/atl/atl.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="atl.spec.def" />
+	<importlibrary definition="atl.spec" />
 	<include base="atl">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index 854672b482c..e5a053d824d 100644
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="avifil32.spec.def" />
+	<importlibrary definition="avifil32.spec" />
 	<include base="avifil32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/browseui/browseui.rbuild b/reactos/dll/win32/browseui/browseui.rbuild
index 671f9ccfa33..2c19c0dd57a 100644
--- a/reactos/dll/win32/browseui/browseui.rbuild
+++ b/reactos/dll/win32/browseui/browseui.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="browseui" type="win32dll" baseaddress="${BASEADDRESS_BROWSEUI}" installbase="system32" installname="browseui.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="browseui.spec.def" />
+	<importlibrary definition="browseui.spec" />
 	<include base="browseui">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="explorer_new">.</include>
diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild
index f8e369dcfdf..20a6ca889a1 100644
--- a/reactos/dll/win32/cabinet/cabinet.rbuild
+++ b/reactos/dll/win32/cabinet/cabinet.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true" entrypoint="0">
-	<importlibrary definition="cabinet.spec.def" />
+	<importlibrary definition="cabinet.spec" />
 	<include base="cabinet">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild
index ace4c0c4a7c..065b1e17fa1 100644
--- a/reactos/dll/win32/cards/cards.rbuild
+++ b/reactos/dll/win32/cards/cards.rbuild
@@ -1,5 +1,5 @@
 <module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll" unicode="yes">
-	<importlibrary definition="cards.spec.def" />
+	<importlibrary definition="cards.spec" />
 	<include base="cards">.</include>
 
 	<!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
diff --git a/reactos/dll/win32/clusapi/clusapi.rbuild b/reactos/dll/win32/clusapi/clusapi.rbuild
index 410acc5dc57..1ea58a0c870 100644
--- a/reactos/dll/win32/clusapi/clusapi.rbuild
+++ b/reactos/dll/win32/clusapi/clusapi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="clusapi" type="win32dll" baseaddress="${BASEADDRESS_CLUSAPI}" installbase="system32" installname="clusapi.dll" allowwarnings="true">
-	<importlibrary definition="clusapi.spec.def" />
+	<importlibrary definition="clusapi.spec" />
 	<include base="clusapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/comcat/comcat.rbuild b/reactos/dll/win32/comcat/comcat.rbuild
index d9c2fb76d6a..551b99d1010 100644
--- a/reactos/dll/win32/comcat/comcat.rbuild
+++ b/reactos/dll/win32/comcat/comcat.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="comcat.spec.def" />
+	<importlibrary definition="comcat.spec" />
 	<include base="comcat">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index 95259d9bb07..b55934b6fa6 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllInstall" />
-	<importlibrary definition="comctl32.spec.def" />
+	<importlibrary definition="comctl32.spec" />
 	<include base="comctl32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index bce7564e654..57e7c2244d3 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true">
-	<importlibrary definition="comdlg32.spec.def" />
+	<importlibrary definition="comdlg32.spec" />
 	<include base="comdlg32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/compstui/compstui.rbuild b/reactos/dll/win32/compstui/compstui.rbuild
index 8d7403a9796..cd7ce261511 100644
--- a/reactos/dll/win32/compstui/compstui.rbuild
+++ b/reactos/dll/win32/compstui/compstui.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true">
-	<importlibrary definition="compstui.spec.def" />
+	<importlibrary definition="compstui.spec" />
 	<include base="compstui">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/credui/credui.rbuild b/reactos/dll/win32/credui/credui.rbuild
index e07e0f8a580..0ef5423d39c 100644
--- a/reactos/dll/win32/credui/credui.rbuild
+++ b/reactos/dll/win32/credui/credui.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="credui" type="win32dll" baseaddress="${BASEADDRESS_CREDUI}" installbase="system32" installname="credui.dll" allowwarnings="true">
-	<importlibrary definition="credui.spec.def" />
+	<importlibrary definition="credui.spec" />
 	<include base="credui">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/crypt32/crypt32.rbuild b/reactos/dll/win32/crypt32/crypt32.rbuild
index 69026ee8d94..f70d712affc 100644
--- a/reactos/dll/win32/crypt32/crypt32.rbuild
+++ b/reactos/dll/win32/crypt32/crypt32.rbuild
@@ -1,5 +1,5 @@
 <module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll" allowwarnings="true">
-	<importlibrary definition="crypt32.spec.def" />
+	<importlibrary definition="crypt32.spec" />
 	<include base="crypt32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/cryptdll/cryptdll.rbuild b/reactos/dll/win32/cryptdll/cryptdll.rbuild
index d8a3f478dbd..23da95bff75 100644
--- a/reactos/dll/win32/cryptdll/cryptdll.rbuild
+++ b/reactos/dll/win32/cryptdll/cryptdll.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cryptdll" type="win32dll" baseaddress="${BASEADDRESS_CRYPTDLL}" installbase="system32" installname="cryptdll.dll" allowwarnings="true">
-	<importlibrary definition="cryptdll.spec.def" />
+	<importlibrary definition="cryptdll.spec" />
 	<include base="cryptdll">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/cryptnet/cryptnet.rbuild b/reactos/dll/win32/cryptnet/cryptnet.rbuild
index d8a50dda11b..c263f11f28d 100644
--- a/reactos/dll/win32/cryptnet/cryptnet.rbuild
+++ b/reactos/dll/win32/cryptnet/cryptnet.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="cryptnet.spec.def" />
+	<importlibrary definition="cryptnet.spec" />
 	<include base="cryptnet">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/cryptui/cryptui.rbuild b/reactos/dll/win32/cryptui/cryptui.rbuild
index 63a6d1a2fd2..bab940f40ff 100644
--- a/reactos/dll/win32/cryptui/cryptui.rbuild
+++ b/reactos/dll/win32/cryptui/cryptui.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
 	<!--autoregister infsection="OleControlDlls" type="DllRegisterServer" /-->
-	<importlibrary definition="cryptui.spec.def" />
+	<importlibrary definition="cryptui.spec" />
 	<include base="cryptui">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild
index 236536ac3e5..ff2a5c2fe75 100644
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true">
-	<importlibrary definition="dbghelp.spec.def" />
+	<importlibrary definition="dbghelp.spec" />
 	<include base="dbghelp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/dciman32/dciman32.rbuild b/reactos/dll/win32/dciman32/dciman32.rbuild
index 35367a62417..9b03c62d68a 100644
--- a/reactos/dll/win32/dciman32/dciman32.rbuild
+++ b/reactos/dll/win32/dciman32/dciman32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dciman32" type="win32dll" baseaddress="${BASEADDRESS_DCIMAN32}" installbase="system32" installname="dciman32.dll" allowwarnings="true">
-	<importlibrary definition="dciman32.spec.def" />
+	<importlibrary definition="dciman32.spec" />
 	<include base="dciman32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild
index 226979ae493..926ce289878 100644
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@@ -1,6 +1,6 @@
 <module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true" unicode="yes">
 	<include base="devmgr">.</include>
-	<importlibrary definition="devmgr.spec.def" />
+	<importlibrary definition="devmgr.spec" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
index 6964d56c0a9..49fe65840cc 100644
--- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
+++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
@@ -1,5 +1,5 @@
 <module name="dhcpcsvc" type="win32dll" baseaddress="${BASEADDRESS_DHCPCSVC}" installbase="system32" installname="dhcpcsvc.dll">
-	<importlibrary definition="dhcpcsvc.spec.def" />
+	<importlibrary definition="dhcpcsvc.spec" />
 	<include base="dhcpcsvc">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT=0x0500" />
diff --git a/reactos/dll/win32/fusion/fusion.rbuild b/reactos/dll/win32/fusion/fusion.rbuild
index 90cabde35b4..0d3badf7635 100644
--- a/reactos/dll/win32/fusion/fusion.rbuild
+++ b/reactos/dll/win32/fusion/fusion.rbuild
@@ -1,5 +1,5 @@
 <module name="fusion" type="win32dll" baseaddress="${BASEADDRESS_FUSION}" installbase="system32" installname="fusion.dll" allowwarnings="true">
-	<importlibrary definition="fusion.spec.def" />
+	<importlibrary definition="fusion.spec" />
 	<include base="fusion">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index eb165bb85c3..fe7281c21ae 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true">
-	<importlibrary definition="gdiplus.spec.def" />
+	<importlibrary definition="gdiplus.spec" />
 	<include base="gdiplus">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/getuname/getuname.rbuild b/reactos/dll/win32/getuname/getuname.rbuild
index d10a924d570..a576b6baf48 100644
--- a/reactos/dll/win32/getuname/getuname.rbuild
+++ b/reactos/dll/win32/getuname/getuname.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="getuname" type="win32dll" baseaddress="${BASEADDRESS_GETUNAME}" installbase="system32" installname="getuname.dll" unicode="yes">
-	<importlibrary definition="getuname.spec.def" />
+	<importlibrary definition="getuname.spec" />
 	<include base="getuname">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="WINVER">0x600</define>
diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
index 53bbdf244bb..6c7cfc888b6 100644
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="hhctrl.ocx.spec.def" />
+	<importlibrary definition="hhctrl.ocx.spec" />
 	<include base="hhctrl">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="ReactOS" root="intermediate">include/reactos</include>
diff --git a/reactos/dll/win32/hlink/hlink.rbuild b/reactos/dll/win32/hlink/hlink.rbuild
index 531c3ff8d5b..b5b5eb85391 100644
--- a/reactos/dll/win32/hlink/hlink.rbuild
+++ b/reactos/dll/win32/hlink/hlink.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="hlink" type="win32dll" baseaddress="${BASEADDRESS_HLINK}" installbase="system32" installname="hlink.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="hlink.spec.def" />
+	<importlibrary definition="hlink.spec" />
 	<include base="hlink">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild
index 295a5653728..ce838e09b79 100644
--- a/reactos/dll/win32/icmp/icmp.rbuild
+++ b/reactos/dll/win32/icmp/icmp.rbuild
@@ -1,5 +1,5 @@
 <module name="icmp" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_ICMP}" installbase="system32" installname="icmp.dll" allowwarnings="true">
-	<importlibrary definition="icmp.spec.def" />
+	<importlibrary definition="icmp.spec" />
 	<include base="icmp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_WINNT">0x501</define>
diff --git a/reactos/dll/win32/imagehlp/imagehlp.rbuild b/reactos/dll/win32/imagehlp/imagehlp.rbuild
index c65b8f5ee09..b03f5af077a 100644
--- a/reactos/dll/win32/imagehlp/imagehlp.rbuild
+++ b/reactos/dll/win32/imagehlp/imagehlp.rbuild
@@ -1,5 +1,5 @@
 <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true">
-	<importlibrary definition="imagehlp.spec.def" />
+	<importlibrary definition="imagehlp.spec" />
 	<include base="imagehlp">.</include>
 	<define name="_WIN32_WINNT">0x600</define>
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/dll/win32/imm32/imm32.rbuild b/reactos/dll/win32/imm32/imm32.rbuild
index 90253745461..421b1a0c9c5 100644
--- a/reactos/dll/win32/imm32/imm32.rbuild
+++ b/reactos/dll/win32/imm32/imm32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll" allowwarnings="true">
-	<importlibrary definition="imm32.spec.def" />
+	<importlibrary definition="imm32.spec" />
 	<include base="imm32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild
index 428f45bed9d..0bc13f6fac9 100644
--- a/reactos/dll/win32/inetcomm/inetcomm.rbuild
+++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="inetcomm" type="win32dll" baseaddress="${BASEADDRESS_INETCOMM}" installbase="system32" installname="inetcomm.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="inetcomm.spec.def" />
+	<importlibrary definition="inetcomm.spec" />
 	<include base="inetcomm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/inetmib1/inetmib1.rbuild b/reactos/dll/win32/inetmib1/inetmib1.rbuild
index ad685b8fcc2..0f4fd6a5249 100644
--- a/reactos/dll/win32/inetmib1/inetmib1.rbuild
+++ b/reactos/dll/win32/inetmib1/inetmib1.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true">
-	<importlibrary definition="inetmib1.spec.def" />
+	<importlibrary definition="inetmib1.spec" />
 	<include base="inetmib1">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index b93ab591916..5acca9019ed 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -1,5 +1,5 @@
 <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes">
-	<importlibrary definition="iphlpapi.spec.def" />
+	<importlibrary definition="iphlpapi.spec" />
 	<include base="iphlpapi">include</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index b9308743f38..eca0c55f9c3 100644
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -1,7 +1,7 @@
 <group>
 <module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="jscript.spec.def" />
+	<importlibrary definition="jscript.spec" />
 	<include base="jscript">.</include>
 	<include base="jscript" root="intermediate">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild
index eacdef6f384..41a294f658f 100644
--- a/reactos/dll/win32/lpk/lpk.rbuild
+++ b/reactos/dll/win32/lpk/lpk.rbuild
@@ -1,5 +1,5 @@
 <module name="lpk" type="win32dll" baseaddress="${BASEADDRESS_LPK}" installbase="system32" installname="lpk.dll" unicode="yes">
-	<importlibrary definition="lpk.spec.def" />
+	<importlibrary definition="lpk.spec" />
 	<include base="lpk">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/dll/win32/lz32/lz32.rbuild b/reactos/dll/win32/lz32/lz32.rbuild
index 423239537d9..f4fb312f701 100644
--- a/reactos/dll/win32/lz32/lz32.rbuild
+++ b/reactos/dll/win32/lz32/lz32.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="lz32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true">
-	<importlibrary definition="lz32.spec.def" />
+	<importlibrary definition="lz32.spec" />
 	<include base="lz32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild
index dc600d6dd3f..e24d1158627 100644
--- a/reactos/dll/win32/mapi32/mapi32.rbuild
+++ b/reactos/dll/win32/mapi32/mapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll" allowwarnings="true">
-	<importlibrary definition="mapi32.spec.def" />
+	<importlibrary definition="mapi32.spec" />
 	<include base="mapi32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mlang/mlang.rbuild b/reactos/dll/win32/mlang/mlang.rbuild
index 46a20c9a0d0..cc083279adc 100644
--- a/reactos/dll/win32/mlang/mlang.rbuild
+++ b/reactos/dll/win32/mlang/mlang.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="mlang" type="win32dll" baseaddress="${BASEADDRESS_MLANG}" installbase="system32" installname="mlang.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="mlang.spec.def" />
+	<importlibrary definition="mlang.spec" />
 	<include base="mlang">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mmdrv/mmdrv.rbuild b/reactos/dll/win32/mmdrv/mmdrv.rbuild
index f9627195b51..44430714713 100644
--- a/reactos/dll/win32/mmdrv/mmdrv.rbuild
+++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild
@@ -1,5 +1,5 @@
 <module name="mmdrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes">
-	<importlibrary definition="mmdrv.spec.def" />
+	<importlibrary definition="mmdrv.spec" />
 	<include base="mmdrv">.</include>
 	<define name="NDEBUG" />
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/modemui/modemui.rbuild b/reactos/dll/win32/modemui/modemui.rbuild
index afa5a91eeef..c316c0dd5e8 100644
--- a/reactos/dll/win32/modemui/modemui.rbuild
+++ b/reactos/dll/win32/modemui/modemui.rbuild
@@ -1,5 +1,5 @@
 <module name="modemui" type="win32dll" baseaddress="${BASEADDRESS_MODEMUI}" installbase="system32" installname="modemui.dll" unicode="true">
-	<importlibrary definition="modemui.spec.def" />
+	<importlibrary definition="modemui.spec" />
 	<include base="modemui">.</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
diff --git a/reactos/dll/win32/mpr/mpr.rbuild b/reactos/dll/win32/mpr/mpr.rbuild
index 8df5fd1b614..cc17d609e5f 100644
--- a/reactos/dll/win32/mpr/mpr.rbuild
+++ b/reactos/dll/win32/mpr/mpr.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
-	<importlibrary definition="mpr.spec.def" />
+	<importlibrary definition="mpr.spec" />
 	<include base="mpr">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mprapi/mprapi.rbuild b/reactos/dll/win32/mprapi/mprapi.rbuild
index 542f8afc47c..0044f108913 100644
--- a/reactos/dll/win32/mprapi/mprapi.rbuild
+++ b/reactos/dll/win32/mprapi/mprapi.rbuild
@@ -1,5 +1,5 @@
 <module name="mprapi" type="win32dll" baseaddress="${BASEADDRESS_MPRAPI}" installbase="system32" installname="mprapi.dll">
-	<importlibrary definition="mprapi.spec.def" />
+	<importlibrary definition="mprapi.spec" />
 	<include base="mprapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 9d83ecfa107..337a99b911b 100644
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -1,5 +1,5 @@
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
-	<importlibrary definition="msacm32.spec.def" />
+	<importlibrary definition="msacm32.spec" />
 	<include base="msacm32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/mscoree/mscoree.rbuild b/reactos/dll/win32/mscoree/mscoree.rbuild
index 7c805276357..76726a3e57f 100644
--- a/reactos/dll/win32/mscoree/mscoree.rbuild
+++ b/reactos/dll/win32/mscoree/mscoree.rbuild
@@ -1,5 +1,5 @@
 <module name="mscoree" type="win32dll" baseaddress="${BASEADDRESS_MSCOREE}" installbase="system32" installname="mscoree.dll">
-	<importlibrary definition="mscoree.spec.def" />
+	<importlibrary definition="mscoree.spec" />
 	<include base="mscoree">.</include>
 	<library>wine</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild
index d000673cc6a..951dc1c97e2 100644
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@@ -1,5 +1,5 @@
 <module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}" installbase="system32" installname="msgina.dll">
-	<importlibrary definition="msgina.spec.def" />
+	<importlibrary definition="msgina.spec" />
 	<include base="msgina">.</include>
 	<include base="msgina">include</include>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
index 2f476623d86..a4ff711eb15 100644
--- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
+++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
@@ -4,7 +4,7 @@
 	<file>mshtml_tlb.idl</file>
 </module>
 <module name="mshtml.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="mshtml.tlb" entrypoint="0">
-	<importlibrary definition="mshtml.tlb.spec.def" />
+	<importlibrary definition="mshtml.tlb.spec" />
 	<include base="mshtml.tlb" root="intermediate">.</include>
 	<dependency>mshtml_tlb</dependency>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mshtml/mshtml.rbuild b/reactos/dll/win32/mshtml/mshtml.rbuild
index 5db3ddd01a1..5bff1fc90af 100644
--- a/reactos/dll/win32/mshtml/mshtml.rbuild
+++ b/reactos/dll/win32/mshtml/mshtml.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="Both" />
-	<importlibrary definition="mshtml.spec.def" />
+	<importlibrary definition="mshtml.spec" />
 	<include base="mshtml">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msi/msi.rbuild b/reactos/dll/win32/msi/msi.rbuild
index c2c37e79369..99d557331b1 100644
--- a/reactos/dll/win32/msi/msi.rbuild
+++ b/reactos/dll/win32/msi/msi.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="msi.spec.def" />
+	<importlibrary definition="msi.spec" />
 	<include base="msi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msimg32/msimg32.rbuild b/reactos/dll/win32/msimg32/msimg32.rbuild
index 117fccb59ab..c8f9a0912c6 100644
--- a/reactos/dll/win32/msimg32/msimg32.rbuild
+++ b/reactos/dll/win32/msimg32/msimg32.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true">
-	<importlibrary definition="msimg32.spec.def" />
+	<importlibrary definition="msimg32.spec" />
 	<include base="msimg32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mstask/mstask.rbuild b/reactos/dll/win32/mstask/mstask.rbuild
index ea4d1f62eb3..02843751570 100644
--- a/reactos/dll/win32/mstask/mstask.rbuild
+++ b/reactos/dll/win32/mstask/mstask.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="mstask" type="win32dll" baseaddress="${BASEADDRESS_MSTASK}" installbase="system32" installname="mstask.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="mstask.spec.def" />
+	<importlibrary definition="mstask.spec" />
 	<include base="mstask">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
index dbe765ca396..8c5f2240f34 100644
--- a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
+++ b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" installbase="system32" installname="msvcrt20.dll" allowwarnings="true" entrypoint="0">
-	<importlibrary definition="msvcrt20.spec.def" />
+	<importlibrary definition="msvcrt20.spec" />
 	<include base="msvcrt20">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
index b02916a86ab..200942afad0 100644
--- a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
+++ b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt40" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT40}" installbase="system32" installname="msvcrt40.dll">
-	<importlibrary definition="msvcrt40.spec.def" />
+	<importlibrary definition="msvcrt40.spec" />
 	<include base="msvcrt40">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msvfw32/msvfw32.rbuild b/reactos/dll/win32/msvfw32/msvfw32.rbuild
index d1e3f508f60..5cf4f895a3d 100644
--- a/reactos/dll/win32/msvfw32/msvfw32.rbuild
+++ b/reactos/dll/win32/msvfw32/msvfw32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll" allowwarnings="true">
-	<importlibrary definition="msvfw32.spec.def" />
+	<importlibrary definition="msvfw32.spec" />
 	<include base="msvfw32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index ce4fd47524b..e61d94bc43f 100644
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -1,7 +1,7 @@
 <group>
 <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="msxml3.spec.def" />
+	<importlibrary definition="msxml3.spec" />
 	<include base="msxml3">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="msxml3" root="intermediate">.</include>
diff --git a/reactos/dll/win32/nddeapi/nddeapi.rbuild b/reactos/dll/win32/nddeapi/nddeapi.rbuild
index 8700ed6b8ff..80aacc2ef6d 100644
--- a/reactos/dll/win32/nddeapi/nddeapi.rbuild
+++ b/reactos/dll/win32/nddeapi/nddeapi.rbuild
@@ -1,5 +1,5 @@
 <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="nddeapi.spec.def" />
+        <importlibrary definition="nddeapi.spec" />
         <include base="nddeapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
diff --git a/reactos/dll/win32/netapi32/netapi32.rbuild b/reactos/dll/win32/netapi32/netapi32.rbuild
index 9c2ef41ff14..dd6e1f85b29 100644
--- a/reactos/dll/win32/netapi32/netapi32.rbuild
+++ b/reactos/dll/win32/netapi32/netapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true">
-	<importlibrary definition="netapi32.spec.def" />
+	<importlibrary definition="netapi32.spec" />
 	<include base="netapi32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/netcfgx/netcfgx.rbuild b/reactos/dll/win32/netcfgx/netcfgx.rbuild
index 8c6e0e37106..c6d7998e184 100644
--- a/reactos/dll/win32/netcfgx/netcfgx.rbuild
+++ b/reactos/dll/win32/netcfgx/netcfgx.rbuild
@@ -1,5 +1,5 @@
 <module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" installbase="system32" installname="netcfgx.dll">
-	<importlibrary definition="netcfgx.spec.def" />
+	<importlibrary definition="netcfgx.spec" />
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<library>ntdll</library>
 	<library>rpcrt4</library>
diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild
index 0bab404e897..021663c41ed 100644
--- a/reactos/dll/win32/netid/netid.rbuild
+++ b/reactos/dll/win32/netid/netid.rbuild
@@ -1,5 +1,5 @@
 <module name="netid" type="win32dll" baseaddress="${BASEADDRESS_NETID}" installbase="system32" installname="netid.dll" unicode="true">
-	<importlibrary definition="netid.spec.def" />
+	<importlibrary definition="netid.spec" />
 	<include base="netid">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
diff --git a/reactos/dll/win32/netshell/netshell.rbuild b/reactos/dll/win32/netshell/netshell.rbuild
index 474472e69ef..23440f88854 100644
--- a/reactos/dll/win32/netshell/netshell.rbuild
+++ b/reactos/dll/win32/netshell/netshell.rbuild
@@ -1,6 +1,6 @@
 <module name="netshell" type="win32dll" baseaddress="${BASEADDRESS_NETSHELL}" installbase="system32" installname="netshell.dll">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="netshell.spec.def" />
+	<importlibrary definition="netshell.spec" />
 	<include base="netshell">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
diff --git a/reactos/dll/win32/newdev/newdev.rbuild b/reactos/dll/win32/newdev/newdev.rbuild
index 910f54260b4..d080d200889 100644
--- a/reactos/dll/win32/newdev/newdev.rbuild
+++ b/reactos/dll/win32/newdev/newdev.rbuild
@@ -1,6 +1,6 @@
 <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll" unicode="true">
 	<include base="newdev">.</include>
-	<importlibrary definition="newdev.spec.def" />
+	<importlibrary definition="newdev.spec" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<file>newdev.c</file>
diff --git a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
index ea1a3ac2b07..5b922872fe9 100644
--- a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
+++ b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
@@ -1,5 +1,5 @@
 <module name="ntdsapi" type="win32dll" baseaddress="${BASEADDRESS_NTDSAPI}" installbase="system32" installname="ntdsapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="ntdsapi.spec.def" />
+        <importlibrary definition="ntdsapi.spec" />
         <include base="ntdsapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
diff --git a/reactos/dll/win32/ntmarta/ntmarta.rbuild b/reactos/dll/win32/ntmarta/ntmarta.rbuild
index bbe1ac33df6..3f3b2e893ae 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.rbuild
+++ b/reactos/dll/win32/ntmarta/ntmarta.rbuild
@@ -1,5 +1,5 @@
 <module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll" unicode="yes">
-	<importlibrary definition="ntmarta.spec.def" />
+	<importlibrary definition="ntmarta.spec" />
 	<include base="ntmarta">.</include>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x600</define>
diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild
index 18c6dbf05df..e5e0b17ea1b 100644
--- a/reactos/dll/win32/objsel/objsel.rbuild
+++ b/reactos/dll/win32/objsel/objsel.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="objsel.spec.def" />
+	<importlibrary definition="objsel.spec" />
 	<include base="objsel">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/odbc32/odbc32.rbuild b/reactos/dll/win32/odbc32/odbc32.rbuild
index 4a968919a51..cddd6fa713c 100644
--- a/reactos/dll/win32/odbc32/odbc32.rbuild
+++ b/reactos/dll/win32/odbc32/odbc32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="odbc32" type="win32dll" baseaddress="${BASEADDRESS_ODBC32}" installbase="system32" installname="odbc32.dll" allowwarnings="true" >
-	<importlibrary definition="odbc32.spec.def" />
+	<importlibrary definition="odbc32.spec" />
 	<include base="odbc32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/odbccp32/odbccp32.rbuild b/reactos/dll/win32/odbccp32/odbccp32.rbuild
index f8d461c36a8..2e112681434 100644
--- a/reactos/dll/win32/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/win32/odbccp32/odbccp32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0">
-	<importlibrary definition="odbccp32.spec.def" />
+	<importlibrary definition="odbccp32.spec" />
 	<include base="odbccp32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/ole32/ole32.rbuild b/reactos/dll/win32/ole32/ole32.rbuild
index 47082efd6b3..37fa9b7faee 100644
--- a/reactos/dll/win32/ole32/ole32.rbuild
+++ b/reactos/dll/win32/ole32/ole32.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="ole32.spec.def" />
+	<importlibrary definition="ole32.spec" />
 	<include base="ole32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/oleacc/oleacc.rbuild b/reactos/dll/win32/oleacc/oleacc.rbuild
index 46b65e27095..6fc3183658e 100644
--- a/reactos/dll/win32/oleacc/oleacc.rbuild
+++ b/reactos/dll/win32/oleacc/oleacc.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true" entrypoint="0">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="oleacc.spec.def" />
+	<importlibrary definition="oleacc.spec" />
 	<include base="oleacc">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/oleaut32/oleaut32.rbuild b/reactos/dll/win32/oleaut32/oleaut32.rbuild
index 83a0e2da883..4e37d00e9db 100644
--- a/reactos/dll/win32/oleaut32/oleaut32.rbuild
+++ b/reactos/dll/win32/oleaut32/oleaut32.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="oleaut32.spec.def" />
+	<importlibrary definition="oleaut32.spec" />
 	<include base="oleaut32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/oledlg/oledlg.rbuild b/reactos/dll/win32/oledlg/oledlg.rbuild
index 53fd2511cc9..ca987921f71 100644
--- a/reactos/dll/win32/oledlg/oledlg.rbuild
+++ b/reactos/dll/win32/oledlg/oledlg.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true">
-	<importlibrary definition="oledlg.spec.def" />
+	<importlibrary definition="oledlg.spec" />
 	<include base="oledlg">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/olepro32/olepro32.rbuild b/reactos/dll/win32/olepro32/olepro32.rbuild
index 192485486c1..f14d281d911 100644
--- a/reactos/dll/win32/olepro32/olepro32.rbuild
+++ b/reactos/dll/win32/olepro32/olepro32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="olepro32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="olepro32.spec.def" />
+	<importlibrary definition="olepro32.spec" />
 	<include base="olepro32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/pdh/pdh.rbuild b/reactos/dll/win32/pdh/pdh.rbuild
index 1a3e081e3d3..c1b30627257 100644
--- a/reactos/dll/win32/pdh/pdh.rbuild
+++ b/reactos/dll/win32/pdh/pdh.rbuild
@@ -1,5 +1,5 @@
 <module name="pdh" type="win32dll" baseaddress="${BASEADDRESS_PDH}" installbase="system32" installname="pdh.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="pdh.spec.def" />
+        <importlibrary definition="pdh.spec" />
         <include base="pdh">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
diff --git a/reactos/dll/win32/powrprof/powrprof.rbuild b/reactos/dll/win32/powrprof/powrprof.rbuild
index 1cea520825c..8425b685b1d 100644
--- a/reactos/dll/win32/powrprof/powrprof.rbuild
+++ b/reactos/dll/win32/powrprof/powrprof.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" unicode="yes">
-	<importlibrary definition="powrprof.spec.def" />
+	<importlibrary definition="powrprof.spec" />
 	<include base="powrprof">.</include>
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
diff --git a/reactos/dll/win32/printui/printui.rbuild b/reactos/dll/win32/printui/printui.rbuild
index de3560df3ac..216ec665db7 100644
--- a/reactos/dll/win32/printui/printui.rbuild
+++ b/reactos/dll/win32/printui/printui.rbuild
@@ -1,5 +1,5 @@
 <module name="printui" type="win32dll" baseaddress="${BASEADDRESS_PRINTUI}" installbase="system32" installname="printui.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="printui.spec.def" />
+        <importlibrary definition="printui.spec" />
         <include base="printui">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
diff --git a/reactos/dll/win32/pstorec/pstorec.rbuild b/reactos/dll/win32/pstorec/pstorec.rbuild
index ea4383dddd1..493a30f22df 100644
--- a/reactos/dll/win32/pstorec/pstorec.rbuild
+++ b/reactos/dll/win32/pstorec/pstorec.rbuild
@@ -1,5 +1,5 @@
 <module name="pstorec" type="win32dll" baseaddress="${BASEADDRESS_PSTOREC}" installbase="system32" installname="pstorec.dll">
-	<importlibrary definition="pstorec.spec.def" />
+	<importlibrary definition="pstorec.spec" />
 	<include base="pstorec">.</include>
 	<library>wine</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/rasapi32/rasapi32.rbuild b/reactos/dll/win32/rasapi32/rasapi32.rbuild
index 67451d51c7b..d78b7e17979 100644
--- a/reactos/dll/win32/rasapi32/rasapi32.rbuild
+++ b/reactos/dll/win32/rasapi32/rasapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rasapi32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_RASAPI32}" installbase="system32" installname="rasapi32.dll" allowwarnings="true">
-	<importlibrary definition="rasapi32.spec.def" />
+	<importlibrary definition="rasapi32.spec" />
 	<include base="rasapi32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/rasdlg/rasdlg.rbuild b/reactos/dll/win32/rasdlg/rasdlg.rbuild
index 22759f66b03..6f31a16681f 100644
--- a/reactos/dll/win32/rasdlg/rasdlg.rbuild
+++ b/reactos/dll/win32/rasdlg/rasdlg.rbuild
@@ -1,5 +1,5 @@
 <module name="rasdlg" type="win32dll" baseaddress="${BASEADDRESS_RASDLG}" installbase="system32" installname="rasdlg.dll">
-	<importlibrary definition="rasdlg.spec.def" />
+	<importlibrary definition="rasdlg.spec" />
 	<include base="rasdlg">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<library>wine</library>
diff --git a/reactos/dll/win32/rasman/rasman.rbuild b/reactos/dll/win32/rasman/rasman.rbuild
index 5f72da00a9d..5df7820ec03 100644
--- a/reactos/dll/win32/rasman/rasman.rbuild
+++ b/reactos/dll/win32/rasman/rasman.rbuild
@@ -1,5 +1,5 @@
 <module name="rasman" type="win32dll" baseaddress="${BASEADDRESS_RASMAN}" installbase="system32" installname="rasman.dll">
-	<importlibrary definition="rasman.spec.def" />
+	<importlibrary definition="rasman.spec" />
 	<include base="rasman">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<library>wine</library>
diff --git a/reactos/dll/win32/riched20/riched20.rbuild b/reactos/dll/win32/riched20/riched20.rbuild
index 49bcba6bbb3..95c54845fdd 100644
--- a/reactos/dll/win32/riched20/riched20.rbuild
+++ b/reactos/dll/win32/riched20/riched20.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true">
-	<importlibrary definition="riched20.spec.def" />
+	<importlibrary definition="riched20.spec" />
 	<include base="riched20">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/riched32/riched32.rbuild b/reactos/dll/win32/riched32/riched32.rbuild
index 0b370e2af45..948f6ea43c5 100644
--- a/reactos/dll/win32/riched32/riched32.rbuild
+++ b/reactos/dll/win32/riched32/riched32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll" allowwarnings="true">
-	<importlibrary definition="riched32.spec.def" />
+	<importlibrary definition="riched32.spec" />
 	<include base="riched32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
index 132ed2161de..455dd4b80d7 100644
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -1,6 +1,6 @@
 <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="rpcrt4.spec.def" />
+	<importlibrary definition="rpcrt4.spec" />
 	<include base="rpcrt4">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
diff --git a/reactos/dll/win32/rsabase/rsabase.rbuild b/reactos/dll/win32/rsabase/rsabase.rbuild
index 50d0c58b31d..a57bdcc262e 100644
--- a/reactos/dll/win32/rsabase/rsabase.rbuild
+++ b/reactos/dll/win32/rsabase/rsabase.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="rsabase" type="win32dll" baseaddress="${BASEADDRESS_RSABASE}" installbase="system32" installname="rsabase.dll" allowwarnings="true" entrypoint="0">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="rsabase.spec.def" />
+	<importlibrary definition="rsabase.spec" />
 	<include base="rsabase">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/rsaenh/rsaenh.rbuild b/reactos/dll/win32/rsaenh/rsaenh.rbuild
index e9805c06545..6b0446a00e4 100644
--- a/reactos/dll/win32/rsaenh/rsaenh.rbuild
+++ b/reactos/dll/win32/rsaenh/rsaenh.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="rsaenh" type="win32dll" baseaddress="${BASEADDRESS_RSAENH}" installbase="system32" installname="rsaenh.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="rsaenh.spec.def" />
+	<importlibrary definition="rsaenh.spec" />
 	<include base="rsaenh">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/samsrv/samsrv.rbuild b/reactos/dll/win32/samsrv/samsrv.rbuild
index 44f8c06f6d9..fb0e46298a3 100644
--- a/reactos/dll/win32/samsrv/samsrv.rbuild
+++ b/reactos/dll/win32/samsrv/samsrv.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes">
-	<importlibrary definition="samsrv.spec.def" />
+	<importlibrary definition="samsrv.spec" />
 	<include base="samsrv">.</include>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/schannel/schannel.rbuild b/reactos/dll/win32/schannel/schannel.rbuild
index 3a085816706..52251fe4619 100644
--- a/reactos/dll/win32/schannel/schannel.rbuild
+++ b/reactos/dll/win32/schannel/schannel.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" allowwarnings="true">
-	<importlibrary definition="schannel.spec.def" />
+	<importlibrary definition="schannel.spec" />
 	<include base="schannel">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/sensapi/sensapi.rbuild b/reactos/dll/win32/sensapi/sensapi.rbuild
index 0fd2ccb4355..e4cc7043caa 100644
--- a/reactos/dll/win32/sensapi/sensapi.rbuild
+++ b/reactos/dll/win32/sensapi/sensapi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sensapi" type="win32dll" baseaddress="${BASEADDRESS_SENSAPI}" installbase="system32" installname="sensapi.dll" allowwarnings="true">
-	<importlibrary definition="sensapi.spec.def" />
+	<importlibrary definition="sensapi.spec" />
 	<include base="sensapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/serialui/serialui.rbuild b/reactos/dll/win32/serialui/serialui.rbuild
index 5d09b18436c..eb43bd52fea 100644
--- a/reactos/dll/win32/serialui/serialui.rbuild
+++ b/reactos/dll/win32/serialui/serialui.rbuild
@@ -1,5 +1,5 @@
 <module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll" unicode="yes">
-	<importlibrary definition="serialui.spec.def" />
+	<importlibrary definition="serialui.spec" />
 	<include base="serialui">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild
index 0a0301a917d..9f5a3ba20f0 100644
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes">
-	<importlibrary definition="setupapi.spec.def" />
+	<importlibrary definition="setupapi.spec" />
 	<include base="setupapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="pnp_client">.</include>
diff --git a/reactos/dll/win32/sfc/sfc.rbuild b/reactos/dll/win32/sfc/sfc.rbuild
index d3ad6561cb4..263c55ca301 100644
--- a/reactos/dll/win32/sfc/sfc.rbuild
+++ b/reactos/dll/win32/sfc/sfc.rbuild
@@ -1,5 +1,5 @@
 <module name="sfc" type="win32dll" baseaddress="${BASEADDRESS_SFC}" installbase="system32" installname="sfc.dll" allowwarnings="yes">
-	<importlibrary definition="sfc.spec.def" />
+	<importlibrary definition="sfc.spec" />
 	<include base="sfc">.</include>
 	<library>kernel32</library>
 	<file>sfc.c</file>
diff --git a/reactos/dll/win32/sfc_os/sfc_os.rbuild b/reactos/dll/win32/sfc_os/sfc_os.rbuild
index 2e02263c20e..6cc89c87ae9 100644
--- a/reactos/dll/win32/sfc_os/sfc_os.rbuild
+++ b/reactos/dll/win32/sfc_os/sfc_os.rbuild
@@ -1,5 +1,5 @@
 <module name="sfc_os" type="win32dll" baseaddress="${BASEADDRESS_SFC_OS}" installbase="system32" installname="sfc_os.dll" allowwarnings="yes">
-	<importlibrary definition="sfc_os.spec.def" />
+	<importlibrary definition="sfc_os.spec" />
 	<include base="sfc_os">.</include>
 	<library>kernel32</library>
 	<file>sfc_os.c</file>
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index 0e8a337d0a7..5678ab47b69 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -1,6 +1,6 @@
 <module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="Both" />
-	<importlibrary definition="shdocvw.spec.def" />
+	<importlibrary definition="shdocvw.spec" />
 	<include base="shdocvw">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild
index d3eeeef2782..7bc769c32f4 100644
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@@ -1,6 +1,6 @@
 <module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll">
 	<autoregister infsection="OleControlDlls" type="Both" />
-	<importlibrary definition="shell32.spec.def" />
+	<importlibrary definition="shell32.spec" />
 	<include base="shell32">.</include>
 	<include base="recyclebin">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
diff --git a/reactos/dll/win32/shfolder/shfolder.rbuild b/reactos/dll/win32/shfolder/shfolder.rbuild
index 1d3aa77c526..2b08ca47d79 100644
--- a/reactos/dll/win32/shfolder/shfolder.rbuild
+++ b/reactos/dll/win32/shfolder/shfolder.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true" entrypoint="0">
-	<importlibrary definition="shfolder.spec.def" />
+	<importlibrary definition="shfolder.spec" />
 	<include base="shfolder">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/shimgvw/shimgvw.rbuild b/reactos/dll/win32/shimgvw/shimgvw.rbuild
index 99e1d1364cc..07ff24d7d27 100644
--- a/reactos/dll/win32/shimgvw/shimgvw.rbuild
+++ b/reactos/dll/win32/shimgvw/shimgvw.rbuild
@@ -1,5 +1,5 @@
 <module name="shimgvw" type="win32dll" baseaddress="${BASEADDRESS_SHIMGVW}" installbase="system32" installname="shimgvw.dll">
-	<importlibrary definition="shimgvw.spec.def" />
+	<importlibrary definition="shimgvw.spec" />
 	<include base="shimgvw">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/shlwapi/shlwapi.rbuild b/reactos/dll/win32/shlwapi/shlwapi.rbuild
index cd9a166d915..2fda4a456b6 100644
--- a/reactos/dll/win32/shlwapi/shlwapi.rbuild
+++ b/reactos/dll/win32/shlwapi/shlwapi.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true">
-	<importlibrary definition="shlwapi.spec.def" />
+	<importlibrary definition="shlwapi.spec" />
 	<include base="shlwapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild
index e6ee0f88dc8..ad9960e078a 100644
--- a/reactos/dll/win32/snmpapi/snmpapi.rbuild
+++ b/reactos/dll/win32/snmpapi/snmpapi.rbuild
@@ -1,5 +1,5 @@
 <module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll" unicode="yes">
-	<importlibrary definition="snmpapi.spec.def" />
+	<importlibrary definition="snmpapi.spec" />
 	<include base="snmpapi">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
index 4d9fd38f6bc..8d346b7cc78 100644
--- a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
+++ b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
@@ -9,7 +9,7 @@
 	<file>std_ole_v2.idl</file>
 </module>
 <module name="stdole2.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb" entrypoint="0">
-	<importlibrary definition="stdole2.tlb.spec.def" />
+	<importlibrary definition="stdole2.tlb.spec" />
 	<include base="stdole2.tlb">.</include>
 	<include base="stdole2.tlb" root="intermediate">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
diff --git a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
index 137073c2f0b..fe379917cf8 100644
--- a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
+++ b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
@@ -9,7 +9,7 @@
 	<file>std_ole_v1.idl</file>
 </module>
 <module name="stdole32.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole32.tlb" entrypoint="0">
-	<importlibrary definition="stdole32.tlb.spec.def" />
+	<importlibrary definition="stdole32.tlb.spec" />
 	<include base="stdole32.tlb">.</include>
 	<include base="stdole32.tlb" root="intermediate">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
diff --git a/reactos/dll/win32/sxs/sxs.rbuild b/reactos/dll/win32/sxs/sxs.rbuild
index 7559626a809..e9d8e47ef50 100644
--- a/reactos/dll/win32/sxs/sxs.rbuild
+++ b/reactos/dll/win32/sxs/sxs.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="sxs" type="win32dll" baseaddress="${BASEADDRESS_SXS}" installbase="system32" installname="sxs.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="sxs.spec.def" />
+        <importlibrary definition="sxs.spec" />
         <include base="sxs">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />
diff --git a/reactos/dll/win32/tapi32/tapi32.rbuild b/reactos/dll/win32/tapi32/tapi32.rbuild
index f1564856f9e..c4547d66036 100644
--- a/reactos/dll/win32/tapi32/tapi32.rbuild
+++ b/reactos/dll/win32/tapi32/tapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="tapi32" type="win32dll" baseaddress="${BASEADDRESS_TAPI32}" installbase="system32" installname="tapi32.dll" allowwarnings="true" entrypoint="0">
-	<importlibrary definition="tapi32.spec.def" />
+	<importlibrary definition="tapi32.spec" />
 	<include base="tapi32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/urlmon/urlmon.rbuild b/reactos/dll/win32/urlmon/urlmon.rbuild
index 9493c102eed..710fb19a372 100644
--- a/reactos/dll/win32/urlmon/urlmon.rbuild
+++ b/reactos/dll/win32/urlmon/urlmon.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="Both" />
-	<importlibrary definition="urlmon.spec.def" />
+	<importlibrary definition="urlmon.spec" />
 	<include base="urlmon">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/usp10/usp10.rbuild b/reactos/dll/win32/usp10/usp10.rbuild
index cb7b18c0abb..6f2af469aa8 100644
--- a/reactos/dll/win32/usp10/usp10.rbuild
+++ b/reactos/dll/win32/usp10/usp10.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="usp10" type="win32dll" baseaddress="${BASEADDRESS_USP10}" installbase="system32" installname="usp10.dll" allowwarnings="true">
-	<importlibrary definition="usp10.spec.def" />
+	<importlibrary definition="usp10.spec" />
 	<include base="usp10">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/uxtheme/uxtheme.rbuild b/reactos/dll/win32/uxtheme/uxtheme.rbuild
index 38b1f7b9c6b..a67bdaf8c4a 100644
--- a/reactos/dll/win32/uxtheme/uxtheme.rbuild
+++ b/reactos/dll/win32/uxtheme/uxtheme.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="uxtheme" type="win32dll" baseaddress="${BASEADDRESS_UXTHEME}" installbase="system32" installname="uxtheme.dll" allowwarnings="true">
-	<importlibrary definition="uxtheme.spec.def" />
+	<importlibrary definition="uxtheme.spec" />
 	<include base="uxtheme">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
index 80e2434d146..8ccedce0b41 100644
--- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
+++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
@@ -1,5 +1,5 @@
 <module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll" unicode="yes">
-	<importlibrary definition="vdmdbg.spec.def" />
+	<importlibrary definition="vdmdbg.spec" />
 	<include base="vdmdbg">.</include>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/version/version.rbuild b/reactos/dll/win32/version/version.rbuild
index 5ed46283e03..11a760fec56 100644
--- a/reactos/dll/win32/version/version.rbuild
+++ b/reactos/dll/win32/version/version.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" allowwarnings="true" entrypoint="0">
-	<importlibrary definition="version.spec.def" />
+	<importlibrary definition="version.spec" />
 	<include base="version">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
index c9db2a8999c..dd285bf5cdf 100644
--- a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
+++ b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
@@ -1,5 +1,5 @@
 <module name="wdmaud.drv" type="win32dll" baseaddress="${BASEADDRESS_WDMAUD}" installbase="system32" installname="wdmaud.drv">
-	<importlibrary definition="wdmaud.spec.def" />
+	<importlibrary definition="wdmaud.spec" />
 	<include base="wdmaud.drv">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/winhttp/winhttp.rbuild b/reactos/dll/win32/winhttp/winhttp.rbuild
index 5841090544c..923e4bd3d4d 100644
--- a/reactos/dll/win32/winhttp/winhttp.rbuild
+++ b/reactos/dll/win32/winhttp/winhttp.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="winhttp.spec.def" />
+	<importlibrary definition="winhttp.spec" />
 	<include base="winhttp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/wininet/wininet.rbuild b/reactos/dll/win32/wininet/wininet.rbuild
index 29700bafdee..454c96e1f5c 100644
--- a/reactos/dll/win32/wininet/wininet.rbuild
+++ b/reactos/dll/win32/wininet/wininet.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllInstall" />
-	<importlibrary definition="wininet.spec.def" />
+	<importlibrary definition="wininet.spec" />
 	<include base="wininet">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild
index 901479650ef..1369968fa8a 100644
--- a/reactos/dll/win32/winmm/midimap/midimap.rbuild
+++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild
@@ -1,5 +1,5 @@
 <module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes">
-	<importlibrary definition="midimap.spec.def" />
+	<importlibrary definition="midimap.spec" />
 	<include base="midimap">.</include>
 	<include base="ReactOS">include/wine</include>
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
index c493f035482..16c62d48024 100644
--- a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
@@ -1,5 +1,5 @@
 <module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes">
-	<importlibrary definition="msacm.spec.def" />
+	<importlibrary definition="msacm.spec" />
 	<include base="wavemap">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild
index 59205881b1e..799805fee37 100644
--- a/reactos/dll/win32/winmm/winmm.rbuild
+++ b/reactos/dll/win32/winmm/winmm.rbuild
@@ -8,7 +8,7 @@
 	<xi:include href="wavemap/wavemap.rbuild" />
 </directory>
 <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true">
-	<importlibrary definition="winmm.spec.def" />
+	<importlibrary definition="winmm.spec" />
 	<include base="winmm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild
index baa9b29f178..0cc4f790eb5 100644
--- a/reactos/dll/win32/wintrust/wintrust.rbuild
+++ b/reactos/dll/win32/wintrust/wintrust.rbuild
@@ -1,6 +1,6 @@
 <module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-	<importlibrary definition="wintrust.spec.def" />
+	<importlibrary definition="wintrust.spec" />
 	<include base="wintrust">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/wldap32/wldap32.rbuild b/reactos/dll/win32/wldap32/wldap32.rbuild
index 2829f918105..ca149a87e25 100644
--- a/reactos/dll/win32/wldap32/wldap32.rbuild
+++ b/reactos/dll/win32/wldap32/wldap32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wldap32" type="win32dll" baseaddress="${BASEADDRESS_WLDAP32}" installbase="system32" installname="wldap32.dll" allowwarnings="true">
-	<importlibrary definition="wldap32.spec.def" />
+	<importlibrary definition="wldap32.spec" />
 	<include base="wldap32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
index 6bf2724e9e7..dd64752960a 100644
--- a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
+++ b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes">
-	<importlibrary definition="wshtcpip.spec.def" />
+	<importlibrary definition="wshtcpip.spec" />
 	<include base="wshtcpip">.</include>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
index 89b77a161b8..c0bb0125481 100644
--- a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
+++ b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true">
-	<importlibrary definition="wtsapi32.spec.def" />
+	<importlibrary definition="wtsapi32.spec" />
 	<include base="wtsapi32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
diff --git a/reactos/drivers/base/bootvid/bootvid.rbuild b/reactos/drivers/base/bootvid/bootvid.rbuild
index a083300dc0d..895ab0bffbb 100644
--- a/reactos/drivers/base/bootvid/bootvid.rbuild
+++ b/reactos/drivers/base/bootvid/bootvid.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll">
-	<importlibrary definition="bootvid.spec.def"></importlibrary>
+	<importlibrary definition="bootvid.spec"></importlibrary>
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
 	<include base="bootvid">.</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/base/kdcom/kdcom.rbuild b/reactos/drivers/base/kdcom/kdcom.rbuild
index 5c28035f588..e1f6ade0b60 100644
--- a/reactos/drivers/base/kdcom/kdcom.rbuild
+++ b/reactos/drivers/base/kdcom/kdcom.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32" installname="kdcom.dll">
-	<importlibrary definition="kdcom.spec.def"></importlibrary>
+	<importlibrary definition="kdcom.spec"></importlibrary>
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
 	<include base="kdcom">.</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/directx/dxapi/dxapi.rbuild b/reactos/drivers/directx/dxapi/dxapi.rbuild
index 55dbdf266e9..8d6d446640e 100644
--- a/reactos/drivers/directx/dxapi/dxapi.rbuild
+++ b/reactos/drivers/directx/dxapi/dxapi.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dxapi" type="kernelmodedriver" 
 installbase="system32/drivers" installname="dxapi.sys">
-	<importlibrary definition="dxapi.spec.def" />
+	<importlibrary definition="dxapi.spec" />
 	<include base="dxapi">.</include>
 	<define name="__USE_W32API" />
 	<define name="_DXAPI_" />
diff --git a/reactos/drivers/directx/dxg/dxg.rbuild b/reactos/drivers/directx/dxg/dxg.rbuild
index 920183fa3b9..5747373114b 100644
--- a/reactos/drivers/directx/dxg/dxg.rbuild
+++ b/reactos/drivers/directx/dxg/dxg.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys">
-	<importlibrary definition="dxg.spec.def" />
+	<importlibrary definition="dxg.spec" />
 	<include base="dxg">.</include>
 	<include base="dxg">include</include>
 	<include base="ReactOS">subsystems/win32/win32k/include</include>
diff --git a/reactos/drivers/directx/dxgthk/dxgthk.rbuild b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
index c69bce2e9c4..a7de8b79655 100644
--- a/reactos/drivers/directx/dxgthk/dxgthk.rbuild
+++ b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dxgthk" type="kernelmodedriver" 
 installbase="system32/drivers" installname="dxgthk.sys">
-	<importlibrary definition="dxgthk.spec.def" />
+	<importlibrary definition="dxgthk.spec" />
 	<include base="dxgthk">.</include>
 	<define name="__USE_W32API" />
 	<library>win32k</library>
diff --git a/reactos/drivers/ksfilter/ks/ks.rbuild b/reactos/drivers/ksfilter/ks/ks.rbuild
index 4e9301005b3..e89c090aa31 100644
--- a/reactos/drivers/ksfilter/ks/ks.rbuild
+++ b/reactos/drivers/ksfilter/ks/ks.rbuild
@@ -4,7 +4,7 @@
 	<include base="ks">.</include>
 	<include base="ks">..</include>
 	<include base="ks">../include</include>
-	<importlibrary definition="ks.spec.def" />
+	<importlibrary definition="ks.spec" />
 	<library>ntoskrnl</library>
 	<define name="BUILDING_KS" />
 	<define name="_NTDDK_" />
diff --git a/reactos/drivers/network/tcpip/tcpip.rbuild b/reactos/drivers/network/tcpip/tcpip.rbuild
index 273f679de74..3919ba7a436 100644
--- a/reactos/drivers/network/tcpip/tcpip.rbuild
+++ b/reactos/drivers/network/tcpip/tcpip.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys">
-	<importlibrary definition="tcpip.spec.def" />
+	<importlibrary definition="tcpip.spec" />
 	<include base="tcpip">include</include>
 	<include base="oskittcp">include</include>
 	<define name="NDIS40" />
diff --git a/reactos/drivers/storage/class/class2/class2.rbuild b/reactos/drivers/storage/class/class2/class2.rbuild
index 769ef89f2e9..48ea7b56920 100644
--- a/reactos/drivers/storage/class/class2/class2.rbuild
+++ b/reactos/drivers/storage/class/class2/class2.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
-	<importlibrary definition="class2.spec.def" />
+	<importlibrary definition="class2.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>scsiport</library>
diff --git a/reactos/drivers/storage/ide/pciidex/pciidex.rbuild b/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
index 0691c33b3cf..2941d0f52a3 100644
--- a/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
+++ b/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys">
-	<importlibrary definition="pciidex.spec.def" />
+	<importlibrary definition="pciidex.spec" />
 	<library>ntoskrnl</library>
 	<file>fdo.c</file>
 	<file>miniport.c</file>
diff --git a/reactos/drivers/storage/port/diskdump/diskdump.rbuild b/reactos/drivers/storage/port/diskdump/diskdump.rbuild
index 35ff83526e2..df39c1636b0 100644
--- a/reactos/drivers/storage/port/diskdump/diskdump.rbuild
+++ b/reactos/drivers/storage/port/diskdump/diskdump.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
-	<importlibrary definition="diskdump.spec.def" />
+	<importlibrary definition="diskdump.spec" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/storage/scsiport/scsiport.rbuild b/reactos/drivers/storage/scsiport/scsiport.rbuild
index 98e4707fe50..81a67633467 100644
--- a/reactos/drivers/storage/scsiport/scsiport.rbuild
+++ b/reactos/drivers/storage/scsiport/scsiport.rbuild
@@ -3,7 +3,7 @@
 <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="_SCSIPORT_" />
-	<importlibrary definition="scsiport.spec.def" />
+	<importlibrary definition="scsiport.spec" />
 	<include base="scsiport">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/usb/usbd/usbd.rbuild b/reactos/drivers/usb/usbd/usbd.rbuild
index 5a9f43661cf..1759f89e7a7 100644
--- a/reactos/drivers/usb/usbd/usbd.rbuild
+++ b/reactos/drivers/usb/usbd/usbd.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys">
-	<importlibrary definition="usbd.spec.def" />
+	<importlibrary definition="usbd.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>usbd.c</file>
diff --git a/reactos/drivers/video/displays/framebuf/framebuf.rbuild b/reactos/drivers/video/displays/framebuf/framebuf.rbuild
index cdadcab0007..8426b162842 100644
--- a/reactos/drivers/video/displays/framebuf/framebuf.rbuild
+++ b/reactos/drivers/video/displays/framebuf/framebuf.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="framebuf" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll">
-	<importlibrary definition="framebuf.spec.def" />
+	<importlibrary definition="framebuf.spec" />
 	<include base="framebuf">.</include>
 	<library>win32k</library>
 	<library>libcntpr</library>
diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild b/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
index 47c32ec3e4d..bfc08f00751 100644
--- a/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
+++ b/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="framebufacc" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll">
-	<importlibrary definition="framebufacc.spec.def" />
+	<importlibrary definition="framebufacc.spec" />
 	<include base="framebufacc">.</include>
 	<library>win32k</library>
 	<library>libcntpr</library>
diff --git a/reactos/drivers/video/displays/vga/vgaddi.rbuild b/reactos/drivers/video/displays/vga/vgaddi.rbuild
index ca0d329f0e9..4166883f01d 100644
--- a/reactos/drivers/video/displays/vga/vgaddi.rbuild
+++ b/reactos/drivers/video/displays/vga/vgaddi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="vgaddi" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll">
-	<importlibrary definition="vgaddi.spec.def" />
+	<importlibrary definition="vgaddi.spec" />
 	<include base="vgaddi">.</include>
 	<library>libcntpr</library>
 	<library>win32k</library>
diff --git a/reactos/drivers/video/videoprt/videoprt.rbuild b/reactos/drivers/video/videoprt/videoprt.rbuild
index 4555223509e..a2e1304098e 100644
--- a/reactos/drivers/video/videoprt/videoprt.rbuild
+++ b/reactos/drivers/video/videoprt/videoprt.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys">
-	<importlibrary definition="videoprt.spec.def" />
+	<importlibrary definition="videoprt.spec" />
 	<include base="videoprt">.</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_VIDEOPORT_" />
diff --git a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
index 6f2fc9c06e2..fb4d99c3d9d 100644
--- a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
+++ b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
@@ -8,7 +8,7 @@
 	<linkerflag>-fno-rtti</linkerflag>
 	-->
 	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
-	<importlibrary definition="portcls.spec.def" />
+	<importlibrary definition="portcls.spec" />
 
 	<define name="_NTDDK_" />
 	<define name="PC_NO_IMPORTS" />
diff --git a/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
index beef05a26fb..ec0bf226283 100644
--- a/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
+++ b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
@@ -4,7 +4,7 @@
 	<include base="drmk">.</include>
 	<include base="drmk">..</include>
 	<include base="drmk">../include</include>
-	<importlibrary definition="drmk.spec.def" />
+	<importlibrary definition="drmk.spec" />
 	<library>ntoskrnl</library>
 	<define name="BUILDING_DRMK" />
 	<file>stubs.cpp</file>
diff --git a/reactos/drivers/wmi/wmilib.rbuild b/reactos/drivers/wmi/wmilib.rbuild
index 27501ff536c..edfaa729329 100644
--- a/reactos/drivers/wmi/wmilib.rbuild
+++ b/reactos/drivers/wmi/wmilib.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys">
-	<importlibrary definition="wmilib.spec.def" />
+	<importlibrary definition="wmilib.spec" />
 	<include base="wmilib">.</include>
 	<library>ntoskrnl</library>
 	<file>wmilib.c</file>
diff --git a/reactos/hal/hal/hal.rbuild b/reactos/hal/hal/hal.rbuild
index 83daee13152..564920b85c0 100644
--- a/reactos/hal/hal/hal.rbuild
+++ b/reactos/hal/hal/hal.rbuild
@@ -14,7 +14,7 @@
     </if>
     <if property="ARCH" value="i386">
 	<module name="hal" type="kernelmodedll">
-		<importlibrary definition="hal.spec.def" />
+		<importlibrary definition="hal.spec" />
 		<include base="ntoskrnl">include</include>
 		<library>ntoskrnl</library>
 		<define name="_NTHAL_" />
diff --git a/reactos/hal/halarm/up/halup.rbuild b/reactos/hal/halarm/up/halup.rbuild
index 1d13227b541..c2950733365 100644
--- a/reactos/hal/halarm/up/halup.rbuild
+++ b/reactos/hal/halarm/up/halup.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll">
-	<importlibrary base="hal" definition="hal.spec.def" />
+	<importlibrary base="hal" definition="hal.spec" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halarm_generic">../include</include>
 	<include base="ntoskrnl">include</include>
diff --git a/reactos/hal/halx86/halmp.rbuild b/reactos/hal/halx86/halmp.rbuild
index 55954536167..724e7896531 100644
--- a/reactos/hal/halx86/halmp.rbuild
+++ b/reactos/hal/halx86/halmp.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="halmp" type="kernelmodedll" entrypoint="0">
-		<importlibrary base="hal" definition="hal.spec.def" />
+		<importlibrary base="hal" definition="hal.spec" />
 		<bootstrap installbase="$(CDOUTPUT)" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
diff --git a/reactos/hal/halx86/halup.rbuild b/reactos/hal/halx86/halup.rbuild
index c588db52f8e..c206b7ed8a7 100644
--- a/reactos/hal/halx86/halup.rbuild
+++ b/reactos/hal/halx86/halup.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll">
-		<importlibrary base="hal" definition="hal.spec.def" />
+		<importlibrary base="hal" definition="hal.spec" />
 		<bootstrap installbase="$(CDOUTPUT)" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
diff --git a/reactos/hal/halx86/halxbox.rbuild b/reactos/hal/halx86/halxbox.rbuild
index 6dff278830f..923583a7e6a 100644
--- a/reactos/hal/halx86/halxbox.rbuild
+++ b/reactos/hal/halx86/halxbox.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true">
-		<importlibrary base="hal" definition="hal.spec.def" />
+		<importlibrary base="hal" definition="hal.spec" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/debugsup/debugsup-ntos.def b/reactos/lib/debugsup/debugsup-ntos.def
deleted file mode 100644
index 6c6164c6b64..00000000000
--- a/reactos/lib/debugsup/debugsup-ntos.def
+++ /dev/null
@@ -1,11 +0,0 @@
-EXPORTS
-DbgBreakPoint@0
-DbgBreakPointWithStatus@4
-DbgPrint
-DbgPrompt@12
-DbgPrintEx
-vDbgPrintExWithPrefix@20
-RtlAssert@16
-RtlUnwind@16
-
-;EOF
diff --git a/reactos/lib/debugsup/debugsup-ntos.spec b/reactos/lib/debugsup/debugsup-ntos.spec
new file mode 100644
index 00000000000..f7ec548c629
--- /dev/null
+++ b/reactos/lib/debugsup/debugsup-ntos.spec
@@ -0,0 +1,8 @@
+@ stdcall DbgBreakPoint()
+@ stdcall DbgBreakPointWithStatus(long)
+@ varargs DbgPrint()
+@ varargs DbgPrintEx()
+@ stdcall DbgPrompt(ptr ptr long)
+@ stdcall RtlAssert(ptr ptr long ptr)
+@ stdcall RtlUnwind(ptr ptr ptr ptr)
+@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)
diff --git a/reactos/lib/debugsup/debugsup.rbuild b/reactos/lib/debugsup/debugsup.rbuild
index 726633a770e..3e833c9b8fb 100644
--- a/reactos/lib/debugsup/debugsup.rbuild
+++ b/reactos/lib/debugsup/debugsup.rbuild
@@ -2,9 +2,9 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
 	<module name="debugsup_ntoskrnl" type="staticlibrary">
-		<importlibrary definition="debugsup-ntos.def" dllname="ntoskrnl.exe" />
+		<importlibrary definition="debugsup-ntos.spec" dllname="ntoskrnl.exe" />
 	</module>
 	<module name="debugsup_ntdll" type="staticlibrary">
-		<importlibrary definition="debugsup-ntos.def" dllname="ntdll.dll" />
+		<importlibrary definition="debugsup-ntos.spec" dllname="ntdll.dll" />
 	</module>
 </group>
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index a015affecc0..c72712df415 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bootstrap installbase="$(CDOUTPUT)" />
-	<importlibrary definition="ntoskrnl.spec.def" />
+	<importlibrary definition="ntoskrnl.spec" />
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__NTOSKRNL__" />
 	<define name="_NTOSKRNL_" />
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 531c008dd8d..0f98bf0a27a 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -310,6 +310,7 @@ void
 MingwModuleHandler::OutputCopyCommand ( const FileLocation& source,
                                         const FileLocation& destination )
 {
+	fprintf ( fMakefile, "# OUTPUT COPY COMMAND\n" );
 	fprintf ( fMakefile,
 	          "\t$(ECHO_CP)\n" );
 	fprintf ( fMakefile,
@@ -408,7 +409,7 @@ MingwModuleHandler::GetObjectFilename (
 	else if ( extension == ".mc" || extension == ".MC" )
 		newExtension = ".rc";
 	else if ( extension == ".spec" || extension == ".SPEC" )
-		newExtension = ".stubs.o";
+		newExtension = "_" + module.name + ".stubs.o";
 	else if ( extension == ".idl" || extension == ".IDL" )
 	{
 		if ( module.type == RpcServer )
@@ -460,6 +461,7 @@ MingwModuleHandler::GenerateCleanTarget () const
 	if ( module.type == Alias )
 		return;
 
+	fprintf ( fMakefile, "# CLEAN TARGET\n" );
 	fprintf ( fMakefile,
 	          ".PHONY: %s_clean\n",
 	          module.name.c_str() );
@@ -501,6 +503,7 @@ MingwModuleHandler::GenerateInstallTarget () const
 {
 	if ( !module.install )
 		return;
+	fprintf ( fMakefile, "# INSTALL TARGET\n" );
 	fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() );
 	fprintf ( fMakefile,
 	          "%s_install: %s\n",
@@ -511,6 +514,7 @@ MingwModuleHandler::GenerateInstallTarget () const
 void
 MingwModuleHandler::GenerateDependsTarget () const
 {
+	fprintf ( fMakefile, "# DEPENDS TARGET\n" );
 	fprintf ( fMakefile,
 	          ".PHONY: %s_depends\n",
 	          module.name.c_str() );
@@ -783,6 +787,7 @@ MingwModuleHandler::GenerateMacros (
 	const vector<LinkerFlag*>* linkerFlags,
 	set<const Define *>& used_defs )
 {
+	fprintf ( fMakefile, "# MACROS\n" );
 	GenerateMacro ( assignmentOperation,
 	                cflagsMacro,
 	                data,
@@ -841,6 +846,7 @@ MingwModuleHandler::GenerateSourceMacros (
 {
 	size_t i;
 
+	fprintf ( fMakefile, "# SOURCE MACROS\n" );
 	const vector<CompilationUnit*>& compilationUnits = data.compilationUnits;
 	vector<const FileLocation *> headers;
 	if ( compilationUnits.size () > 0 )
@@ -887,6 +893,7 @@ MingwModuleHandler::GenerateObjectMacros (
 	vector<const FileLocation *> headers;
 	vector<const FileLocation *> mcheaders;
 	vector<const FileLocation *> mcresources;
+	fprintf ( fMakefile, "# OBJECT MACROS\n" );
 	if ( compilationUnits.size () > 0 )
 	{
 		for ( i = 0; i < compilationUnits.size (); i++ )
@@ -1022,7 +1029,7 @@ MingwModuleHandler::GetPrecompiledHeaderFilename () const
 	                          module.pch->file->name + ".gch" );
 }
 
-Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",
+Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
 Rule arRule2 ( "\t$(ECHO_AR)\n"
@@ -1064,32 +1071,36 @@ Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc",
                "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
-                       "\t$(ECHO_WINEBLD)\n"
-                       "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
-                       "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n"
+Rule winebuildKMDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+						  "\t$(ECHO_WINEBLD)\n"
+						  "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
+						  "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n\n",
+						  "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
+						  "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def",
+						  "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
+Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c:\n"
                        "\t${cp} $(NUL) $@ 1>$(NUL)\n"
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
                        "\t$(ECHO_CC)\n"
                        "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
                        "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
-                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
+                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c",
+                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o",
                        "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule winebuildDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+						"\t$(ECHO_WINEBLD)\n"
+						"\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(source)\n\n",
+						"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
+						"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def",
+						"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
+Rule winebuildRule (                      "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
                      "\t$(ECHO_WINEBLD)\n"
-                     "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n"
-                     "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
-                     "\t$(ECHO_WINEBLD)\n"
-                     "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n"
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                     "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n"
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
                      "\t$(ECHO_CC)\n"
                      "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
-                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c",
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
 Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n"
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
@@ -1281,6 +1292,8 @@ MingwModuleHandler::GenerateCommands (
 	size_t i;
 	Rule *customRule = NULL;
 
+	fprintf ( fMakefile, "# COMMANDS\n" );
+
 	for ( i = 0; i < sizeof ( rules ) / sizeof ( rules[0] ); i++ )
 	{
 		if ( rules[i].host != HostDontCare && rules[i].host != ModuleHandlerInformations[module.type].DefaultHost )
@@ -1314,6 +1327,8 @@ MingwModuleHandler::GenerateCommands (
 void
 MingwModuleHandler::GenerateBuildMapCode ( const FileLocation *mapTarget )
 {
+	fprintf ( fMakefile, "# BUILD MAP CODE\n" );
+
 	fprintf ( fMakefile,
 	          "ifeq ($(ROS_BUILDMAP),full)\n" );
 
@@ -1351,6 +1366,8 @@ MingwModuleHandler::GenerateBuildMapCode ( const FileLocation *mapTarget )
 void
 MingwModuleHandler::GenerateBuildNonSymbolStrippedCode ()
 {
+	fprintf ( fMakefile, "# BUILD NO STRIP CODE\n" );
+
 	fprintf ( fMakefile,
 	          "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" );
 
@@ -1427,6 +1444,7 @@ MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const
 void
 MingwModuleHandler::GenerateRunRsymCode () const
 {
+	fprintf ( fMakefile, "# RUN RSYM CODE\n" );
 	fprintf ( fMakefile,
              "ifneq ($(ROS_GENERATE_RSYM),no)\n" );
 	fprintf ( fMakefile,
@@ -1440,6 +1458,7 @@ MingwModuleHandler::GenerateRunRsymCode () const
 void
 MingwModuleHandler::GenerateRunStripCode () const
 {
+	fprintf ( fMakefile, "# RUN STRIP CODE\n" );
 	fprintf ( fMakefile,
 	          "ifeq ($(ROS_LEAN_AND_MEAN),yes)\n" );
 	fprintf ( fMakefile,
@@ -1462,6 +1481,8 @@ MingwModuleHandler::GenerateLinkerCommand (
 	string objectsMacro = GetObjectsMacro ( module );
 	string libsMacro = GetLibsMacro ();
 
+	fprintf ( fMakefile, "# LINKER COMMAND\n" );
+
 	string target_macro ( GetTargetMacro ( module ) );
 	string target_folder ( backend->GetFullPath ( *target_file ) );
 
@@ -1555,6 +1576,7 @@ MingwModuleHandler::GeneratePhonyTarget() const
 	string targetMacro ( GetTargetMacro ( module ) );
 	const FileLocation *target_file = GetTargetFilename ( module, NULL );
 
+	fprintf ( fMakefile, "# PHONY TARGET\n" );
 	fprintf ( fMakefile,
 	          ".PHONY: %s\n\n",
 	          targetMacro.c_str ());
@@ -1571,6 +1593,8 @@ MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data )
 	size_t i;
 	string moduleDependencies;
 
+	fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" );
+
 	const vector<CompilationUnit*>& compilationUnits = data.compilationUnits;
 	for ( i = 0; i < compilationUnits.size (); i++ )
 	{
@@ -1607,6 +1631,8 @@ MingwModuleHandler::GenerateObjectFileTargets ()
 {
 	const FileLocation *pchFilename = GetPrecompiledHeaderFilename ();
 
+	fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" );
+
 	if ( pchFilename )
 	{
 		string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" );
@@ -1646,10 +1672,17 @@ MingwModuleHandler::GenerateArchiveTarget ()
 	const FileLocation *archiveFilename = GetModuleArchiveFilename ();
 	const FileLocation *definitionFilename = GetDefinitionFilename ();
 
-	arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );
+	fprintf ( fMakefile, "# ARCHIVE TARGET\n" );
 
 	if ( IsStaticLibrary ( module ) && definitionFilename )
 	{
+		arRule1.Execute ( fMakefile,
+						  backend,
+						  module,
+						  archiveFilename,
+						  clean_files,
+						  backend->GetFullName ( *definitionFilename ).c_str () );
+
 		fprintf ( fMakefile,
 		          "\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n",
 		          module.importLibrary->dllname.c_str (),
@@ -1657,6 +1690,8 @@ MingwModuleHandler::GenerateArchiveTarget ()
 		          module.mangledSymbols ? "" : " --kill-at",
 		          module.underscoreSymbols ? " --add-underscore" : "" );
 	}
+	else
+		arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );
 
 	if ( definitionFilename )
 		delete definitionFilename;
@@ -1745,6 +1780,7 @@ MingwModuleHandler::GenerateObjectMacro ()
 void
 MingwModuleHandler::GenerateTargetMacro ()
 {
+	fprintf ( fMakefile, "# TARGET MACRO\n" );
 	fprintf ( fMakefile,
 		"%s := %s\n",
 		GetTargetMacro ( module, false ).c_str (),
@@ -1806,6 +1842,8 @@ MingwModuleHandler::GenerateOtherMacros ()
 {
 	set<const Define *> used_defs;
 
+	fprintf ( fMakefile, "# OTHER MACROS\n" );
+
 	cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
 	nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
 	windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
@@ -1829,21 +1867,11 @@ MingwModuleHandler::GenerateOtherMacros ()
 			used_defs );
 	}
 
-	vector<FileLocation> s;
-	if ( module.importLibrary )
-	{
-		const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits;
-		for ( size_t i = 0; i < compilationUnits.size (); i++ )
-		{
-			CompilationUnit& compilationUnit = *compilationUnits[i];
-			const FileLocation& sourceFile = compilationUnit.GetFilename ();
-			string extension = GetExtension ( sourceFile );
-			if ( extension == ".spec" || extension == ".SPEC" )
-				GetSpecObjectDependencies ( s, &sourceFile );
-		}
-	}
-	if ( s.size () > 0 )
+	if ( IsWineModule() )
 	{
+		vector<FileLocation> s;
+		GetSpecImplibDependencies ( s, module.importLibrary->source );
+
 		fprintf (
 			fMakefile,
 			"%s +=",
@@ -1971,6 +1999,7 @@ MingwModuleHandler::GenerateOtherMacros ()
 void
 MingwModuleHandler::GenerateRules ()
 {
+	fprintf ( fMakefile, "# RULES\n" );
 	string targetMacro = GetTargetMacro ( module );
 	//CLEAN_FILE ( targetMacro );
 	CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) );
@@ -1997,6 +2026,18 @@ MingwModuleHandler::GenerateRules ()
 		delete ar_target;
 	}
 
+	if ( IsWineModule() )
+	{
+		Rule * defRule;
+
+		if ( module.type == Kernel || module.type == KernelModeDLL || module.type == KernelModeDriver )
+			defRule = &winebuildKMDefRule;
+		else
+			defRule = &winebuildDefRule;
+
+		defRule->Execute ( fMakefile, backend, module, module.importLibrary->source, clean_files );
+	}
+
 	GenerateObjectFileTargets ();
 }
 
@@ -2021,6 +2062,8 @@ MingwModuleHandler::GenerateInvocations () const
 	if ( module.invocations.size () == 0 )
 		return;
 
+	fprintf ( fMakefile, "# INVOCATIONS\n" );
+
 	size_t iend = module.invocations.size ();
 	for ( size_t i = 0; i < iend; i++ )
 	{
@@ -2117,6 +2160,7 @@ MingwModuleHandler::GetDefaultDependencies (
 void
 MingwModuleHandler::GeneratePreconditionDependencies ()
 {
+	fprintf ( fMakefile, "# PRECONDITION DEPENDENCIES\n" );
 	string preconditionDependenciesName = GetPreconditionDependenciesName ();
 	string_list dependencies;
 	GetDefaultDependencies ( dependencies );
@@ -2145,7 +2189,7 @@ MingwModuleHandler::IsWineModule () const
 	if ( module.importLibrary == NULL)
 		return false;
 
-	size_t index = module.importLibrary->source->name.rfind ( ".spec.def" );
+	size_t index = module.importLibrary->source->name.rfind ( ".spec" );
 	return ( index != string::npos );
 }
 
@@ -2156,15 +2200,18 @@ MingwModuleHandler::GetDefinitionFilename () const
 	if ( module.importLibrary == NULL )
 		return NULL;
 
-	DirectoryLocation directory;
 	if ( IsWineModule () )
-		directory = IntermediateDirectory;
+	{
+		return new FileLocation ( IntermediateDirectory,
+								  module.importLibrary->source->relative_path,
+								  GetBasename ( module.importLibrary->source->name ) + "_" + module.name + ".spec.def" );
+	}
 	else
-		directory = SourceDirectory;
-
-	return new FileLocation ( directory,
-	                          module.importLibrary->source->relative_path,
-	                          module.importLibrary->source->name );
+	{
+		return new FileLocation ( SourceDirectory,
+								  module.importLibrary->source->relative_path,
+								  module.importLibrary->source->name );
+	}
 }
 
 void
@@ -2179,7 +2226,7 @@ MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
 		vector<FileLocation> deps;
 		GetDefinitionDependencies ( deps );
 
-		fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" );
+		fprintf ( fMakefile, "# IMPORT LIBRARY RULE\n" );
 
 		fprintf ( fMakefile, "%s:",
 		          backend->GetFullName ( *library_target ).c_str () );
@@ -2220,17 +2267,19 @@ MingwModuleHandler::GetSpecObjectDependencies (
 	vector<FileLocation>& dependencies,
 	const FileLocation *file ) const
 {
-	string basename = GetBasename ( file->name );
-
-	FileLocation defDependency ( IntermediateDirectory,
-	                             file->relative_path,
-	                             basename + ".spec.def" );
-	dependencies.push_back ( defDependency );
+	dependencies.push_back ( FileLocation ( IntermediateDirectory,
+											file->relative_path,
+											GetBasename ( file->name ) + "_" + module.name + ".stubs.c" ) );
+}
 
-	FileLocation stubsDependency ( IntermediateDirectory,
-	                               file->relative_path,
-	                             basename + ".stubs.c" );
-	dependencies.push_back ( stubsDependency );
+void
+MingwModuleHandler::GetSpecImplibDependencies (
+	vector<FileLocation>& dependencies,
+	const FileLocation *file ) const
+{
+	dependencies.push_back ( FileLocation ( IntermediateDirectory,
+											file->relative_path,
+											GetBasename ( file->name ) + "_" + module.name + ".spec.def" ) );
 }
 
 void
@@ -2337,6 +2386,8 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ()
 
 	GenerateRules ();
 
+	fprintf ( fMakefile, "# BUILD TOOL MODULE TARGET\n" );
+
 	string linker;
 	if ( module.cplusplus )
 		linker = "${host_gpp}";
@@ -2844,6 +2895,8 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
 
 	GenerateRules ();
 
+	fprintf ( fMakefile, "# BOOT LOADER MODULE TARGET\n" );
+
 	const FileLocation *target_file = GetTargetFilename ( module, NULL );
 	fprintf ( fMakefile, "%s: %s %s | %s\n",
 	          targetMacro.c_str (),
@@ -2920,6 +2973,8 @@ MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget ()
 
 	GenerateRules ();
 
+	fprintf ( fMakefile, "# BOOT PROGRAM MODULE TARGET\n" );
+
 	const FileLocation *target_file = GetTargetFilename ( module, NULL );
 	fprintf ( fMakefile, "%s: %s %s %s | %s\n",
 	          targetMacro.c_str (),
@@ -3094,6 +3149,7 @@ MingwIsoModuleHandler::GetCdFiles (
 void
 MingwIsoModuleHandler::GenerateIsoModuleTarget ()
 {
+	fprintf ( fMakefile, "# ISO MODULE TARGET\n" );
 	string bootcdDirectory = "cd";
 	FileLocation bootcd ( OutputDirectory,
 	                      bootcdDirectory,
@@ -3287,6 +3343,7 @@ MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory )
 void
 MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
 {
+	fprintf ( fMakefile, "# REGISTRY COMMANDS\n" );
 	FileLocation reactosSystem32ConfigDirectory ( OutputDirectory,
 	                                              livecdDirectory + sSep + "reactos" + sSep + "system32" + sSep + "config",
 	                                              "" );
@@ -3301,6 +3358,7 @@ MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
 void
 MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget ()
 {
+	fprintf ( fMakefile, "# LIVE ISO MODULE TARGET\n" );
 	string livecdDirectory = module.name;
 	FileLocation livecd ( OutputDirectory, livecdDirectory, "" );
 
@@ -3435,6 +3493,7 @@ MingwCabinetModuleHandler::Process ()
 
 	GenerateRules ();
 
+	fprintf ( fMakefile, "# CABINET MODULE TARGET\n" );
 	const FileLocation *target_file = GetTargetFilename ( module, NULL );
 	fprintf ( fMakefile, "%s: $(CABMAN_TARGET) | %s\n",
 	          targetMacro.c_str (),
@@ -3466,6 +3525,7 @@ MingwElfExecutableModuleHandler::Process ()
 
 	GenerateRules ();
 
+	fprintf ( fMakefile, "# ELF EXECUTABLE TARGET\n" );
 	const FileLocation *target_file = GetTargetFilename ( module, NULL );
 	fprintf ( fMakefile, "%s: %s %s | %s\n",
 	          targetMacro.c_str (),
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index ac300459a82..bf5e4a6e16d 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -148,6 +148,8 @@ private:
 	                                 const FileLocation *file ) const;
 	void GetSpecObjectDependencies ( std::vector<FileLocation>& dependencies,
 	                                 const FileLocation *file ) const;
+	void GetSpecImplibDependencies ( std::vector<FileLocation>& dependencies,
+	                                 const FileLocation *file ) const;
 	void GetWidlObjectDependencies ( std::vector<FileLocation>& dependencies,
 	                                 const FileLocation *file ) const;
 	void GetDefaultDependencies ( string_list& dependencies ) const;
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index e224743c058..d84ecc9059f 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1713,12 +1713,6 @@ ImportLibrary::ImportLibrary ( const Project& project,
 			                                       "root",
 			                                       att->value );
 	}
-	else
-	{
-		size_t index = definition->value.rfind ( ".spec.def" );
-		if ( index != string::npos )
-			directory = IntermediateDirectory;
-	}
 
 	if ( dllname )
 		this->dllname = dllname->value;
-- 
2.17.1