diff --git a/reactos/base/applications/cacls/cacls.rbuild b/reactos/base/applications/cacls/cacls.rbuild
index e77cf691023..96b8fbee462 100644
--- a/reactos/base/applications/cacls/cacls.rbuild
+++ b/reactos/base/applications/cacls/cacls.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
 	<include base="cacls">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
 	<library>user32</library>
diff --git a/reactos/base/applications/calc/calc.rbuild b/reactos/base/applications/calc/calc.rbuild
index 76a6aee2de1..325ab22970b 100644
--- a/reactos/base/applications/calc/calc.rbuild
+++ b/reactos/base/applications/calc/calc.rbuild
@@ -4,7 +4,6 @@
 	<include base="calc">.</include>
 	<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>about.c</file>
diff --git a/reactos/base/applications/charmap/charmap.rbuild b/reactos/base/applications/charmap/charmap.rbuild
index 1970a4a5418..76a1d64155b 100644
--- a/reactos/base/applications/charmap/charmap.rbuild
+++ b/reactos/base/applications/charmap/charmap.rbuild
@@ -3,7 +3,6 @@
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<compilationunit name="unit.c">
diff --git a/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild b/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild
index d3c2e90b511..7fae9cfe87a 100644
--- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild
+++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
-	<library>kernel32</library>
 	<file>dbgprint.c</file>
 </module>
diff --git a/reactos/base/applications/cmdutils/doskey/doskey.rbuild b/reactos/base/applications/cmdutils/doskey/doskey.rbuild
index 4793ff300d2..f38eb3009d7 100644
--- a/reactos/base/applications/cmdutils/doskey/doskey.rbuild
+++ b/reactos/base/applications/cmdutils/doskey/doskey.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>doskey.c</file>
 	<file>doskey.rc</file>
diff --git a/reactos/base/applications/cmdutils/find/find.rbuild b/reactos/base/applications/cmdutils/find/find.rbuild
index 7df9b9a58bc..84a700aa724 100644
--- a/reactos/base/applications/cmdutils/find/find.rbuild
+++ b/reactos/base/applications/cmdutils/find/find.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="find" type="win32cui" installbase="system32" installname="find.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>find.c</file>
 	<file>find.rc</file>
diff --git a/reactos/base/applications/cmdutils/hostname/hostname.rbuild b/reactos/base/applications/cmdutils/hostname/hostname.rbuild
index 4a281d45600..ed747aac6f7 100644
--- a/reactos/base/applications/cmdutils/hostname/hostname.rbuild
+++ b/reactos/base/applications/cmdutils/hostname/hostname.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
-	<library>kernel32</library>
 	<file>hostname.c</file>
 	<file>hostname.rc</file>
 </module>
diff --git a/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild b/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild
index 099497e467d..ea5e7cf1198 100644
--- a/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild
+++ b/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="lodctr" type="win32cui" installbase="system32" installname="lodctr.exe" unicode="yes">
-	<library>kernel32</library>
 	<library>loadperf</library>
 	<library>wine</library>
 	<file>lodctr_main.c</file>
diff --git a/reactos/base/applications/cmdutils/more/more.rbuild b/reactos/base/applications/cmdutils/more/more.rbuild
index bfe3b74c79c..c94585a53ba 100644
--- a/reactos/base/applications/cmdutils/more/more.rbuild
+++ b/reactos/base/applications/cmdutils/more/more.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="more" type="win32cui" installbase="system32" installname="more.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
 	<file>more.c</file>
diff --git a/reactos/base/applications/cmdutils/reg/reg.rbuild b/reactos/base/applications/cmdutils/reg/reg.rbuild
index 2daf43b51f3..ce9a744808d 100644
--- a/reactos/base/applications/cmdutils/reg/reg.rbuild
+++ b/reactos/base/applications/cmdutils/reg/reg.rbuild
@@ -4,7 +4,6 @@
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<file>reg.c</file>
 	<file>rsrc.rc</file>
 </module>
diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild b/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
index 9841a3a2a0f..2e3e1a9809d 100644
--- a/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
+++ b/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
@@ -5,7 +5,6 @@
 	<library>wine</library>
 	<library>shell32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<file>xcopy.c</file>
 	<file>rsrc.rc</file>
 	<metadata description="xcopy command-line tool" />
diff --git a/reactos/base/applications/control/control.rbuild b/reactos/base/applications/control/control.rbuild
index 5f8d580188d..2fe410ec9c7 100644
--- a/reactos/base/applications/control/control.rbuild
+++ b/reactos/base/applications/control/control.rbuild
@@ -3,7 +3,6 @@
 <module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
 	<include base="control">.</include>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>shell32</library>
 	<file>control.c</file>
 	<file>control.rc</file>
diff --git a/reactos/base/applications/downloader/downloader.rbuild b/reactos/base/applications/downloader/downloader.rbuild
index 6aca8fc5acc..9ea43dc81f4 100644
--- a/reactos/base/applications/downloader/downloader.rbuild
+++ b/reactos/base/applications/downloader/downloader.rbuild
@@ -5,7 +5,6 @@
 		<include base="downloader">.</include>
 		<include base="expat">.</include>
 
-		<library>kernel32</library>
 		<library>advapi32</library>
 		<library>ntdll</library>
 		<library>user32</library>
diff --git a/reactos/base/applications/dxdiag/dxdiag.rbuild b/reactos/base/applications/dxdiag/dxdiag.rbuild
index d4d336f2f3d..1da09c53cdd 100644
--- a/reactos/base/applications/dxdiag/dxdiag.rbuild
+++ b/reactos/base/applications/dxdiag/dxdiag.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
 	<include base="dxdiag">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>comctl32</library>
diff --git a/reactos/base/applications/fontview/fontview.rbuild b/reactos/base/applications/fontview/fontview.rbuild
index ba4f5b9cade..8ceda786c4b 100644
--- a/reactos/base/applications/fontview/fontview.rbuild
+++ b/reactos/base/applications/fontview/fontview.rbuild
@@ -3,7 +3,6 @@
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>shell32</library>
-	<library>kernel32</library>
 	<file>fontview.c</file>
 	<file>display.c</file>
 	<file>fontview.rc</file>
diff --git a/reactos/base/applications/games/winemine/winemine.rbuild b/reactos/base/applications/games/winemine/winemine.rbuild
index c2f7e66047a..5f6a52a51af 100644
--- a/reactos/base/applications/games/winemine/winemine.rbuild
+++ b/reactos/base/applications/games/winemine/winemine.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="winemine" type="win32gui" installbase="system32" installname="winemine.exe" unicode="yes">
 	<include base="winemine">.</include>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/applications/hh/hh.rbuild b/reactos/base/applications/hh/hh.rbuild
index abc1c513e07..c81f6680097 100644
--- a/reactos/base/applications/hh/hh.rbuild
+++ b/reactos/base/applications/hh/hh.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
 	<include base="hh">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>main.c</file>
diff --git a/reactos/base/applications/iexplore/iexplore.rbuild b/reactos/base/applications/iexplore/iexplore.rbuild
index 8fb8dcd1ab3..807526ae86c 100644
--- a/reactos/base/applications/iexplore/iexplore.rbuild
+++ b/reactos/base/applications/iexplore/iexplore.rbuild
@@ -2,10 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="iexplore" type="win32gui" installbase="system32" installname="iexplore.exe" unicode="no">
 	<include base="iexplore">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-        <library>shdocvw</library>
+	<library>shdocvw</library>
 	<file>main.c</file>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
index 71ead6f7cbd..f459343e6c3 100644
--- a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
+++ b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
@@ -3,7 +3,6 @@
 <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
 	<importlibrary definition="kbsdll.spec" />
 	<include base="kbsdll">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<file>kbsdll.c</file>
diff --git a/reactos/base/applications/kbswitch/kbswitch.rbuild b/reactos/base/applications/kbswitch/kbswitch.rbuild
index c107f0a6d4d..2eed0b22bb0 100644
--- a/reactos/base/applications/kbswitch/kbswitch.rbuild
+++ b/reactos/base/applications/kbswitch/kbswitch.rbuild
@@ -2,7 +2,6 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes">
 	<include base="kbswitch">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>shell32</library>
diff --git a/reactos/base/applications/logoff/logoff.rbuild b/reactos/base/applications/logoff/logoff.rbuild
index a69e916adbc..d53f79499e4 100644
--- a/reactos/base/applications/logoff/logoff.rbuild
+++ b/reactos/base/applications/logoff/logoff.rbuild
@@ -4,7 +4,6 @@
 	<include base="logoff">.</include>
 	<library>advapi32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<file>misc.c</file>
 	<file>logoff.c</file>
 	<file>logoff.rc</file>
diff --git a/reactos/base/applications/magnify/magnify.rbuild b/reactos/base/applications/magnify/magnify.rbuild
index 08ffe958068..c891a1e14d1 100644
--- a/reactos/base/applications/magnify/magnify.rbuild
+++ b/reactos/base/applications/magnify/magnify.rbuild
@@ -6,7 +6,6 @@
 	<library>gdi32</library>
 	<library>advapi32</library>
 	<library>shell32</library>
-	<library>kernel32</library>
 	<file>magnifier.c</file>
 	<file>settings.c</file>
 	<file>magnify.rc</file>
diff --git a/reactos/base/applications/mmc/mmc.rbuild b/reactos/base/applications/mmc/mmc.rbuild
index cd2cb87790c..8976acd569e 100644
--- a/reactos/base/applications/mmc/mmc.rbuild
+++ b/reactos/base/applications/mmc/mmc.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes">
 	<include base="mmcclient">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comdlg32</library>
diff --git a/reactos/base/applications/mplay32/mplay32.rbuild b/reactos/base/applications/mplay32/mplay32.rbuild
index d920e958605..c472e6f0207 100644
--- a/reactos/base/applications/mplay32/mplay32.rbuild
+++ b/reactos/base/applications/mplay32/mplay32.rbuild
@@ -3,7 +3,6 @@
 	<library>advapi32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>winmm</library>
diff --git a/reactos/base/applications/msconfig/msconfig.rbuild b/reactos/base/applications/msconfig/msconfig.rbuild
index ac5800db399..958125f2d0f 100644
--- a/reactos/base/applications/msconfig/msconfig.rbuild
+++ b/reactos/base/applications/msconfig/msconfig.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
 	<include base="msconfig">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>version</library>
diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild b/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
index e0244eadd4a..a5f6844f06a 100644
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
+++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
@@ -5,7 +5,6 @@
 	<library>ntdll</library>
 	<library>setupapi</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild b/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
index 4a1e6782086..367c19e5bb4 100644
--- a/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
+++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
@@ -2,7 +2,6 @@
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes">
 	<include base="eventvwr">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/applications/mscutils/servman/servman.rbuild b/reactos/base/applications/mscutils/servman/servman.rbuild
index d8f0c174ee3..02ed3a2804b 100644
--- a/reactos/base/applications/mscutils/servman/servman.rbuild
+++ b/reactos/base/applications/mscutils/servman/servman.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes">
 	<include base="servman">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/applications/mstsc/mstsc.rbuild b/reactos/base/applications/mstsc/mstsc.rbuild
index 4d0f5f9eeac..e2000ef0951 100644
--- a/reactos/base/applications/mstsc/mstsc.rbuild
+++ b/reactos/base/applications/mstsc/mstsc.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes">
 	<include base="mstsc">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/base/applications/network/arp/arp.rbuild b/reactos/base/applications/network/arp/arp.rbuild
index 855fa1459ea..ed2e096b15d 100644
--- a/reactos/base/applications/network/arp/arp.rbuild
+++ b/reactos/base/applications/network/arp/arp.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
 	<include base="arp">.</include>
-	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>
 	<library>shlwapi</library>
diff --git a/reactos/base/applications/network/dwnl/dwnl.rbuild b/reactos/base/applications/network/dwnl/dwnl.rbuild
index 5201bd83291..36c30c0459c 100644
--- a/reactos/base/applications/network/dwnl/dwnl.rbuild
+++ b/reactos/base/applications/network/dwnl/dwnl.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dwnl" type="win32cui" installbase="system32" installname="dwnl.exe" unicode="yes">
 	<include base="dwnl">.</include>
-	<library>kernel32</library>
 	<library>urlmon</library>
 	<library>wininet</library>
 	<library>uuid</library>
diff --git a/reactos/base/applications/network/finger/finger.rbuild b/reactos/base/applications/network/finger/finger.rbuild
index 7e4dcbf5703..fd25abc54d0 100644
--- a/reactos/base/applications/network/finger/finger.rbuild
+++ b/reactos/base/applications/network/finger/finger.rbuild
@@ -3,7 +3,6 @@
 <module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
 	<include base="finger">.</include>
 	<define name="__USE_W32_SOCKETS" />
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>finger.c</file>
 	<file>err.c</file>
diff --git a/reactos/base/applications/network/ftp/ftp.rbuild b/reactos/base/applications/network/ftp/ftp.rbuild
index dd43d65f73b..193fa6e8ebd 100644
--- a/reactos/base/applications/network/ftp/ftp.rbuild
+++ b/reactos/base/applications/network/ftp/ftp.rbuild
@@ -15,7 +15,6 @@
 	<define name="write">_write</define>
 	<define name="lseek">_lseek</define>
 
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<file>cmds.c</file>
diff --git a/reactos/base/applications/network/ipconfig/ipconfig.rbuild b/reactos/base/applications/network/ipconfig/ipconfig.rbuild
index 3110817dd25..454bd37f5c7 100644
--- a/reactos/base/applications/network/ipconfig/ipconfig.rbuild
+++ b/reactos/base/applications/network/ipconfig/ipconfig.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe">
 	<include base="ipconfig">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>iphlpapi</library>
 	<library>advapi32</library>
diff --git a/reactos/base/applications/network/net/net.rbuild b/reactos/base/applications/network/net/net.rbuild
index 1b3595beed3..889e3a67571 100644
--- a/reactos/base/applications/network/net/net.rbuild
+++ b/reactos/base/applications/network/net/net.rbuild
@@ -3,7 +3,6 @@
 <module name="net" type="win32cui" installbase="system32" installname="net.exe">
 	<include base="ping">.</include>
 	<define name="__USE_W32_SOCKETS" />
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>main.c</file>
 	<file>cmdstart.c</file>
diff --git a/reactos/base/applications/network/netstat/netstat.rbuild b/reactos/base/applications/network/netstat/netstat.rbuild
index 23b488ae568..b7d4c4c973c 100644
--- a/reactos/base/applications/network/netstat/netstat.rbuild
+++ b/reactos/base/applications/network/netstat/netstat.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe">
 	<include base="netstat">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ws2_32</library>
 	<library>snmpapi</library>
diff --git a/reactos/base/applications/network/nslookup/nslookup.rbuild b/reactos/base/applications/network/nslookup/nslookup.rbuild
index b4d02f9f563..e483d4ab5f3 100644
--- a/reactos/base/applications/network/nslookup/nslookup.rbuild
+++ b/reactos/base/applications/network/nslookup/nslookup.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="nslookup" type="win32cui" installbase="system32" installname="nslookup.exe">
 	<include base="nslookup">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ws2_32</library>
 	<library>snmpapi</library>
diff --git a/reactos/base/applications/network/ping/ping.rbuild b/reactos/base/applications/network/ping/ping.rbuild
index 20f401bdb7b..170129c08ed 100644
--- a/reactos/base/applications/network/ping/ping.rbuild
+++ b/reactos/base/applications/network/ping/ping.rbuild
@@ -3,7 +3,6 @@
 <module name="ping" type="win32cui" installbase="system32" installname="ping.exe">
 	<include base="ping">.</include>
 	<define name="__USE_W32_SOCKETS" />
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>ping.c</file>
 	<file>ping.rc</file>
diff --git a/reactos/base/applications/network/route/route.rbuild b/reactos/base/applications/network/route/route.rbuild
index fbfc1eeeedf..eea7b8d76a3 100644
--- a/reactos/base/applications/network/route/route.rbuild
+++ b/reactos/base/applications/network/route/route.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="route" type="win32cui" installbase="system32" installname="route.exe" unicode="yes">
 	<include base="route">.</include>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<file>route.c</file>
diff --git a/reactos/base/applications/network/telnet/telnet.rbuild b/reactos/base/applications/network/telnet/telnet.rbuild
index 312eae39942..92e63337318 100644
--- a/reactos/base/applications/network/telnet/telnet.rbuild
+++ b/reactos/base/applications/network/telnet/telnet.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" >
 	<include base="telnet">.</include>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>user32</library>
 	<define name="_CRT_NONSTDC_NO_DEPRECATE" />
diff --git a/reactos/base/applications/network/tracert/tracert.rbuild b/reactos/base/applications/network/tracert/tracert.rbuild
index 51d0b948959..f2f9a33b813 100644
--- a/reactos/base/applications/network/tracert/tracert.rbuild
+++ b/reactos/base/applications/network/tracert/tracert.rbuild
@@ -3,7 +3,6 @@
 <module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe">
 	<include base="tracert">.</include>
 	<define name="__USE_W32_SOCKETS" />
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>tracert.c</file>
 	<file>tracert.rc</file>
diff --git a/reactos/base/applications/network/whois/whois.rbuild b/reactos/base/applications/network/whois/whois.rbuild
index 2376b957582..f208aa2d97c 100644
--- a/reactos/base/applications/network/whois/whois.rbuild
+++ b/reactos/base/applications/network/whois/whois.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="whois" type="win32cui" installbase="system32" installname="whois.exe">
 	<include base="whois">.</include>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>whois.c</file>
 	<file>whois.rc</file>
diff --git a/reactos/base/applications/notepad/notepad.rbuild b/reactos/base/applications/notepad/notepad.rbuild
index ef7800bf189..8a89a7e8e76 100644
--- a/reactos/base/applications/notepad/notepad.rbuild
+++ b/reactos/base/applications/notepad/notepad.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="notepad" type="win32gui" installbase="system32" installname="notepad.exe" unicode="yes">
 	<include base="notepad">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comdlg32</library>
diff --git a/reactos/base/applications/paint/paint.rbuild b/reactos/base/applications/paint/paint.rbuild
index 3087df43d49..f20fc0ac9ec 100644
--- a/reactos/base/applications/paint/paint.rbuild
+++ b/reactos/base/applications/paint/paint.rbuild
@@ -7,7 +7,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>comctl32</library>
 	<file>dialogs.c</file>
 	<file>dib.c</file>
diff --git a/reactos/base/applications/rapps/rapps.rbuild b/reactos/base/applications/rapps/rapps.rbuild
index e74c31ff248..066b3ba7a9b 100644
--- a/reactos/base/applications/rapps/rapps.rbuild
+++ b/reactos/base/applications/rapps/rapps.rbuild
@@ -6,7 +6,6 @@
 
 	<library>advapi32</library>
 	<library>comctl32</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>urlmon</library>
 	<library>user32</library>
diff --git a/reactos/base/applications/regedit/clb/clb.rbuild b/reactos/base/applications/regedit/clb/clb.rbuild
index be34cbf85ab..aad50816d78 100644
--- a/reactos/base/applications/regedit/clb/clb.rbuild
+++ b/reactos/base/applications/regedit/clb/clb.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="clb.spec" />
 	<include base="clb">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild
index 63a39d719c6..0868114778a 100644
--- a/reactos/base/applications/regedit/regedit.rbuild
+++ b/reactos/base/applications/regedit/regedit.rbuild
@@ -6,7 +6,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>uuid</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/applications/regedt32/regedt32.rbuild b/reactos/base/applications/regedt32/regedt32.rbuild
index cf6d2d6e71c..6b0b03773e9 100644
--- a/reactos/base/applications/regedt32/regedt32.rbuild
+++ b/reactos/base/applications/regedt32/regedt32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="regedt32" type="win32gui" installbase="system32" installname="regedt32.exe" unicode="yes">
 	<include base="regedt32">.</include>
-	<library>kernel32</library>
 	<library>shell32</library>
 	<library>shlwapi</library>
 	<file>regedt32.c</file>
diff --git a/reactos/base/applications/sc/sc.rbuild b/reactos/base/applications/sc/sc.rbuild
index ea0924c39ea..4bef374d021 100644
--- a/reactos/base/applications/sc/sc.rbuild
+++ b/reactos/base/applications/sc/sc.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sc" type="win32cui" installbase="system32" installname="sc.exe" unicode="yes">
 	<define name="DEFINE_GUID" />
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>control.c</file>
 	<file>create.c</file>
diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
index 8ecece679f9..1a1e115b763 100644
--- a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
@@ -3,7 +3,6 @@
 <module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes">
 	<library>scrnsave</library>
 	<library>chkstk</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>opengl32</library>
diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild
index e4dc6d36193..562c62de9b1 100644
--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@@ -3,7 +3,6 @@
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
 	<include base="logon">.</include>
 	<library>scrnsave</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 
diff --git a/reactos/base/applications/shutdown/shutdown.rbuild b/reactos/base/applications/shutdown/shutdown.rbuild
index d5dd0236afe..6260c0055ab 100644
--- a/reactos/base/applications/shutdown/shutdown.rbuild
+++ b/reactos/base/applications/shutdown/shutdown.rbuild
@@ -4,7 +4,6 @@
 	<include base="shutdown">.</include>
 	<library>advapi32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<file>misc.c</file>
 	<file>shutdown.c</file>
 	<file>shutdown.rc</file>
diff --git a/reactos/base/applications/sndrec32/sndrec32.rbuild b/reactos/base/applications/sndrec32/sndrec32.rbuild
index 291555117e4..7229e55e08e 100644
--- a/reactos/base/applications/sndrec32/sndrec32.rbuild
+++ b/reactos/base/applications/sndrec32/sndrec32.rbuild
@@ -4,7 +4,6 @@
 	<include base="sndrec32">.</include>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>msacm32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
diff --git a/reactos/base/applications/sndvol32/sndvol32.rbuild b/reactos/base/applications/sndvol32/sndvol32.rbuild
index 52bde92e1db..97d5a60cc95 100644
--- a/reactos/base/applications/sndvol32/sndvol32.rbuild
+++ b/reactos/base/applications/sndvol32/sndvol32.rbuild
@@ -7,7 +7,6 @@
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>comctl32</library>
 	<library>shell32</library>
 	<library>winmm</library>
diff --git a/reactos/base/applications/taskmgr/taskmgr.rbuild b/reactos/base/applications/taskmgr/taskmgr.rbuild
index 85311432c28..8db44813d26 100644
--- a/reactos/base/applications/taskmgr/taskmgr.rbuild
+++ b/reactos/base/applications/taskmgr/taskmgr.rbuild
@@ -3,7 +3,6 @@
 <module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes">
 	<include base="taskmgr">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/reactos/base/applications/winhlp32/winhlp32.rbuild b/reactos/base/applications/winhlp32/winhlp32.rbuild
index 3ce9b593d36..fd3234ec387 100644
--- a/reactos/base/applications/winhlp32/winhlp32.rbuild
+++ b/reactos/base/applications/winhlp32/winhlp32.rbuild
@@ -13,7 +13,6 @@
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>shell32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
diff --git a/reactos/base/applications/winver/winver.rbuild b/reactos/base/applications/winver/winver.rbuild
index a8745ef7a93..89ff51c8ce4 100644
--- a/reactos/base/applications/winver/winver.rbuild
+++ b/reactos/base/applications/winver/winver.rbuild
@@ -1,6 +1,5 @@
 <module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes">
 	<include base="winver">.</include>
 	<library>shell32</library>
-	<library>kernel32</library>
 	<file>winver.c</file>
 </module>
diff --git a/reactos/base/applications/wordpad/wordpad.rbuild b/reactos/base/applications/wordpad/wordpad.rbuild
index 3229752432c..6a419cdc4ad 100644
--- a/reactos/base/applications/wordpad/wordpad.rbuild
+++ b/reactos/base/applications/wordpad/wordpad.rbuild
@@ -8,7 +8,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>comctl32</library>
 	<file>print.c</file>
 	<file>registry.c</file>
diff --git a/reactos/base/applications/write/write.rbuild b/reactos/base/applications/write/write.rbuild
index 6ac77520f72..92f85eee3ef 100644
--- a/reactos/base/applications/write/write.rbuild
+++ b/reactos/base/applications/write/write.rbuild
@@ -4,7 +4,6 @@
 	<include base="write">.</include>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<file>write.c</file>
 	<file>rsrc.rc</file>
 </module>
diff --git a/reactos/base/services/audiosrv/audiosrv.rbuild b/reactos/base/services/audiosrv/audiosrv.rbuild
index 192806d4eeb..82a79207e56 100644
--- a/reactos/base/services/audiosrv/audiosrv.rbuild
+++ b/reactos/base/services/audiosrv/audiosrv.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes">
 	<include base="audiosrv">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>setupapi</library>
diff --git a/reactos/base/services/dhcp/dhcp.rbuild b/reactos/base/services/dhcp/dhcp.rbuild
index 9b3467c06c9..c886e4a4918 100644
--- a/reactos/base/services/dhcp/dhcp.rbuild
+++ b/reactos/base/services/dhcp/dhcp.rbuild
@@ -11,7 +11,6 @@
 	<define name="write">_write</define>
 
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<library>advapi32</library>
diff --git a/reactos/base/services/eventlog/eventlog.rbuild b/reactos/base/services/eventlog/eventlog.rbuild
index ab81f2f3780..7a3079a1163 100644
--- a/reactos/base/services/eventlog/eventlog.rbuild
+++ b/reactos/base/services/eventlog/eventlog.rbuild
@@ -4,7 +4,6 @@
 	<include base="eventlog">.</include>
 	<include base="eventlog_server">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>eventlog_server</library>
 	<library>rpcrt4</library>
diff --git a/reactos/base/services/rpcss/rpcss.rbuild b/reactos/base/services/rpcss/rpcss.rbuild
index 30311f3011d..5d89e489222 100644
--- a/reactos/base/services/rpcss/rpcss.rbuild
+++ b/reactos/base/services/rpcss/rpcss.rbuild
@@ -7,7 +7,6 @@
 	<library>rpcss_epm_server</library>
 	<library>rpcss_irot_server</library>
 	<library>rpcrt4</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>pseh</library>
 	<file>epmp.c</file>
diff --git a/reactos/base/services/spoolsv/spoolsv.rbuild b/reactos/base/services/spoolsv/spoolsv.rbuild
index ecc1a1d5bf0..9b1ccfef4de 100644
--- a/reactos/base/services/spoolsv/spoolsv.rbuild
+++ b/reactos/base/services/spoolsv/spoolsv.rbuild
@@ -3,7 +3,6 @@
 <module name="spoolsv" type="win32cui" installbase="system32" installname="spoolsv.exe" unicode="yes">
 	<include base="spoolsv">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>spoolsv.c</file>
 	<file>spoolsv.rc</file>
diff --git a/reactos/base/services/svchost/svchost.rbuild b/reactos/base/services/svchost/svchost.rbuild
index 31517473fde..3831d516fe1 100644
--- a/reactos/base/services/svchost/svchost.rbuild
+++ b/reactos/base/services/svchost/svchost.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe">
 	<include base="svchost">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>svchost.c</file>
 	<file>svchost.rc</file>
diff --git a/reactos/base/services/tcpsvcs/tcpsvcs.rbuild b/reactos/base/services/tcpsvcs/tcpsvcs.rbuild
index 2e2373b5155..f2b435f5aa9 100644
--- a/reactos/base/services/tcpsvcs/tcpsvcs.rbuild
+++ b/reactos/base/services/tcpsvcs/tcpsvcs.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe" unicode="yes">
 	<include base="arp">.</include>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>advapi32</library>
 	<file>tcpsvcs.c</file>
diff --git a/reactos/base/services/telnetd/telnetd.rbuild b/reactos/base/services/telnetd/telnetd.rbuild
index d2824580b70..8ccb81d2004 100644
--- a/reactos/base/services/telnetd/telnetd.rbuild
+++ b/reactos/base/services/telnetd/telnetd.rbuild
@@ -3,7 +3,6 @@
 	<include base="telnetd">..</include>
 
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ws2_32</library>
 	<library>wine</library>
diff --git a/reactos/base/services/tftpd/tftpd.rbuild b/reactos/base/services/tftpd/tftpd.rbuild
index 28e6762af1c..be34bb7f3ab 100644
--- a/reactos/base/services/tftpd/tftpd.rbuild
+++ b/reactos/base/services/tftpd/tftpd.rbuild
@@ -3,7 +3,6 @@
 	<include base="telnetd">..</include>
 
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ws2_32</library>
 	<library>wine</library>
diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.rbuild b/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
index 36d2d747d01..9887e4eb65e 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
@@ -6,7 +6,6 @@
 	<redefine name="_WIN32_WINNT">0x600</redefine>
 	<library>pnp_server</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>rpcrt4</library>
 	<library>pseh</library>
diff --git a/reactos/base/services/wlansvc/wlansvc.rbuild b/reactos/base/services/wlansvc/wlansvc.rbuild
index a9842262206..da8bf8259ff 100644
--- a/reactos/base/services/wlansvc/wlansvc.rbuild
+++ b/reactos/base/services/wlansvc/wlansvc.rbuild
@@ -5,7 +5,6 @@
 	<include base="wlansvc_server">.</include>
 	<library>wlansvc_server</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>rpcrt4</library>
 	<library>pseh</library>
diff --git a/reactos/base/setup/reactos/reactos.rbuild b/reactos/base/setup/reactos/reactos.rbuild
index ae2e7427194..3eb79d0eb72 100644
--- a/reactos/base/setup/reactos/reactos.rbuild
+++ b/reactos/base/setup/reactos/reactos.rbuild
@@ -3,7 +3,6 @@
 <module name="reactos" type="win32gui" unicode="yes">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="reactos">.</include>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/base/setup/setup/setup.rbuild b/reactos/base/setup/setup/setup.rbuild
index cdedfe780a8..07e4118c79e 100644
--- a/reactos/base/setup/setup/setup.rbuild
+++ b/reactos/base/setup/setup/setup.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="setup" type="win32gui" installbase="system32" installname="setup.exe" unicode="yes">
 	<include base="setup">.</include>
-	<library>kernel32</library>
 	<library>userenv</library>
 	<file>setup.c</file>
 	<file>setup.rc</file>
diff --git a/reactos/base/setup/vmwinst/vmwinst.rbuild b/reactos/base/setup/vmwinst/vmwinst.rbuild
index a7c7fe15060..ce056c35d94 100644
--- a/reactos/base/setup/vmwinst/vmwinst.rbuild
+++ b/reactos/base/setup/vmwinst/vmwinst.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe" unicode="yes">
 	<include base="vmwinst">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
diff --git a/reactos/base/setup/welcome/welcome.rbuild b/reactos/base/setup/welcome/welcome.rbuild
index 2b190266d6f..910d78bb7a7 100644
--- a/reactos/base/setup/welcome/welcome.rbuild
+++ b/reactos/base/setup/welcome/welcome.rbuild
@@ -3,7 +3,6 @@
 <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe" unicode="yes">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="welcome">.</include>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>welcome.c</file>
diff --git a/reactos/base/shell/cmd/cmd.rbuild b/reactos/base/shell/cmd/cmd.rbuild
index dc56ebf9dd2..78e1a3b340c 100644
--- a/reactos/base/shell/cmd/cmd.rbuild
+++ b/reactos/base/shell/cmd/cmd.rbuild
@@ -7,7 +7,6 @@
 		<define name="ANONYMOUSUNIONS" />
 		<define name="_DEBUG_MEM" />
 		<library>wine</library>
-		<library>kernel32</library>
 		<library>advapi32</library>
 		<library>user32</library>
 		<file>cmd.rc</file>
diff --git a/reactos/base/shell/explorer-new/explorer.rbuild b/reactos/base/shell/explorer-new/explorer.rbuild
index 11969f54d87..476736fb48b 100644
--- a/reactos/base/shell/explorer-new/explorer.rbuild
+++ b/reactos/base/shell/explorer-new/explorer.rbuild
@@ -4,7 +4,6 @@
 	<include base="explorer_new">.</include>
 	<define name="WIN32" />
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild
index bb115cbda09..7d64e7f42c3 100644
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@@ -6,7 +6,6 @@
 	<define name="WIN32" />
 	<define name="__WINDRES__" />
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>ws2_32</library>
diff --git a/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild b/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
index 7a37864cbd6..909cd62433e 100644
--- a/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
+++ b/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="notifyhook.def" />
 	<include base="notifyhook">.</include>
 	<define name="_NOTIFYHOOK_IMPL" />
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>notifyhook.c</file>
 	<file>notifyhook.rc</file>
diff --git a/reactos/base/system/bootok/bootok.rbuild b/reactos/base/system/bootok/bootok.rbuild
index 5e4f7978a94..341adcaff23 100644
--- a/reactos/base/system/bootok/bootok.rbuild
+++ b/reactos/base/system/bootok/bootok.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootok" type="win32cui" installbase="system32" installname="bootok.exe" unicode="yes">
 	<include base="bootok">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>bootok.c</file>
 	<file>bootok.rc</file>
diff --git a/reactos/base/system/expand/expand.rbuild b/reactos/base/system/expand/expand.rbuild
index 1e435a9da43..971fd67def9 100644
--- a/reactos/base/system/expand/expand.rbuild
+++ b/reactos/base/system/expand/expand.rbuild
@@ -6,7 +6,6 @@
 	<define name="ANONYMOUSUNIONS" />
 	<library>lz32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<file>expand.c</file>
 	<file>expand.rc</file>
 </module>
diff --git a/reactos/base/system/format/format.rbuild b/reactos/base/system/format/format.rbuild
index d27e3b47ec4..5f29105a247 100644
--- a/reactos/base/system/format/format.rbuild
+++ b/reactos/base/system/format/format.rbuild
@@ -3,7 +3,6 @@
 <module name="format" type="win32cui" installbase="system32" installname="format.exe">
 	<include base="format">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>fmifs</library>
 	<file>format.rc</file>
diff --git a/reactos/base/system/lsass/lsass.rbuild b/reactos/base/system/lsass/lsass.rbuild
index e13373ae3d1..119e149d97c 100644
--- a/reactos/base/system/lsass/lsass.rbuild
+++ b/reactos/base/system/lsass/lsass.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<library>advapi32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>lsasrv</library>
 	<file>lsass.c</file>
 	<file>lsass.rc</file>
diff --git a/reactos/base/system/msiexec/msiexec.rbuild b/reactos/base/system/msiexec/msiexec.rbuild
index 4fce3e3531d..a3a24950930 100644
--- a/reactos/base/system/msiexec/msiexec.rbuild
+++ b/reactos/base/system/msiexec/msiexec.rbuild
@@ -7,7 +7,6 @@
 	<library>uuid</library>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/base/system/regsvr32/regsvr32.rbuild b/reactos/base/system/regsvr32/regsvr32.rbuild
index db73790c0cd..cb39613dd65 100644
--- a/reactos/base/system/regsvr32/regsvr32.rbuild
+++ b/reactos/base/system/regsvr32/regsvr32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe" unicode="yes">
 	<include base="regsvr32">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>shell32</library>
 	<library>ole32</library>
diff --git a/reactos/base/system/rundll32/rundll32.rbuild b/reactos/base/system/rundll32/rundll32.rbuild
index b5bc53e71ed..bb9241629a6 100644
--- a/reactos/base/system/rundll32/rundll32.rbuild
+++ b/reactos/base/system/rundll32/rundll32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe" unicode="yes">
 	<include base="rundll32">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>rundll32.c</file>
 	<file>rundll32.rc</file>
diff --git a/reactos/base/system/runonce/runonce.rbuild b/reactos/base/system/runonce/runonce.rbuild
index 78e732a3453..950580d56ad 100644
--- a/reactos/base/system/runonce/runonce.rbuild
+++ b/reactos/base/system/runonce/runonce.rbuild
@@ -1,7 +1,6 @@
 <module name="runonce" type="win32gui" installbase="system32" installname="runonce.exe" unicode="yes">
 	<include base="runonce">.</include>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>runonce.c</file>
 	<file>runonce.rc</file>
diff --git a/reactos/base/system/services/services.rbuild b/reactos/base/system/services/services.rbuild
index 79471907de7..d363b2691b3 100644
--- a/reactos/base/system/services/services.rbuild
+++ b/reactos/base/system/services/services.rbuild
@@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<library>scm_server</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>rpcrt4</library>
diff --git a/reactos/base/system/userinit/userinit.rbuild b/reactos/base/system/userinit/userinit.rbuild
index b57da6e63a2..753a8e4b666 100644
--- a/reactos/base/system/userinit/userinit.rbuild
+++ b/reactos/base/system/userinit/userinit.rbuild
@@ -4,7 +4,6 @@
 	<include base="userinit">.</include>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/system/winlogon/winlogon.rbuild b/reactos/base/system/winlogon/winlogon.rbuild
index 69505abf118..6a75ed19015 100644
--- a/reactos/base/system/winlogon/winlogon.rbuild
+++ b/reactos/base/system/winlogon/winlogon.rbuild
@@ -4,7 +4,6 @@
 	<include base="winlogon">.</include>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>userenv</library>
diff --git a/reactos/boot/freeldr/fdebug/fdebug.rbuild b/reactos/boot/freeldr/fdebug/fdebug.rbuild
index e5241b77888..8ae515c2f4c 100644
--- a/reactos/boot/freeldr/fdebug/fdebug.rbuild
+++ b/reactos/boot/freeldr/fdebug/fdebug.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" unicode="yes">
 	<include base="freeldr_fdebug">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comdlg32</library>
 	<library>gdi32</library>
diff --git a/reactos/boot/freeldr/install/installfreeldr.rbuild b/reactos/boot/freeldr/install/installfreeldr.rbuild
index 9a293e3816e..81140e8715a 100644
--- a/reactos/boot/freeldr/install/installfreeldr.rbuild
+++ b/reactos/boot/freeldr/install/installfreeldr.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="installfreeldr" type="win32cui">
 	<include base="installfreeldr">.</include>
-	<library>kernel32</library>
 	<file>install.c</file>
 	<file>volume.c</file>
 </module>
diff --git a/reactos/dll/3rdparty/mesa32/mesa32.rbuild b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
index 2ab0f8217f8..345416716b4 100644
--- a/reactos/dll/3rdparty/mesa32/mesa32.rbuild
+++ b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
@@ -5,7 +5,6 @@
 	<linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>
 	<compilerflag compilerset="gcc">-w</compilerflag>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<define name="USE_EXTERNAL_DXTN_LIB" />
 	<library>gdi32</library>
diff --git a/reactos/dll/cpl/access/access.rbuild b/reactos/dll/cpl/access/access.rbuild
index 0386ba17949..257cb69b693 100644
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@@ -3,7 +3,6 @@
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
 	<importlibrary definition="access.spec" />
 	<include base="access">.</include>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/cpl/appwiz/appwiz.rbuild b/reactos/dll/cpl/appwiz/appwiz.rbuild
index ce017a96552..316a0899215 100644
--- a/reactos/dll/cpl/appwiz/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz/appwiz.rbuild
@@ -3,7 +3,6 @@
 <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl" unicode="yes">
 	<importlibrary definition="appwiz.spec" />
 	<include base="appwiz">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/cpl/console/console.rbuild b/reactos/dll/cpl/console/console.rbuild
index ed65bcdc7ea..da172610fed 100644
--- a/reactos/dll/cpl/console/console.rbuild
+++ b/reactos/dll/cpl/console/console.rbuild
@@ -1,7 +1,6 @@
 <module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
 	<importlibrary definition="console.spec" />
 	<include base="console">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>gdi32</library>
diff --git a/reactos/dll/cpl/desk/desk.rbuild b/reactos/dll/cpl/desk/desk.rbuild
index 78b917e0dcc..4fde972d403 100644
--- a/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="desk.spec" />
 	<include base="desk">.</include>
 	<define name="_WIN32" />
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
index f7fdfc6457a..8c671910253 100644
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="hdwwiz.spec" />
 	<include base="hdwwiz">.</include>
 	<library>setupapi</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>comctl32</library>
 	<library>rpcrt4</library>
diff --git a/reactos/dll/cpl/input/input.rbuild b/reactos/dll/cpl/input/input.rbuild
index e41bb38e7b3..81357d65636 100644
--- a/reactos/dll/cpl/input/input.rbuild
+++ b/reactos/dll/cpl/input/input.rbuild
@@ -3,7 +3,6 @@
 <module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes">
 	<importlibrary definition="input.spec" />
 	<include base="input">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/cpl/intl/intl.rbuild b/reactos/dll/cpl/intl/intl.rbuild
index 3146d7a610c..631c8958de7 100644
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@@ -3,7 +3,6 @@
 <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes" crt="msvcrt">
 	<importlibrary definition="intl.spec" />
 	<include base="intl">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/cpl/joy/joy.rbuild b/reactos/dll/cpl/joy/joy.rbuild
index 89b60137f61..7bacdcd182e 100644
--- a/reactos/dll/cpl/joy/joy.rbuild
+++ b/reactos/dll/cpl/joy/joy.rbuild
@@ -3,7 +3,6 @@
 <module name="joy" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_JOY}"  installbase="system32" installname="joy.cpl" unicode="yes">
 	<importlibrary definition="joy.spec" />
 	<include base="joy">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/cpl/main/main.rbuild b/reactos/dll/cpl/main/main.rbuild
index 115649589fc..f0025d068cc 100644
--- a/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@@ -3,7 +3,6 @@
 <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes" crt="msvcrt">
 	<importlibrary definition="main.spec" />
 	<include base="main">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/cpl/mmsys/mmsys.rbuild b/reactos/dll/cpl/mmsys/mmsys.rbuild
index a99595b8c16..3180e2a7888 100644
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@@ -3,7 +3,6 @@
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes" crt="msvcrt">
 	<importlibrary definition="mmsys.spec" />
 	<include base="mmsys">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>devmgr</library>
diff --git a/reactos/dll/cpl/ncpa/ncpa.rbuild b/reactos/dll/cpl/ncpa/ncpa.rbuild
index 75ff5ac4c16..c5ddfedc5a6 100644
--- a/reactos/dll/cpl/ncpa/ncpa.rbuild
+++ b/reactos/dll/cpl/ncpa/ncpa.rbuild
@@ -6,7 +6,6 @@
 
 	<redefine name="_WIN32_WINNT">0x600</redefine>
 
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>shell32</library>
 	<file>ncpa.c</file>
diff --git a/reactos/dll/cpl/odbccp32/odbccp32.rbuild b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
index 2137e029d0a..abaf981d0ed 100644
--- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
@@ -3,7 +3,6 @@
 <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes">
 	<importlibrary definition="odbccp32.spec" />
 	<include base="odbccp32">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<file>odbccp32.c</file>
diff --git a/reactos/dll/cpl/powercfg/powercfg.rbuild b/reactos/dll/cpl/powercfg/powercfg.rbuild
index 474cd142f40..9e53839dc2e 100644
--- a/reactos/dll/cpl/powercfg/powercfg.rbuild
+++ b/reactos/dll/cpl/powercfg/powercfg.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="powercfg.spec" />
 	<include base="powercfg">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>powrprof</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/cpl/sysdm/sysdm.rbuild b/reactos/dll/cpl/sysdm/sysdm.rbuild
index 2a2954128b4..739e41ccc15 100644
--- a/reactos/dll/cpl/sysdm/sysdm.rbuild
+++ b/reactos/dll/cpl/sysdm/sysdm.rbuild
@@ -3,7 +3,6 @@
 <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes">
 	<importlibrary definition="sysdm.spec" />
 	<include base="sysdm">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>setupapi</library>
 	<library>user32</library>
diff --git a/reactos/dll/cpl/telephon/telephon.rbuild b/reactos/dll/cpl/telephon/telephon.rbuild
index 3592ef5dd4a..1f0a53552d2 100644
--- a/reactos/dll/cpl/telephon/telephon.rbuild
+++ b/reactos/dll/cpl/telephon/telephon.rbuild
@@ -3,7 +3,6 @@
 <module name="telephon" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TELEPHON}"  installbase="system32" installname="telephon.cpl" unicode="yes">
 	<importlibrary definition="telephon.spec" />
 	<include base="telephon">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/cpl/timedate/timedate.rbuild b/reactos/dll/cpl/timedate/timedate.rbuild
index 161f1cb9136..a611b2a74ea 100644
--- a/reactos/dll/cpl/timedate/timedate.rbuild
+++ b/reactos/dll/cpl/timedate/timedate.rbuild
@@ -3,7 +3,6 @@
 <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes">
 	<importlibrary definition="timedate.spec" />
 	<include base="timedate">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rbuild b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
index ad2925f3fbb..6b88a4b8103 100644
--- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@@ -3,7 +3,6 @@
 <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes" crt="msvcrt">
 	<importlibrary definition="usrmgr.spec" />
 	<include base="usrmgr">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/reactos/dll/directx/amstream/amstream.rbuild b/reactos/dll/directx/amstream/amstream.rbuild
index f836a521d22..46780d34e0b 100644
--- a/reactos/dll/directx/amstream/amstream.rbuild
+++ b/reactos/dll/directx/amstream/amstream.rbuild
@@ -17,6 +17,5 @@
 	<library>uuid</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/directx/d3d9/d3d9.rbuild b/reactos/dll/directx/d3d9/d3d9.rbuild
index 6d273c7e415..54fc3c5d4c3 100644
--- a/reactos/dll/directx/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/d3d9/d3d9.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="d3d9.spec" />
 
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>uuid</library>
diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild
index 7a94f986748..70f70d09219 100644
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@ -3,7 +3,6 @@
 <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" unicode="yes" crt="msvcrt">
 	<importlibrary definition="ddraw.spec" />
 	<include base="ddraw">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>d3d8thk</library>
diff --git a/reactos/dll/directx/devenum/devenum.rbuild b/reactos/dll/directx/devenum/devenum.rbuild
index d39b1a0abf5..319a5a746fe 100644
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -8,7 +8,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index ceef78f9dc1..e873de7b29f 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/dinput8/dinput8.rbuild b/reactos/dll/directx/dinput8/dinput8.rbuild
index 64a9d2e4aa6..65f23d513de 100644
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 4e2e2aaa0d7..1273d33b852 100644
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -7,7 +7,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index 9864d276769..5292fbd199c 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -8,7 +8,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 537b3850e0f..41453e41c93 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/dsound_new/dsound_new.rbuild b/reactos/dll/directx/dsound_new/dsound_new.rbuild
index 762337b8599..5d4baf0e564 100644
--- a/reactos/dll/directx/dsound_new/dsound_new.rbuild
+++ b/reactos/dll/directx/dsound_new/dsound_new.rbuild
@@ -6,7 +6,6 @@
 	<include base="dsound">.</include>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
index 6a1ed51e326..c874773e1c8 100644
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -8,7 +8,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/directx/ksproxy/ksproxy.rbuild b/reactos/dll/directx/ksproxy/ksproxy.rbuild
index 7f504c4288c..c4c177b5e16 100644
--- a/reactos/dll/directx/ksproxy/ksproxy.rbuild
+++ b/reactos/dll/directx/ksproxy/ksproxy.rbuild
@@ -5,7 +5,6 @@
 	<importlibrary definition="ksproxy.spec" />
 	<include base="ksproxy">.</include>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>ksproxy.c</file>
 	<file>ksproxy.rc</file>
diff --git a/reactos/dll/directx/ksuser/ksuser.rbuild b/reactos/dll/directx/ksuser/ksuser.rbuild
index 82ecff6eda6..f316eeedd45 100644
--- a/reactos/dll/directx/ksuser/ksuser.rbuild
+++ b/reactos/dll/directx/ksuser/ksuser.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="ksuser.spec" />
 	<include base="ksuser">.</include>
 	<library>advapi32</library>	
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>ksuser.c</file>
 	<file>ksuser.rc</file>
diff --git a/reactos/dll/directx/msdmo/msdmo.rbuild b/reactos/dll/directx/msdmo/msdmo.rbuild
index 16e7529206c..5b2f1dbd258 100644
--- a/reactos/dll/directx/msdmo/msdmo.rbuild
+++ b/reactos/dll/directx/msdmo/msdmo.rbuild
@@ -11,6 +11,5 @@
 	<library>ole32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/directx/qedit/qedit.rbuild b/reactos/dll/directx/qedit/qedit.rbuild
index 5d28c9140ac..78f7a556612 100644
--- a/reactos/dll/directx/qedit/qedit.rbuild
+++ b/reactos/dll/directx/qedit/qedit.rbuild
@@ -14,6 +14,5 @@
 	<library>oleaut32</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 18d70e5084f..02e78a1cee2 100644
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -10,7 +10,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>dsound</library>
 	<library>strmiids</library>
 	<library>ole32</library>
@@ -48,4 +47,3 @@
 	<file>avisplit.c</file>
 	<file>version.rc</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/directx/wine/wined3d/wined3d.rbuild b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
index d08d32e9cc2..4723ab2e679 100644
--- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild
+++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
@@ -12,7 +12,6 @@
 	<library>opengl32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 
 	<file>ati_fragment_shader.c</file>
diff --git a/reactos/dll/nls/idndl/idndl.rbuild b/reactos/dll/nls/idndl/idndl.rbuild
index 65f147cd456..31f7545f2bd 100644
--- a/reactos/dll/nls/idndl/idndl.rbuild
+++ b/reactos/dll/nls/idndl/idndl.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="idndl" type="win32dll" installname="idndl.dll" entrypoint="0">
-	<library>kernel32</library>
 	<group compilerset="gcc">
 		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
 		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
diff --git a/reactos/dll/nls/idndl_redist/idndl_redist.rbuild b/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
index 439f3755ff1..2991abd22de 100644
--- a/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
+++ b/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="idndl_redist" type="win32dll" installname="idndl_redist.dll" crt="libcntpr">
-	<library>kernel32</library>
 	<library>scripts</library>
 	<group compilerset="gcc">
 		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
diff --git a/reactos/dll/nls/normaliz/normaliz.rbuild b/reactos/dll/nls/normaliz/normaliz.rbuild
index 4ee38a91d07..f880fe7b927 100644
--- a/reactos/dll/nls/normaliz/normaliz.rbuild
+++ b/reactos/dll/nls/normaliz/normaliz.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="normaliz" type="win32dll" entrypoint="0">
-	<library>kernel32</library>
 	<importlibrary definition="normaliz.def" />
 	<file>dummy.c</file>
 </module>
diff --git a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
index dcb36f70226..988e654da33 100644
--- a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
+++ b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
@@ -8,7 +8,6 @@
 	<library>normalize</library>
 	<library>idna</library>
 	<library>normaliz_redist_data</library>
-	<library>kernel32</library>
 	<group compilerset="gcc">
 		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
 		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
diff --git a/reactos/dll/shellext/deskadp/deskadp.rbuild b/reactos/dll/shellext/deskadp/deskadp.rbuild
index bb4d4265836..d668ce207bb 100644
--- a/reactos/dll/shellext/deskadp/deskadp.rbuild
+++ b/reactos/dll/shellext/deskadp/deskadp.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="deskadp.spec" />
 	<include base="deskadp">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/shellext/deskmon/deskmon.rbuild b/reactos/dll/shellext/deskmon/deskmon.rbuild
index 36252dc14ab..b0034a8dcb5 100644
--- a/reactos/dll/shellext/deskmon/deskmon.rbuild
+++ b/reactos/dll/shellext/deskmon/deskmon.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="deskmon.spec" />
 	<include base="deskmon">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/shellext/devcpux/devcpux.rbuild b/reactos/dll/shellext/devcpux/devcpux.rbuild
index 050274324a6..2a9eea54511 100644
--- a/reactos/dll/shellext/devcpux/devcpux.rbuild
+++ b/reactos/dll/shellext/devcpux/devcpux.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="devcpux.spec" />
 	<include base="devcpux">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
 	<library>powrprof</library>
diff --git a/reactos/dll/shellext/fontext/fontext.rbuild b/reactos/dll/shellext/fontext/fontext.rbuild
index 5418840f553..c46abf4e8a9 100644
--- a/reactos/dll/shellext/fontext/fontext.rbuild
+++ b/reactos/dll/shellext/fontext/fontext.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="fontext.spec" />
 	<include base="fontext">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/shellext/slayer/slayer.rbuild b/reactos/dll/shellext/slayer/slayer.rbuild
index bfe216c142e..0a5554fe1a9 100644
--- a/reactos/dll/shellext/slayer/slayer.rbuild
+++ b/reactos/dll/shellext/slayer/slayer.rbuild
@@ -1,7 +1,6 @@
 <module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes">
 	<importlibrary definition="slayer.spec" />
 	<include base="slayer">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index b82383a76d5..e851138f276 100644
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -5,7 +5,6 @@
 	<metadata description = "Access Control List Editor" />
 
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<file>acledit.c</file>
diff --git a/reactos/dll/win32/aclui/aclui.rbuild b/reactos/dll/win32/aclui/aclui.rbuild
index 6da5cc1080c..118317d0c62 100644
--- a/reactos/dll/win32/aclui/aclui.rbuild
+++ b/reactos/dll/win32/aclui/aclui.rbuild
@@ -3,7 +3,6 @@
 	<include base="aclui">.</include>
 	<define name="SUPPORT_UXTHEME" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/win32/activeds/activeds.rbuild b/reactos/dll/win32/activeds/activeds.rbuild
index c35eba65d33..7c8cda0340c 100644
--- a/reactos/dll/win32/activeds/activeds.rbuild
+++ b/reactos/dll/win32/activeds/activeds.rbuild
@@ -4,7 +4,6 @@
 	<include base="activeds">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<library>wine</library>
 	<file>activeds_main.c</file>
 </module>
diff --git a/reactos/dll/win32/actxprxy/actxprxy.rbuild b/reactos/dll/win32/actxprxy/actxprxy.rbuild
index d522e612d73..04a760bd2db 100644
--- a/reactos/dll/win32/actxprxy/actxprxy.rbuild
+++ b/reactos/dll/win32/actxprxy/actxprxy.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>actxprxy_interface</library>
 	<library>actxprxy_proxy</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>rpcrt4</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/advapi32/advapi32.rbuild b/reactos/dll/win32/advapi32/advapi32.rbuild
index c0c3b6a4ecf..0396365b7b9 100644
--- a/reactos/dll/win32/advapi32/advapi32.rbuild
+++ b/reactos/dll/win32/advapi32/advapi32.rbuild
@@ -14,7 +14,6 @@
 	<library>eventlog_client</library>
 	<library>rpcrt4</library>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>pseh</library>
 	<library>ntdll</library>
 	<pch>advapi32.h</pch>
diff --git a/reactos/dll/win32/advpack/advpack.rbuild b/reactos/dll/win32/advpack/advpack.rbuild
index 43aba2d623d..b4f3a3fbaed 100644
--- a/reactos/dll/win32/advpack/advpack.rbuild
+++ b/reactos/dll/win32/advpack/advpack.rbuild
@@ -15,7 +15,6 @@
 	<library>setupapi</library>
 	<library>version</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/atl/atl.rbuild b/reactos/dll/win32/atl/atl.rbuild
index 6bb3a5c9cf2..d162664f4e7 100644
--- a/reactos/dll/win32/atl/atl.rbuild
+++ b/reactos/dll/win32/atl/atl.rbuild
@@ -20,7 +20,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<dependency>atl_atliface_header</dependency>
 </module>
diff --git a/reactos/dll/win32/authz/authz.rbuild b/reactos/dll/win32/authz/authz.rbuild
index 937460d7e1f..296fd6d501a 100644
--- a/reactos/dll/win32/authz/authz.rbuild
+++ b/reactos/dll/win32/authz/authz.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="authz.spec" />
 	<include base="authz">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>authz.c</file>
 	<file>clictx.c</file>
diff --git a/reactos/dll/win32/avicap32/avicap32.rbuild b/reactos/dll/win32/avicap32/avicap32.rbuild
index 7bb0624bbbd..2e2a0f3e8cd 100644
--- a/reactos/dll/win32/avicap32/avicap32.rbuild
+++ b/reactos/dll/win32/avicap32/avicap32.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="avicap32.spec" />
 	<include base="avicap32">.</include>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>msvfw32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index 864b1332c92..1741f2a481d 100644
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -28,7 +28,6 @@
 	<library>ole32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/bcrypt/bcrypt.rbuild b/reactos/dll/win32/bcrypt/bcrypt.rbuild
index 5d497336e75..2a8ee9a8452 100644
--- a/reactos/dll/win32/bcrypt/bcrypt.rbuild
+++ b/reactos/dll/win32/bcrypt/bcrypt.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<file>bcrypt_main.c</file>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/dll/win32/beepmidi/beepmidi.rbuild b/reactos/dll/win32/beepmidi/beepmidi.rbuild
index ce2c3c0bc6d..3c36708f84c 100644
--- a/reactos/dll/win32/beepmidi/beepmidi.rbuild
+++ b/reactos/dll/win32/beepmidi/beepmidi.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="beepmidi.spec" />
 	<include base="beepmidi">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
 	<file>beepmidi.c</file>
diff --git a/reactos/dll/win32/browseui/browseui.rbuild b/reactos/dll/win32/browseui/browseui.rbuild
index 89e3d65a3b6..62900b7ecaf 100644
--- a/reactos/dll/win32/browseui/browseui.rbuild
+++ b/reactos/dll/win32/browseui/browseui.rbuild
@@ -20,7 +20,6 @@
 	<library>oleaut32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<library>atlnew</library>
diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild
index 76322332efa..879a4a2af9c 100644
--- a/reactos/dll/win32/cabinet/cabinet.rbuild
+++ b/reactos/dll/win32/cabinet/cabinet.rbuild
@@ -11,7 +11,6 @@
 	<file>fdi.c</file>
 	<file>cabinet.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild
index 475fc1ca12d..0b331b44384 100644
--- a/reactos/dll/win32/cards/cards.rbuild
+++ b/reactos/dll/win32/cards/cards.rbuild
@@ -5,7 +5,6 @@
 	<!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
 	<define name="CARDSTYLE_DEFAULT" />
 
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>cards.c</file>
diff --git a/reactos/dll/win32/clusapi/clusapi.rbuild b/reactos/dll/win32/clusapi/clusapi.rbuild
index 5607268cf8d..10b31ffd2f5 100644
--- a/reactos/dll/win32/clusapi/clusapi.rbuild
+++ b/reactos/dll/win32/clusapi/clusapi.rbuild
@@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>clusapi.c</file>
 </module>
diff --git a/reactos/dll/win32/comcat/comcat.rbuild b/reactos/dll/win32/comcat/comcat.rbuild
index 8355869930c..626f49ad48b 100644
--- a/reactos/dll/win32/comcat/comcat.rbuild
+++ b/reactos/dll/win32/comcat/comcat.rbuild
@@ -11,7 +11,6 @@
 	<library>ole32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<file>comcat_main.c</file>
diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index ded794b725f..d2e0c3b19d6 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -49,7 +49,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>winmm</library>
 	<library>uxtheme</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index 769fb17331b..034626cc29f 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -25,7 +25,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ole32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/compstui/compstui.rbuild b/reactos/dll/win32/compstui/compstui.rbuild
index 8ed31853435..cb8d99af4c9 100644
--- a/reactos/dll/win32/compstui/compstui.rbuild
+++ b/reactos/dll/win32/compstui/compstui.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<file>compstui_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/credui/credui.rbuild b/reactos/dll/win32/credui/credui.rbuild
index 7222e4d3afa..d5395cdfb78 100644
--- a/reactos/dll/win32/credui/credui.rbuild
+++ b/reactos/dll/win32/credui/credui.rbuild
@@ -12,7 +12,6 @@
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/crtdll/crtdll.rbuild b/reactos/dll/win32/crtdll/crtdll.rbuild
index 310eaa5851b..047b966c2c0 100644
--- a/reactos/dll/win32/crtdll/crtdll.rbuild
+++ b/reactos/dll/win32/crtdll/crtdll.rbuild
@@ -14,7 +14,6 @@
 
 	<library>crt</library>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<pch>precomp.h</pch>
 	<file>dllmain.c</file>
diff --git a/reactos/dll/win32/crypt32/crypt32.rbuild b/reactos/dll/win32/crypt32/crypt32.rbuild
index a8e7c3effbd..e622fa27ed9 100644
--- a/reactos/dll/win32/crypt32/crypt32.rbuild
+++ b/reactos/dll/win32/crypt32/crypt32.rbuild
@@ -13,7 +13,6 @@
 	<library>wine</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>imagehlp</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/cryptdlg/cryptdlg.rbuild b/reactos/dll/win32/cryptdlg/cryptdlg.rbuild
index cc86691a7fd..84bc688ee0f 100644
--- a/reactos/dll/win32/cryptdlg/cryptdlg.rbuild
+++ b/reactos/dll/win32/cryptdlg/cryptdlg.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>crypt32</library>
 	<library>cryptui</library>
diff --git a/reactos/dll/win32/cryptdll/cryptdll.rbuild b/reactos/dll/win32/cryptdll/cryptdll.rbuild
index c5fe617d7cd..3d351306b05 100644
--- a/reactos/dll/win32/cryptdll/cryptdll.rbuild
+++ b/reactos/dll/win32/cryptdll/cryptdll.rbuild
@@ -7,7 +7,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>cryptdll.c</file>
 </module>
diff --git a/reactos/dll/win32/cryptnet/cryptnet.rbuild b/reactos/dll/win32/cryptnet/cryptnet.rbuild
index f305e535b87..ff9d875f356 100644
--- a/reactos/dll/win32/cryptnet/cryptnet.rbuild
+++ b/reactos/dll/win32/cryptnet/cryptnet.rbuild
@@ -9,7 +9,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>crypt32</library>
-	<library>kernel32</library>
 	<library>wininet</library>
 	<library>ntdll</library>
 	<file>cryptnet_main.c</file>
diff --git a/reactos/dll/win32/cryptui/cryptui.rbuild b/reactos/dll/win32/cryptui/cryptui.rbuild
index fde45de40de..3f3832e8969 100644
--- a/reactos/dll/win32/cryptui/cryptui.rbuild
+++ b/reactos/dll/win32/cryptui/cryptui.rbuild
@@ -11,7 +11,6 @@
 	<file>main.c</file>
 	<file>cryptui.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ole32</library>
 	<library>crypt32</library>
diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild
index 0aeff9efd0d..59bf735bcf0 100644
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@@ -29,7 +29,6 @@
 	<file>type.c</file>
 	<library>wine</library>
 	<library>psapi</library>
-	<library>kernel32</library>
 	<library>version</library>
 	<library>ntdll</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/dciman32/dciman32.rbuild b/reactos/dll/win32/dciman32/dciman32.rbuild
index 0b66c35a7b6..c659d8efff2 100644
--- a/reactos/dll/win32/dciman32/dciman32.rbuild
+++ b/reactos/dll/win32/dciman32/dciman32.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<file>dciman_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild
index be165a3cf8e..b746bd39b9c 100644
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@@ -1,7 +1,6 @@
 <module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" unicode="yes">
 	<include base="devmgr">.</include>
 	<importlibrary definition="devmgr.spec" />
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>setupapi</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
index 3f850f22f27..c2cc0a1e112 100644
--- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
+++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="dhcpcsvc.spec" />
 	<include base="dhcpcsvc">include</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<file>dhcpcsvc.c</file>
diff --git a/reactos/dll/win32/dnsapi/dnsapi.rbuild b/reactos/dll/win32/dnsapi/dnsapi.rbuild
index 08acd54a22a..3756a84cd5b 100644
--- a/reactos/dll/win32/dnsapi/dnsapi.rbuild
+++ b/reactos/dll/win32/dnsapi/dnsapi.rbuild
@@ -6,7 +6,6 @@
 	<define name="ADNS_JGAA_WIN32" />
 	<library>adns</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
diff --git a/reactos/dll/win32/dwmapi/dwmapi.rbuild b/reactos/dll/win32/dwmapi/dwmapi.rbuild
index 778500e5189..a36f697169f 100644
--- a/reactos/dll/win32/dwmapi/dwmapi.rbuild
+++ b/reactos/dll/win32/dwmapi/dwmapi.rbuild
@@ -9,7 +9,6 @@
 	<file>dwmapi_main.c</file>
 	<file>version.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/fmifs/fmifs.rbuild b/reactos/dll/win32/fmifs/fmifs.rbuild
index c5a16d413a6..1743da71d21 100644
--- a/reactos/dll/win32/fmifs/fmifs.rbuild
+++ b/reactos/dll/win32/fmifs/fmifs.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="fmifs.spec" />
 	<include base="fmifs">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>chkdsk.c</file>
 	<file>compress.c</file>
 	<file>diskcopy.c</file>
diff --git a/reactos/dll/win32/fusion/fusion.rbuild b/reactos/dll/win32/fusion/fusion.rbuild
index a493d97795e..0850e55b20d 100644
--- a/reactos/dll/win32/fusion/fusion.rbuild
+++ b/reactos/dll/win32/fusion/fusion.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>version</library>
 	<library>shlwapi</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/gdi32/gdi32.rbuild b/reactos/dll/win32/gdi32/gdi32.rbuild
index 70cb3577f28..5e47b5bc0a4 100644
--- a/reactos/dll/win32/gdi32/gdi32.rbuild
+++ b/reactos/dll/win32/gdi32/gdi32.rbuild
@@ -3,7 +3,6 @@
 	<include base="gdi32">include</include>
 	<define name="LANGPACK" />
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>win32ksys</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index cbf035e8500..d6daa4d7b7b 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -26,7 +26,6 @@
 	<library>ole32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>windowscodecs</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/glu32/glu32.rbuild b/reactos/dll/win32/glu32/glu32.rbuild
index fd75052d2e6..9c21f3ac36a 100644
--- a/reactos/dll/win32/glu32/glu32.rbuild
+++ b/reactos/dll/win32/glu32/glu32.rbuild
@@ -11,7 +11,6 @@
 	<define name="LIBRARYBUILD" />
 	<library>ntdll</library>
 	<library>opengl32</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<directory name="libnurbs">
 		<directory name="interface">
diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
index abfce65e6d8..cf043e00031 100644
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
@@ -25,7 +25,6 @@
 	<library>oleaut32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/hid/hid.rbuild b/reactos/dll/win32/hid/hid.rbuild
index 4b06254cfff..8770a694379 100644
--- a/reactos/dll/win32/hid/hid.rbuild
+++ b/reactos/dll/win32/hid/hid.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="hid.spec" />
 	<include base="hid">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>hid.c</file>
 	<file>stubs.c</file>
 	<file>hid.rc</file>
diff --git a/reactos/dll/win32/hlink/hlink.rbuild b/reactos/dll/win32/hlink/hlink.rbuild
index 4d03b9de274..f5753ca15a0 100644
--- a/reactos/dll/win32/hlink/hlink.rbuild
+++ b/reactos/dll/win32/hlink/hlink.rbuild
@@ -15,7 +15,6 @@
 	<library>shell32</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>urlmon</library>
 	<library>uuid</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/hnetcfg/hnetcfg.rbuild b/reactos/dll/win32/hnetcfg/hnetcfg.rbuild
index 37cd7ac6b2e..dd4612f360c 100644
--- a/reactos/dll/win32/hnetcfg/hnetcfg.rbuild
+++ b/reactos/dll/win32/hnetcfg/hnetcfg.rbuild
@@ -8,7 +8,6 @@
 	<library>wine</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<file>apps.c</file>
 	<file>hnetcfg.c</file>
 	<file>manager.c</file>
diff --git a/reactos/dll/win32/httpapi/httpapi.rbuild b/reactos/dll/win32/httpapi/httpapi.rbuild
index 7e85a873ee6..28d83587a57 100644
--- a/reactos/dll/win32/httpapi/httpapi.rbuild
+++ b/reactos/dll/win32/httpapi/httpapi.rbuild
@@ -5,6 +5,5 @@
 	<define name="__WINESRC__" />
 	<file>httpapi_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/iccvid/iccvid.rbuild b/reactos/dll/win32/iccvid/iccvid.rbuild
index 8c73f6f6771..f780f8821a1 100644
--- a/reactos/dll/win32/iccvid/iccvid.rbuild
+++ b/reactos/dll/win32/iccvid/iccvid.rbuild
@@ -7,6 +7,4 @@
 	<file>rsrc.rc</file>
 	<library>wine</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
-</module>
\ No newline at end of file
diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild
index 5cb14fb878d..27ac979d7b7 100644
--- a/reactos/dll/win32/icmp/icmp.rbuild
+++ b/reactos/dll/win32/icmp/icmp.rbuild
@@ -3,7 +3,6 @@
 	<include base="icmp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>wine</library>
 	<file>icmp_main.c</file>
diff --git a/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild b/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
index 8f24f00fda5..f2b04bb6914 100644
--- a/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
+++ b/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
@@ -7,6 +7,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/imagehlp/imagehlp.rbuild b/reactos/dll/win32/imagehlp/imagehlp.rbuild
index 110757ce056..0fa31aa6db8 100644
--- a/reactos/dll/win32/imagehlp/imagehlp.rbuild
+++ b/reactos/dll/win32/imagehlp/imagehlp.rbuild
@@ -4,7 +4,6 @@
 	<define name="_IMAGEHLP_SOURCE_"></define>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>access.c</file>
 	<file>imagehlp_main.c</file>
 	<file>integrity.c</file>
diff --git a/reactos/dll/win32/imm32/imm32.rbuild b/reactos/dll/win32/imm32/imm32.rbuild
index a0d9b601814..d91d1e8245e 100644
--- a/reactos/dll/win32/imm32/imm32.rbuild
+++ b/reactos/dll/win32/imm32/imm32.rbuild
@@ -14,7 +14,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild
index a82aea1bcde..3de70d54a5f 100644
--- a/reactos/dll/win32/inetcomm/inetcomm.rbuild
+++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild
@@ -23,7 +23,6 @@
 	<library>ws2_32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/inetmib1/inetmib1.rbuild b/reactos/dll/win32/inetmib1/inetmib1.rbuild
index 3176d30bc73..77c39b582a1 100644
--- a/reactos/dll/win32/inetmib1/inetmib1.rbuild
+++ b/reactos/dll/win32/inetmib1/inetmib1.rbuild
@@ -9,7 +9,6 @@
 	<file>main.c</file>
 	<library>wine</library>
 	<library>snmpapi</library>
-	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/initpki/initpki.rbuild b/reactos/dll/win32/initpki/initpki.rbuild
index 4faaf38317c..8e23c67bb3b 100644
--- a/reactos/dll/win32/initpki/initpki.rbuild
+++ b/reactos/dll/win32/initpki/initpki.rbuild
@@ -6,6 +6,5 @@
 	<define name="__WINESRC__" />
 	<file>main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/inseng/inseng.rbuild b/reactos/dll/win32/inseng/inseng.rbuild
index a41d0c80c39..5434957a05c 100644
--- a/reactos/dll/win32/inseng/inseng.rbuild
+++ b/reactos/dll/win32/inseng/inseng.rbuild
@@ -11,6 +11,5 @@
 	<library>uuid</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index 6582639fe05..2cbb6203e26 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -5,7 +5,6 @@
         <include base="dhcp">include</include>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ws2_32</library>
 	<library>dhcpcsvc</library>
diff --git a/reactos/dll/win32/itircl/itircl.rbuild b/reactos/dll/win32/itircl/itircl.rbuild
index 91ff4cc622c..7bd57ad575e 100644
--- a/reactos/dll/win32/itircl/itircl.rbuild
+++ b/reactos/dll/win32/itircl/itircl.rbuild
@@ -6,6 +6,5 @@
 	<define name="__WINESRC__" />
 	<file>itircl_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/itss/itss.rbuild b/reactos/dll/win32/itss/itss.rbuild
index 8f4db0f5550..336bb56f8c1 100644
--- a/reactos/dll/win32/itss/itss.rbuild
+++ b/reactos/dll/win32/itss/itss.rbuild
@@ -17,7 +17,6 @@
 	<library>urlmon</library>
 	<library>shlwapi</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index 179c519a546..13c57540e60 100644
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -9,7 +9,6 @@
 	<define name="RPC_NO_WINDOWS_H" />
 	<dependency>jsglobal</dependency>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
@@ -39,4 +38,3 @@
 	<dependency>stdole2</dependency>
 	<file>jsglobal.idl</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/loadperf/loadperf.rbuild b/reactos/dll/win32/loadperf/loadperf.rbuild
index 82c886825f0..82a17fb25ef 100644
--- a/reactos/dll/win32/loadperf/loadperf.rbuild
+++ b/reactos/dll/win32/loadperf/loadperf.rbuild
@@ -7,7 +7,6 @@
 	<define name="__WINESRC__" />
 	<file>loadperf_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 
diff --git a/reactos/dll/win32/localspl/localspl.rbuild b/reactos/dll/win32/localspl/localspl.rbuild
index 0ae57f3b349..2c3d27a565f 100644
--- a/reactos/dll/win32/localspl/localspl.rbuild
+++ b/reactos/dll/win32/localspl/localspl.rbuild
@@ -12,6 +12,5 @@
 	<library>spoolss</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/localui/localui.rbuild b/reactos/dll/win32/localui/localui.rbuild
index 7ee4b144c90..639fc713257 100644
--- a/reactos/dll/win32/localui/localui.rbuild
+++ b/reactos/dll/win32/localui/localui.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>winspool</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild
index 317e5221974..5656efc4efe 100644
--- a/reactos/dll/win32/lpk/lpk.rbuild
+++ b/reactos/dll/win32/lpk/lpk.rbuild
@@ -3,7 +3,6 @@
 	<include base="lpk">include</include>
 	<define name="LANGPACK" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>usp10</library>
 
diff --git a/reactos/dll/win32/lsasrv/lsasrv.rbuild b/reactos/dll/win32/lsasrv/lsasrv.rbuild
index 58d1fcc0f48..f35f19020c4 100644
--- a/reactos/dll/win32/lsasrv/lsasrv.rbuild
+++ b/reactos/dll/win32/lsasrv/lsasrv.rbuild
@@ -4,7 +4,6 @@
 	<include base="lsa_server">.</include>
 	<library>lsa_server</library>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>rpcrt4</library>
 	<library>ntdll</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/lz32/lz32.rbuild b/reactos/dll/win32/lz32/lz32.rbuild
index 5417ca96e0f..0842bf29c82 100644
--- a/reactos/dll/win32/lz32/lz32.rbuild
+++ b/reactos/dll/win32/lz32/lz32.rbuild
@@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild
index 608c72955b7..93a8d539875 100644
--- a/reactos/dll/win32/mapi32/mapi32.rbuild
+++ b/reactos/dll/win32/mapi32/mapi32.rbuild
@@ -16,7 +16,6 @@
 	<library>shlwapi</library>
 	<library>shell32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mciavi32/mciavi32.rbuild b/reactos/dll/win32/mciavi32/mciavi32.rbuild
index c8dae4ba182..dad219a3227 100644
--- a/reactos/dll/win32/mciavi32/mciavi32.rbuild
+++ b/reactos/dll/win32/mciavi32/mciavi32.rbuild
@@ -13,6 +13,5 @@
 	<library>winmm</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mcicda/mcicda.rbuild b/reactos/dll/win32/mcicda/mcicda.rbuild
index f4ec529818c..72ae6304389 100644
--- a/reactos/dll/win32/mcicda/mcicda.rbuild
+++ b/reactos/dll/win32/mcicda/mcicda.rbuild
@@ -7,6 +7,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mciqtz32/mciqtz32.rbuild b/reactos/dll/win32/mciqtz32/mciqtz32.rbuild
index f24fd3a74b2..096abad6b13 100644
--- a/reactos/dll/win32/mciqtz32/mciqtz32.rbuild
+++ b/reactos/dll/win32/mciqtz32/mciqtz32.rbuild
@@ -6,7 +6,6 @@
 	<file>mciqtz.c</file>
 	<file>version.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>oleaut32</library>
 	<library>ole32</library>
 	<library>winmm</library>
diff --git a/reactos/dll/win32/mciseq/mciseq.rbuild b/reactos/dll/win32/mciseq/mciseq.rbuild
index 661c7cf740a..c761c8c2aa2 100644
--- a/reactos/dll/win32/mciseq/mciseq.rbuild
+++ b/reactos/dll/win32/mciseq/mciseq.rbuild
@@ -7,6 +7,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mciwave/mciwave.rbuild b/reactos/dll/win32/mciwave/mciwave.rbuild
index 1cb073a2c16..be21c0711ed 100644
--- a/reactos/dll/win32/mciwave/mciwave.rbuild
+++ b/reactos/dll/win32/mciwave/mciwave.rbuild
@@ -8,6 +8,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mlang/mlang.rbuild b/reactos/dll/win32/mlang/mlang.rbuild
index 20baacb6976..168c31a664b 100644
--- a/reactos/dll/win32/mlang/mlang.rbuild
+++ b/reactos/dll/win32/mlang/mlang.rbuild
@@ -15,7 +15,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>oleaut32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/mmdrv/mmdrv.rbuild b/reactos/dll/win32/mmdrv/mmdrv.rbuild
index b7779f386f4..0dff5ab0a95 100644
--- a/reactos/dll/win32/mmdrv/mmdrv.rbuild
+++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild
@@ -3,7 +3,6 @@
 	<include base="mmdrv">.</include>
 	<define name="NDEBUG" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
 	<file>entry.c</file>
diff --git a/reactos/dll/win32/modemui/modemui.rbuild b/reactos/dll/win32/modemui/modemui.rbuild
index f3500094f82..da694655178 100644
--- a/reactos/dll/win32/modemui/modemui.rbuild
+++ b/reactos/dll/win32/modemui/modemui.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="modemui.spec" />
 	<include base="modemui">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/win32/mpr/mpr.rbuild b/reactos/dll/win32/mpr/mpr.rbuild
index 2bcae1d64d2..9566ee649a5 100644
--- a/reactos/dll/win32/mpr/mpr.rbuild
+++ b/reactos/dll/win32/mpr/mpr.rbuild
@@ -17,7 +17,6 @@
 	<library>wine</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/mprapi/mprapi.rbuild b/reactos/dll/win32/mprapi/mprapi.rbuild
index c6a9bfbc783..dc4e927d3c4 100644
--- a/reactos/dll/win32/mprapi/mprapi.rbuild
+++ b/reactos/dll/win32/mprapi/mprapi.rbuild
@@ -4,6 +4,5 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<file>mprapi.c</file>
 </module>
diff --git a/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild b/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild
index de183b48a3f..db4c6ac3089 100644
--- a/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild
@@ -5,7 +5,6 @@
 	<library>wine</library>
 	<library>msacm32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
 	<file>wavemap.c</file>
diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 279d69e39f0..656fc34ecc6 100644
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>winmm</library>
diff --git a/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild b/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
index 1be0196a9ee..89911f484c5 100644
--- a/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
+++ b/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
@@ -7,6 +7,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/msafd/msafd.rbuild b/reactos/dll/win32/msafd/msafd.rbuild
index 0ffb98e6672..bc657128668 100644
--- a/reactos/dll/win32/msafd/msafd.rbuild
+++ b/reactos/dll/win32/msafd/msafd.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/drivers</include>
 	<pch>msafd.h</pch>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<directory name="misc">
 		<file>dllmain.c</file>
diff --git a/reactos/dll/win32/mscat32/mscat32.rbuild b/reactos/dll/win32/mscat32/mscat32.rbuild
index 70fb618caaf..2d7bf8ac6ef 100644
--- a/reactos/dll/win32/mscat32/mscat32.rbuild
+++ b/reactos/dll/win32/mscat32/mscat32.rbuild
@@ -8,7 +8,6 @@
 	<file>main.c</file>
 	<library>wine</library>
 	<library>wintrust</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/mscms/mscms.rbuild b/reactos/dll/win32/mscms/mscms.rbuild
index 49e3866d165..5afe2342938 100644
--- a/reactos/dll/win32/mscms/mscms.rbuild
+++ b/reactos/dll/win32/mscms/mscms.rbuild
@@ -12,6 +12,5 @@
 	<file>version.rc</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mscoree/mscoree.rbuild b/reactos/dll/win32/mscoree/mscoree.rbuild
index 1c9109d1a01..2fa0743f07a 100644
--- a/reactos/dll/win32/mscoree/mscoree.rbuild
+++ b/reactos/dll/win32/mscoree/mscoree.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>uuid</library>
 	<file>corruntimehost.c</file>
diff --git a/reactos/dll/win32/msctf/msctf.rbuild b/reactos/dll/win32/msctf/msctf.rbuild
index e7cea9ceefb..d6c531ecbb1 100644
--- a/reactos/dll/win32/msctf/msctf.rbuild
+++ b/reactos/dll/win32/msctf/msctf.rbuild
@@ -24,7 +24,6 @@
 	<library>oleaut32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>msctf_local_interface</library>
 	<library>textstor_local_interface</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/msftedit/msftedit.rbuild b/reactos/dll/win32/msftedit/msftedit.rbuild
index f9dd7bab417..7a6c77fe64a 100644
--- a/reactos/dll/win32/msftedit/msftedit.rbuild
+++ b/reactos/dll/win32/msftedit/msftedit.rbuild
@@ -8,6 +8,5 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>riched20</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/msg711.acm/msg711.acm.rbuild b/reactos/dll/win32/msg711.acm/msg711.acm.rbuild
index a9297bd3812..468d9927b2f 100644
--- a/reactos/dll/win32/msg711.acm/msg711.acm.rbuild
+++ b/reactos/dll/win32/msg711.acm/msg711.acm.rbuild
@@ -7,6 +7,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild
index 5baa2bcf407..1f21595c6e5 100644
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>ntdll</library>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/reactos/dll/win32/msgsm32.acm/msgsm32.acm.rbuild b/reactos/dll/win32/msgsm32.acm/msgsm32.acm.rbuild
index 001d56c99d6..b997e1499f0 100644
--- a/reactos/dll/win32/msgsm32.acm/msgsm32.acm.rbuild
+++ b/reactos/dll/win32/msgsm32.acm/msgsm32.acm.rbuild
@@ -7,5 +7,4 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 </module>
diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
index e026dcd46c0..baa0154f7e9 100644
--- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
+++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
@@ -8,7 +8,5 @@
 	<include base="mshtml.tlb" root="intermediate">.</include>
 	<dependency>mshtml_tlb</dependency>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<file>rsrc.rc</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/mshtml/mshtml.rbuild b/reactos/dll/win32/mshtml/mshtml.rbuild
index d7f11ac1d00..97f9dd1be94 100644
--- a/reactos/dll/win32/mshtml/mshtml.rbuild
+++ b/reactos/dll/win32/mshtml/mshtml.rbuild
@@ -83,7 +83,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>wininet</library>
 	<library>ntdll</library>
 	<dependency>mshtml_nsiface_header</dependency>
diff --git a/reactos/dll/win32/msi/msi.rbuild b/reactos/dll/win32/msi/msi.rbuild
index a92bc40681e..8c98a6d5c46 100644
--- a/reactos/dll/win32/msi/msi.rbuild
+++ b/reactos/dll/win32/msi/msi.rbuild
@@ -68,7 +68,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>odbccp32</library>
 	<library>ntdll</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/msimg32/msimg32.rbuild b/reactos/dll/win32/msimg32/msimg32.rbuild
index 116eb5673be..937c850523e 100644
--- a/reactos/dll/win32/msimg32/msimg32.rbuild
+++ b/reactos/dll/win32/msimg32/msimg32.rbuild
@@ -7,7 +7,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>msimg32_main.c</file>
 </module>
diff --git a/reactos/dll/win32/msimtf/msimtf.rbuild b/reactos/dll/win32/msimtf/msimtf.rbuild
index 6c8272a80cc..9c5a616efcc 100644
--- a/reactos/dll/win32/msimtf/msimtf.rbuild
+++ b/reactos/dll/win32/msimtf/msimtf.rbuild
@@ -11,7 +11,5 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>imm32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/msisip/msisip.rbuild b/reactos/dll/win32/msisip/msisip.rbuild
index ecfc133b908..58cdf7e7c4c 100644
--- a/reactos/dll/win32/msisip/msisip.rbuild
+++ b/reactos/dll/win32/msisip/msisip.rbuild
@@ -8,6 +8,5 @@
 	<library>wine</library>
 	<library>crypt32</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild b/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild
index ce7f1084094..2e7105a2264 100644
--- a/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild
+++ b/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild
@@ -7,6 +7,5 @@
 	<file>msisys.c</file>
 	<library>wine</library>
 	<library>uuid</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/msnet32/msnet32.rbuild b/reactos/dll/win32/msnet32/msnet32.rbuild
index 334da1d28fa..553020eaf5f 100644
--- a/reactos/dll/win32/msnet32/msnet32.rbuild
+++ b/reactos/dll/win32/msnet32/msnet32.rbuild
@@ -5,6 +5,5 @@
 	<define name="__WINESRC__" />
 	<file>msnet_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/msrle32/msrle32.rbuild b/reactos/dll/win32/msrle32/msrle32.rbuild
index a4db99ae7c7..6ef26447334 100644
--- a/reactos/dll/win32/msrle32/msrle32.rbuild
+++ b/reactos/dll/win32/msrle32/msrle32.rbuild
@@ -8,6 +8,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mssign32/mssign32.rbuild b/reactos/dll/win32/mssign32/mssign32.rbuild
index be7cca8a244..ff1be496483 100644
--- a/reactos/dll/win32/mssign32/mssign32.rbuild
+++ b/reactos/dll/win32/mssign32/mssign32.rbuild
@@ -6,6 +6,5 @@
 	<define name="__WINESRC__" />
 	<file>mssign32_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mssip32/mssip32.rbuild b/reactos/dll/win32/mssip32/mssip32.rbuild
index 7796618c12e..691f8ba153d 100644
--- a/reactos/dll/win32/mssip32/mssip32.rbuild
+++ b/reactos/dll/win32/mssip32/mssip32.rbuild
@@ -6,6 +6,5 @@
 	<define name="__WINESRC__" />
 	<file>main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mstask/mstask.rbuild b/reactos/dll/win32/mstask/mstask.rbuild
index 503eaf389a2..f766f72f640 100644
--- a/reactos/dll/win32/mstask/mstask.rbuild
+++ b/reactos/dll/win32/mstask/mstask.rbuild
@@ -19,7 +19,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 <module name="mstask_local_interface" type="idlinterface">
diff --git a/reactos/dll/win32/msvcrt/msvcrt.rbuild b/reactos/dll/win32/msvcrt/msvcrt.rbuild
index 6e6677f2492..5ae0a496072 100644
--- a/reactos/dll/win32/msvcrt/msvcrt.rbuild
+++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild
@@ -16,7 +16,6 @@
 
 	<library>crt</library>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>pseh</library>
 	<pch>precomp.h</pch>
diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
index fdf7e88f30e..642cfb55a34 100644
--- a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
+++ b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
@@ -9,7 +9,6 @@
 	<file>msvcrt20.c</file>
 	<library>wine</library>
 	<library>msvcrt</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
index 4e7ab666f4f..867b6299718 100644
--- a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
+++ b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
@@ -8,6 +8,5 @@
 	<define name="__WINESRC__" />
 	<file>msvcrt40.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/msvfw32/msvfw32.rbuild b/reactos/dll/win32/msvfw32/msvfw32.rbuild
index 3e6cc002eb0..bd7c362caa4 100644
--- a/reactos/dll/win32/msvfw32/msvfw32.rbuild
+++ b/reactos/dll/win32/msvfw32/msvfw32.rbuild
@@ -18,7 +18,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/msvidc32/msvidc32.rbuild b/reactos/dll/win32/msvidc32/msvidc32.rbuild
index 7ebb98a3381..be8d9eb0036 100644
--- a/reactos/dll/win32/msvidc32/msvidc32.rbuild
+++ b/reactos/dll/win32/msvidc32/msvidc32.rbuild
@@ -7,6 +7,5 @@
 	<file>rsrc.rc</file>
 	<library>wine</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/mswsock/mswsock.rbuild b/reactos/dll/win32/mswsock/mswsock.rbuild
index b5ee00af8a1..3ff00a96f21 100644
--- a/reactos/dll/win32/mswsock/mswsock.rbuild
+++ b/reactos/dll/win32/mswsock/mswsock.rbuild
@@ -1,7 +1,6 @@
 <module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll" unicode="yes">
 	<importlibrary definition="mswsock.spec" />
 	<define name="LE" />
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>extensions.c</file>
 	<file>stubs.c</file>
diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index 005568d25ef..a62b849b5d5 100644
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -28,7 +28,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<file>attribute.c</file>
@@ -63,4 +62,3 @@
 	<dependency>stdole2</dependency>
 	<file>msxml3_v1.idl</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/nddeapi/nddeapi.rbuild b/reactos/dll/win32/nddeapi/nddeapi.rbuild
index a675b40fc8c..ffffa4844ee 100644
--- a/reactos/dll/win32/nddeapi/nddeapi.rbuild
+++ b/reactos/dll/win32/nddeapi/nddeapi.rbuild
@@ -1,10 +1,9 @@
 <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="nddeapi.spec" />
-        <include base="nddeapi">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
-        <library>wine</library>
-        <library>kernel32</library>
-        <library>ntdll</library>
-        <file>nddeapi.c</file>
+	<importlibrary definition="nddeapi.spec" />
+	<include base="nddeapi">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<library>wine</library>
+	<library>ntdll</library>
+	<file>nddeapi.c</file>
 </module>
diff --git a/reactos/dll/win32/netapi32/netapi32.rbuild b/reactos/dll/win32/netapi32/netapi32.rbuild
index 256dcc4a30d..3bf8d57f060 100644
--- a/reactos/dll/win32/netapi32/netapi32.rbuild
+++ b/reactos/dll/win32/netapi32/netapi32.rbuild
@@ -22,7 +22,6 @@
 	<library>iphlpapi</library>
 	<library>ws2_32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/netcfgx/netcfgx.rbuild b/reactos/dll/win32/netcfgx/netcfgx.rbuild
index 342b84acc8e..f846715255d 100644
--- a/reactos/dll/win32/netcfgx/netcfgx.rbuild
+++ b/reactos/dll/win32/netcfgx/netcfgx.rbuild
@@ -4,12 +4,10 @@
 	<library>ntdll</library>
 	<library>rpcrt4</library>
 	<library>setupapi</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>uuid</library>
 	<library>iphlpapi</library>
 	<library>iphlpapi</library>
-	<library>kernel32</library>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild
index 62edbd39b54..b861f9aedeb 100644
--- a/reactos/dll/win32/netid/netid.rbuild
+++ b/reactos/dll/win32/netid/netid.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="netid.spec" />
 	<include base="netid">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/win32/netshell/netshell.rbuild b/reactos/dll/win32/netshell/netshell.rbuild
index f84175bf9fc..f76dbdee79c 100644
--- a/reactos/dll/win32/netshell/netshell.rbuild
+++ b/reactos/dll/win32/netshell/netshell.rbuild
@@ -7,7 +7,6 @@
 	<library>shell32</library>
 	<library>version</library>
 	<library>iphlpapi</library>
-	<library>kernel32</library>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/newdev/newdev.rbuild b/reactos/dll/win32/newdev/newdev.rbuild
index 2b3b27d898e..9d8cb9e4616 100644
--- a/reactos/dll/win32/newdev/newdev.rbuild
+++ b/reactos/dll/win32/newdev/newdev.rbuild
@@ -10,7 +10,6 @@
 	<library>comctl32</library>
 	<library>ntdll</library>
 	<library>setupapi</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>shell32</library>
diff --git a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
index 2609543d4cc..9048109edf5 100644
--- a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
+++ b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
@@ -1,11 +1,10 @@
 <module name="ntdsapi" type="win32dll" baseaddress="${BASEADDRESS_NTDSAPI}" installbase="system32" installname="ntdsapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="ntdsapi.spec" />
-        <include base="ntdsapi">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
-        <library>wine</library>
-        <library>user32</library>
-        <library>kernel32</library>
-        <library>ntdll</library>
-        <file>ntdsapi.c</file>
+	<importlibrary definition="ntdsapi.spec" />
+	<include base="ntdsapi">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<library>wine</library>
+	<library>user32</library>
+	<library>ntdll</library>
+	<file>ntdsapi.c</file>
 </module>
diff --git a/reactos/dll/win32/ntlanman/ntlanman.rbuild b/reactos/dll/win32/ntlanman/ntlanman.rbuild
index 7e50e20d03d..1596633e36a 100644
--- a/reactos/dll/win32/ntlanman/ntlanman.rbuild
+++ b/reactos/dll/win32/ntlanman/ntlanman.rbuild
@@ -3,7 +3,6 @@
 <module name="ntlanman" type="win32dll" baseaddress="${BASEADDRESS_NTLANMAN}" installbase="system32" installname="ntlanman.dll" unicode="yes">
 	<importlibrary definition="ntlanman.spec" />
 	<include base="ntlanman">.</include>
-	<library>kernel32</library>
 	<library>netapi32</library>
 	<library>ntdll</library>
 	<library>wine</library>
diff --git a/reactos/dll/win32/ntmarta/ntmarta.rbuild b/reactos/dll/win32/ntmarta/ntmarta.rbuild
index 8a80e3118d1..56696aa67d1 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.rbuild
+++ b/reactos/dll/win32/ntmarta/ntmarta.rbuild
@@ -4,7 +4,6 @@
 	<define name="__WINESRC__" />
 	<redefine name="_WIN32_WINNT">0x600</redefine>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<file>ntmarta.c</file>
diff --git a/reactos/dll/win32/ntprint/ntprint.rbuild b/reactos/dll/win32/ntprint/ntprint.rbuild
index d70582b5440..8a65cd03dbc 100644
--- a/reactos/dll/win32/ntprint/ntprint.rbuild
+++ b/reactos/dll/win32/ntprint/ntprint.rbuild
@@ -8,7 +8,6 @@
 	<file>ntprint.rc</file>
 	<library>wine</library>
 	<library>winspool</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild
index ab90ff9662c..f3409b38ea3 100644
--- a/reactos/dll/win32/objsel/objsel.rbuild
+++ b/reactos/dll/win32/objsel/objsel.rbuild
@@ -12,7 +12,6 @@
 	<library>ole32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<file>factory.c</file>
diff --git a/reactos/dll/win32/odbc32/odbc32.rbuild b/reactos/dll/win32/odbc32/odbc32.rbuild
index 917b24a1bdb..0539f4abfbe 100644
--- a/reactos/dll/win32/odbc32/odbc32.rbuild
+++ b/reactos/dll/win32/odbc32/odbc32.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<file>proxyodbc.c</file>
 </module>
 </group>
diff --git a/reactos/dll/win32/odbccp32/odbccp32.rbuild b/reactos/dll/win32/odbccp32/odbccp32.rbuild
index a05c9fb918b..253485a359e 100644
--- a/reactos/dll/win32/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/win32/odbccp32/odbccp32.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<file>odbccp32.c</file>
diff --git a/reactos/dll/win32/ole32/ole32.rbuild b/reactos/dll/win32/ole32/ole32.rbuild
index 517d3b48565..1c7969f8da7 100644
--- a/reactos/dll/win32/ole32/ole32.rbuild
+++ b/reactos/dll/win32/ole32/ole32.rbuild
@@ -20,7 +20,6 @@
 	<library>ole32_irot_client</library>
 	<library>ole32_proxy</library>
 	<library>rpcrt4</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>uuid</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/oleacc/oleacc.rbuild b/reactos/dll/win32/oleacc/oleacc.rbuild
index 1e75379b946..a529b98fcd7 100644
--- a/reactos/dll/win32/oleacc/oleacc.rbuild
+++ b/reactos/dll/win32/oleacc/oleacc.rbuild
@@ -10,7 +10,6 @@
 	<file>main.c</file>
 	<file>oleacc.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/oleaut32/oleaut32.rbuild b/reactos/dll/win32/oleaut32/oleaut32.rbuild
index f3b3b5c3764..8b117b93ace 100644
--- a/reactos/dll/win32/oleaut32/oleaut32.rbuild
+++ b/reactos/dll/win32/oleaut32/oleaut32.rbuild
@@ -46,7 +46,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>comctl32</library>
 	<library>urlmon</library>
diff --git a/reactos/dll/win32/olecli32/olecli32.rbuild b/reactos/dll/win32/olecli32/olecli32.rbuild
index 04c27e293c1..29e90e87fbb 100644
--- a/reactos/dll/win32/olecli32/olecli32.rbuild
+++ b/reactos/dll/win32/olecli32/olecli32.rbuild
@@ -1,16 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="olecli32" type="win32dll" baseaddress="${BASEADDRESS_OLECLI32}" installbase="system32" installname="olecli32.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="olecli32.spec" />
-        <include base="olecli32">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
-        <file>olecli_main.c</file>
-        <library>wine</library>
-        <library>ole32</library>
-        <library>gdi32</library>
-        <library>kernel32</library>
-        <library>ntdll</library>
+	<importlibrary definition="olecli32.spec" />
+	<include base="olecli32">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<file>olecli_main.c</file>
+	<library>wine</library>
+	<library>ole32</library>
+	<library>gdi32</library>
+	<library>ntdll</library>
 </module>
-</group>
diff --git a/reactos/dll/win32/oledlg/oledlg.rbuild b/reactos/dll/win32/oledlg/oledlg.rbuild
index ed0acac1f08..879c0b514a0 100644
--- a/reactos/dll/win32/oledlg/oledlg.rbuild
+++ b/reactos/dll/win32/oledlg/oledlg.rbuild
@@ -11,7 +11,6 @@
 	<library>comdlg32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>insobjdlg.c</file>
 	<file>oledlg_main.c</file>
diff --git a/reactos/dll/win32/olepro32/olepro32.rbuild b/reactos/dll/win32/olepro32/olepro32.rbuild
index 68ff9b537bc..837097e5fb6 100644
--- a/reactos/dll/win32/olepro32/olepro32.rbuild
+++ b/reactos/dll/win32/olepro32/olepro32.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>oleaut32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>olepro32stubs.c</file>
 	<file>version.rc</file>
diff --git a/reactos/dll/win32/olesvr32/olesvr32.rbuild b/reactos/dll/win32/olesvr32/olesvr32.rbuild
index 90f5922522c..f36db797247 100644
--- a/reactos/dll/win32/olesvr32/olesvr32.rbuild
+++ b/reactos/dll/win32/olesvr32/olesvr32.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<file>olesvr_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/olethk32/olethk32.rbuild b/reactos/dll/win32/olethk32/olethk32.rbuild
index 82d289266b0..653460355c6 100644
--- a/reactos/dll/win32/olethk32/olethk32.rbuild
+++ b/reactos/dll/win32/olethk32/olethk32.rbuild
@@ -6,6 +6,5 @@
 	<file>main.c</file>
 	<file>version.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/opengl32/opengl32.rbuild b/reactos/dll/win32/opengl32/opengl32.rbuild
index 63992509a19..a367804b29c 100644
--- a/reactos/dll/win32/opengl32/opengl32.rbuild
+++ b/reactos/dll/win32/opengl32/opengl32.rbuild
@@ -1,7 +1,6 @@
 <module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes" crt="msvcrt">
 	<importlibrary definition="opengl32.spec" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/pdh/pdh.rbuild b/reactos/dll/win32/pdh/pdh.rbuild
index 8b325822abd..db1ea7eab09 100644
--- a/reactos/dll/win32/pdh/pdh.rbuild
+++ b/reactos/dll/win32/pdh/pdh.rbuild
@@ -1,11 +1,10 @@
 <module name="pdh" type="win32dll" baseaddress="${BASEADDRESS_PDH}" installbase="system32" installname="pdh.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="pdh.spec" />
-        <include base="pdh">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
-        <redefine name="_WIN32_WINNT">0x600</redefine>
-        <library>wine</library>
-        <library>kernel32</library>
-        <library>ntdll</library>
-        <file>pdh_main.c</file>
+	<importlibrary definition="pdh.spec" />
+	<include base="pdh">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<library>wine</library>
+	<library>ntdll</library>
+	<file>pdh_main.c</file>
 </module>
diff --git a/reactos/dll/win32/pidgen/pidgen.rbuild b/reactos/dll/win32/pidgen/pidgen.rbuild
index 7073cf56a58..504f1acb855 100644
--- a/reactos/dll/win32/pidgen/pidgen.rbuild
+++ b/reactos/dll/win32/pidgen/pidgen.rbuild
@@ -6,6 +6,5 @@
 	<file>main.c</file>
 	<file>rsrc.rc</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/powrprof/powrprof.rbuild b/reactos/dll/win32/powrprof/powrprof.rbuild
index 5688f9f20ea..23d545071a9 100644
--- a/reactos/dll/win32/powrprof/powrprof.rbuild
+++ b/reactos/dll/win32/powrprof/powrprof.rbuild
@@ -5,7 +5,6 @@
 	<include base="powrprof">.</include>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/win32/printui/printui.rbuild b/reactos/dll/win32/printui/printui.rbuild
index 2c1be931331..6596eb2a847 100644
--- a/reactos/dll/win32/printui/printui.rbuild
+++ b/reactos/dll/win32/printui/printui.rbuild
@@ -1,12 +1,11 @@
 <module name="printui" type="win32dll" baseaddress="${BASEADDRESS_PRINTUI}" installbase="system32" installname="printui.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="printui.spec" />
-        <include base="printui">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
-        <library>wine</library>
-        <library>shell32</library>
-        <library>kernel32</library>
-        <library>ntdll</library>
-        <file>printui.c</file>
-        <file>printui.rc</file>
+	<importlibrary definition="printui.spec" />
+	<include base="printui">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<library>wine</library>
+	<library>shell32</library>
+	<library>ntdll</library>
+	<file>printui.c</file>
+	<file>printui.rc</file>
 </module>
diff --git a/reactos/dll/win32/psapi/psapi.rbuild b/reactos/dll/win32/psapi/psapi.rbuild
index ee2bdb8dc15..812265a2b27 100644
--- a/reactos/dll/win32/psapi/psapi.rbuild
+++ b/reactos/dll/win32/psapi/psapi.rbuild
@@ -5,7 +5,6 @@
 	<library>epsapi</library>
 	<library>pseh</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
 	<pch>precomp.h</pch>
 	-->
diff --git a/reactos/dll/win32/pstorec/pstorec.rbuild b/reactos/dll/win32/pstorec/pstorec.rbuild
index 57f53ca12b3..7bc8a8ae92b 100644
--- a/reactos/dll/win32/pstorec/pstorec.rbuild
+++ b/reactos/dll/win32/pstorec/pstorec.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="pstorec.spec" />
 	<include base="pstorec">.</include>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<file>pstorec.c</file>
 </module>
diff --git a/reactos/dll/win32/qmgr/qmgr.rbuild b/reactos/dll/win32/qmgr/qmgr.rbuild
index 333cca732e9..38ac841058b 100644
--- a/reactos/dll/win32/qmgr/qmgr.rbuild
+++ b/reactos/dll/win32/qmgr/qmgr.rbuild
@@ -13,7 +13,6 @@
 	<library>urlmon</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>qmgr_local_interface</library>
 	<file>enum_files.c</file>
diff --git a/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild b/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild
index 2c429a235ba..64dc200cd8c 100644
--- a/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild
+++ b/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>qmgrprxy_interface</library>
 	<library>qmgrprxy_proxy</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>rpcrt4</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/query/query.rbuild b/reactos/dll/win32/query/query.rbuild
index c84ca002a4c..a1f718a0d4d 100644
--- a/reactos/dll/win32/query/query.rbuild
+++ b/reactos/dll/win32/query/query.rbuild
@@ -7,6 +7,5 @@
 	<file>query_main.c</file>
 	<library>wine</library>
 	<library>uuid</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/rasadhlp/rasadhlp.rbuild b/reactos/dll/win32/rasadhlp/rasadhlp.rbuild
index efb5ed27779..e12c60d7c02 100644
--- a/reactos/dll/win32/rasadhlp/rasadhlp.rbuild
+++ b/reactos/dll/win32/rasadhlp/rasadhlp.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="rasadhlp.spec" />
 	<include base="ReactOS">include/reactos/winsock</include>
 	<include base="rasadhlp">.</include>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>ws2_32</library>
 	<file>autodial.c</file>
diff --git a/reactos/dll/win32/rasapi32/rasapi32.rbuild b/reactos/dll/win32/rasapi32/rasapi32.rbuild
index b25947d0b2a..ca0896a6600 100644
--- a/reactos/dll/win32/rasapi32/rasapi32.rbuild
+++ b/reactos/dll/win32/rasapi32/rasapi32.rbuild
@@ -8,7 +8,6 @@
 	<define name="__WINESRC__" />
 	<file>rasapi.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/rasdlg/rasdlg.rbuild b/reactos/dll/win32/rasdlg/rasdlg.rbuild
index 4a12179090b..8c0dc5c70fa 100644
--- a/reactos/dll/win32/rasdlg/rasdlg.rbuild
+++ b/reactos/dll/win32/rasdlg/rasdlg.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="rasdlg.spec" />
 	<include base="rasdlg">.</include>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>uuid</library>
 	<file>rasdlg.c</file>
diff --git a/reactos/dll/win32/rasman/rasman.rbuild b/reactos/dll/win32/rasman/rasman.rbuild
index c177d0ea4ee..2fabb5ceb8d 100644
--- a/reactos/dll/win32/rasman/rasman.rbuild
+++ b/reactos/dll/win32/rasman/rasman.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="rasman.spec" />
 	<include base="rasman">.</include>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>uuid</library>
 	<file>rasman.c</file>
diff --git a/reactos/dll/win32/resutils/resutils.rbuild b/reactos/dll/win32/resutils/resutils.rbuild
index 81fbaa99405..f4c65c62012 100644
--- a/reactos/dll/win32/resutils/resutils.rbuild
+++ b/reactos/dll/win32/resutils/resutils.rbuild
@@ -5,6 +5,5 @@
 	<define name="__WINESRC__" />
 	<file>resutils.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/riched20/riched20.rbuild b/reactos/dll/win32/riched20/riched20.rbuild
index f28a2fa0e14..0191c64390a 100644
--- a/reactos/dll/win32/riched20/riched20.rbuild
+++ b/reactos/dll/win32/riched20/riched20.rbuild
@@ -35,7 +35,6 @@
 	<library>imm32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/riched32/riched32.rbuild b/reactos/dll/win32/riched32/riched32.rbuild
index 590c1b3940c..df98770a420 100644
--- a/reactos/dll/win32/riched32/riched32.rbuild
+++ b/reactos/dll/win32/riched32/riched32.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>riched20</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
index 67f05aebcfb..a0dd9e14e40 100644
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -10,7 +10,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>rpcrt4_epm_client</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>secur32</library>
diff --git a/reactos/dll/win32/rsabase/rsabase.rbuild b/reactos/dll/win32/rsabase/rsabase.rbuild
index c86ac676398..8f530853879 100644
--- a/reactos/dll/win32/rsabase/rsabase.rbuild
+++ b/reactos/dll/win32/rsabase/rsabase.rbuild
@@ -9,7 +9,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>rsaenh</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/dll/win32/rsaenh/rsaenh.rbuild b/reactos/dll/win32/rsaenh/rsaenh.rbuild
index d7d6b24de4f..fab9eb9011a 100644
--- a/reactos/dll/win32/rsaenh/rsaenh.rbuild
+++ b/reactos/dll/win32/rsaenh/rsaenh.rbuild
@@ -21,7 +21,6 @@
 	<library>wine</library>
 	<library>crypt32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/samlib/samlib.rbuild b/reactos/dll/win32/samlib/samlib.rbuild
index 32c5727607f..3771b94afa8 100644
--- a/reactos/dll/win32/samlib/samlib.rbuild
+++ b/reactos/dll/win32/samlib/samlib.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="samlib.spec" />
 	<include base="samlib">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>dllmain.c</file>
 	<file>samlib.c</file>
diff --git a/reactos/dll/win32/samsrv/samsrv.rbuild b/reactos/dll/win32/samsrv/samsrv.rbuild
index 805b97dbd71..3676ab2de2d 100644
--- a/reactos/dll/win32/samsrv/samsrv.rbuild
+++ b/reactos/dll/win32/samsrv/samsrv.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="samsrv.spec" />
 	<include base="samsrv">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>samsrv.c</file>
 	<file>samsrv.rc</file>
 </module>
diff --git a/reactos/dll/win32/sccbase/sccbase.rbuild b/reactos/dll/win32/sccbase/sccbase.rbuild
index 60baaa55ca5..dfe4f54918f 100644
--- a/reactos/dll/win32/sccbase/sccbase.rbuild
+++ b/reactos/dll/win32/sccbase/sccbase.rbuild
@@ -6,6 +6,5 @@
 	<define name="__WINESRC__" />
 	<file>main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/schannel/schannel.rbuild b/reactos/dll/win32/schannel/schannel.rbuild
index 266313cbc2e..cfdfa8169b2 100644
--- a/reactos/dll/win32/schannel/schannel.rbuild
+++ b/reactos/dll/win32/schannel/schannel.rbuild
@@ -7,7 +7,6 @@
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>secur32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>lsamode.c</file>
 	<file>schannel_main.c</file>
diff --git a/reactos/dll/win32/secur32/secur32.rbuild b/reactos/dll/win32/secur32/secur32.rbuild
index 18a31c42b7e..30002e14496 100644
--- a/reactos/dll/win32/secur32/secur32.rbuild
+++ b/reactos/dll/win32/secur32/secur32.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<define name="__SECUR32__" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>dllmain.c</file>
 	<file>lsa.c</file>
diff --git a/reactos/dll/win32/security/security.rbuild b/reactos/dll/win32/security/security.rbuild
index c1cea3b9b12..e0519dc0d69 100644
--- a/reactos/dll/win32/security/security.rbuild
+++ b/reactos/dll/win32/security/security.rbuild
@@ -3,7 +3,6 @@
 	<include base="security">.</include>
 	<define name="__SECURITY__" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>security.rc</file>
 </module>
diff --git a/reactos/dll/win32/sensapi/sensapi.rbuild b/reactos/dll/win32/sensapi/sensapi.rbuild
index c4408d1e8ec..e7b686e9eaa 100644
--- a/reactos/dll/win32/sensapi/sensapi.rbuild
+++ b/reactos/dll/win32/sensapi/sensapi.rbuild
@@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>sensapi.c</file>
 </module>
diff --git a/reactos/dll/win32/serialui/serialui.rbuild b/reactos/dll/win32/serialui/serialui.rbuild
index af942fcfb3b..31c760b7a45 100644
--- a/reactos/dll/win32/serialui/serialui.rbuild
+++ b/reactos/dll/win32/serialui/serialui.rbuild
@@ -1,7 +1,6 @@
 <module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll" unicode="yes">
 	<importlibrary definition="serialui.spec" />
 	<include base="serialui">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>shlwapi</library>
 	<file>serialui.c</file>
diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild
index e2d901474c6..81c1dd70394 100644
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@@ -16,7 +16,6 @@
 	<library>ntdll</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>rpcrt4</library>
diff --git a/reactos/dll/win32/sfc/sfc.rbuild b/reactos/dll/win32/sfc/sfc.rbuild
index 527c0f6f07d..8bc34b450c9 100644
--- a/reactos/dll/win32/sfc/sfc.rbuild
+++ b/reactos/dll/win32/sfc/sfc.rbuild
@@ -1,7 +1,6 @@
 <module name="sfc" type="win32dll" baseaddress="${BASEADDRESS_SFC}" installbase="system32" installname="sfc.dll" allowwarnings="yes">
 	<importlibrary definition="sfc.spec" />
 	<include base="sfc">.</include>
-	<library>kernel32</library>
 	<file>sfc.c</file>
 	<pch>precomp.h</pch>
 </module>
diff --git a/reactos/dll/win32/sfc_os/sfc_os.rbuild b/reactos/dll/win32/sfc_os/sfc_os.rbuild
index 4209bfda2df..033f4ddd9d5 100644
--- a/reactos/dll/win32/sfc_os/sfc_os.rbuild
+++ b/reactos/dll/win32/sfc_os/sfc_os.rbuild
@@ -1,7 +1,6 @@
 <module name="sfc_os" type="win32dll" baseaddress="${BASEADDRESS_SFC_OS}" installbase="system32" installname="sfc_os.dll" allowwarnings="yes">
 	<importlibrary definition="sfc_os.spec" />
 	<include base="sfc_os">.</include>
-	<library>kernel32</library>
 	<file>sfc_os.c</file>
 	<pch>precomp.h</pch>
 </module>
diff --git a/reactos/dll/win32/shdoclc/shdoclc.rbuild b/reactos/dll/win32/shdoclc/shdoclc.rbuild
index 0fa23e20b55..a47d5f094ba 100644
--- a/reactos/dll/win32/shdoclc/shdoclc.rbuild
+++ b/reactos/dll/win32/shdoclc/shdoclc.rbuild
@@ -5,6 +5,5 @@
 	<include base="shdocvw">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
-	<library>kernel32</library>
 	<file>rsrc.rc</file>
 </module>
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index bcaea068d23..a4ca4198fa2 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>ole32</library>
@@ -45,4 +44,3 @@
 <module name="shdocvw_v1" type="embeddedtypelib" allowwarnings="true">
 	<file>shdocvw_v1.idl</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild
index bf253956d81..5276af049f5 100644
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@@ -13,7 +13,6 @@
 	<library>uuid</library>
 	<library>recyclebin</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/shfolder/shfolder.rbuild b/reactos/dll/win32/shfolder/shfolder.rbuild
index 7ad1332f8db..02bd50cee30 100644
--- a/reactos/dll/win32/shfolder/shfolder.rbuild
+++ b/reactos/dll/win32/shfolder/shfolder.rbuild
@@ -9,7 +9,6 @@
 	<file>version.rc</file>
 	<library>wine</library>
 	<library>shell32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/shimgvw/shimgvw.rbuild b/reactos/dll/win32/shimgvw/shimgvw.rbuild
index 719baf651f5..2e5eea1e3e0 100644
--- a/reactos/dll/win32/shimgvw/shimgvw.rbuild
+++ b/reactos/dll/win32/shimgvw/shimgvw.rbuild
@@ -1,7 +1,6 @@
 <module name="shimgvw" type="win32dll" baseaddress="${BASEADDRESS_SHIMGVW}" installbase="system32" installname="shimgvw.dll">
 	<importlibrary definition="shimgvw.spec" />
 	<include base="shimgvw">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>comctl32</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/shlwapi/shlwapi.rbuild b/reactos/dll/win32/shlwapi/shlwapi.rbuild
index dc89c3e9dd6..37fb2e8427f 100644
--- a/reactos/dll/win32/shlwapi/shlwapi.rbuild
+++ b/reactos/dll/win32/shlwapi/shlwapi.rbuild
@@ -27,7 +27,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>oleaut32</library>
 	<library>ole32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/win32/slbcsp/slbcsp.rbuild b/reactos/dll/win32/slbcsp/slbcsp.rbuild
index 44028b1d26c..12a4b825a91 100644
--- a/reactos/dll/win32/slbcsp/slbcsp.rbuild
+++ b/reactos/dll/win32/slbcsp/slbcsp.rbuild
@@ -6,6 +6,5 @@
 	<define name="__WINESRC__" />
 	<file>main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/sndblst/sndblst.rbuild b/reactos/dll/win32/sndblst/sndblst.rbuild
index 8c4e700c0b8..877b9564026 100644
--- a/reactos/dll/win32/sndblst/sndblst.rbuild
+++ b/reactos/dll/win32/sndblst/sndblst.rbuild
@@ -8,7 +8,6 @@
     <library>mment4</library>
     <library>mmebuddy</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
     <library>advapi32</library>
diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild
index 5c4fac324b5..e0a5e9b012a 100644
--- a/reactos/dll/win32/snmpapi/snmpapi.rbuild
+++ b/reactos/dll/win32/snmpapi/snmpapi.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>wine</library>
 	<file>main.c</file>
 	<file>snmpapi.c</file>
diff --git a/reactos/dll/win32/spoolss/spoolss.rbuild b/reactos/dll/win32/spoolss/spoolss.rbuild
index 82efb151c12..85fbf39755f 100644
--- a/reactos/dll/win32/spoolss/spoolss.rbuild
+++ b/reactos/dll/win32/spoolss/spoolss.rbuild
@@ -10,7 +10,6 @@
 	<file>router.c</file>
 	<library>wine</library>
 	<library>winspool</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/srclient/srclient.rbuild b/reactos/dll/win32/srclient/srclient.rbuild
index f7be6ca20b6..565c45d8e15 100644
--- a/reactos/dll/win32/srclient/srclient.rbuild
+++ b/reactos/dll/win32/srclient/srclient.rbuild
@@ -4,6 +4,5 @@
 	<importlibrary definition="srclient.spec" />
 	<include base="srclient">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>srclient_main.c</file>
 </module>
diff --git a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
index c9380ba5ecb..0b96229067f 100644
--- a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
+++ b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
@@ -12,7 +12,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<dependency>std_ole_v2</dependency>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<file>rsrc.rc</file>
 </module>
 </group>
diff --git a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
index edd4935c7ee..8dab92c98ca 100644
--- a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
+++ b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
@@ -12,7 +12,5 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<dependency>std_ole_v1</dependency>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<file>rsrc.rc</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/sti/sti.rbuild b/reactos/dll/win32/sti/sti.rbuild
index 66372bad58e..d38e7b2863f 100644
--- a/reactos/dll/win32/sti/sti.rbuild
+++ b/reactos/dll/win32/sti/sti.rbuild
@@ -13,7 +13,5 @@
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/sxs/sxs.rbuild b/reactos/dll/win32/sxs/sxs.rbuild
index b21ee66606d..3e0c4b715ac 100644
--- a/reactos/dll/win32/sxs/sxs.rbuild
+++ b/reactos/dll/win32/sxs/sxs.rbuild
@@ -1,14 +1,11 @@
 <?xml version="1.0"?>
 <!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" />
-        <include base="sxs">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__WINESRC__" />
-        <file>sxs.c</file>
-        <library>wine</library>
-        <library>kernel32</library>
-        <library>ntdll</library>
+	<importlibrary definition="sxs.spec" />
+	<include base="sxs">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<file>sxs.c</file>
+	<library>wine</library>
+	<library>ntdll</library>
 </module>
-</group>
\ No newline at end of file
diff --git a/reactos/dll/win32/syssetup/syssetup.rbuild b/reactos/dll/win32/syssetup/syssetup.rbuild
index b6a23ab7d03..d2909ce527b 100644
--- a/reactos/dll/win32/syssetup/syssetup.rbuild
+++ b/reactos/dll/win32/syssetup/syssetup.rbuild
@@ -4,7 +4,6 @@
 	<library>pseh</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/t2embed/t2embed.rbuild b/reactos/dll/win32/t2embed/t2embed.rbuild
index 6c239ebb5cd..76d948055d8 100644
--- a/reactos/dll/win32/t2embed/t2embed.rbuild
+++ b/reactos/dll/win32/t2embed/t2embed.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="t2embed.spec" />
 	<include base="t2embed">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>advapi32</library>
@@ -10,4 +9,3 @@
 	<library>wine</library>
 	<file>t2embed.c</file>
 	<file>t2embed.rc</file>
-</module>
\ No newline at end of file
diff --git a/reactos/dll/win32/tapi32/tapi32.rbuild b/reactos/dll/win32/tapi32/tapi32.rbuild
index 077a232cfb8..cbbffb5d249 100644
--- a/reactos/dll/win32/tapi32/tapi32.rbuild
+++ b/reactos/dll/win32/tapi32/tapi32.rbuild
@@ -12,7 +12,6 @@
 	<file>phone.c</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/traffic/traffic.rbuild b/reactos/dll/win32/traffic/traffic.rbuild
index 0c9afcda041..fc72cd55aea 100644
--- a/reactos/dll/win32/traffic/traffic.rbuild
+++ b/reactos/dll/win32/traffic/traffic.rbuild
@@ -5,6 +5,5 @@
 	<define name="__WINESRC__" />
 	<file>traffic_main.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/twain_32/twain_32.rbuild b/reactos/dll/win32/twain_32/twain_32.rbuild
index 4eb53bd377d..cbcc5fedaeb 100644
--- a/reactos/dll/win32/twain_32/twain_32.rbuild
+++ b/reactos/dll/win32/twain_32/twain_32.rbuild
@@ -3,7 +3,6 @@
 	<include base="twain_32">.</include>
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>capability.c</file>
 	<file>ds_audio.c</file>
 	<file>ds_ctrl.c</file>
diff --git a/reactos/dll/win32/updspapi/updspapi.rbuild b/reactos/dll/win32/updspapi/updspapi.rbuild
index 13597569a03..5b2ea9defee 100644
--- a/reactos/dll/win32/updspapi/updspapi.rbuild
+++ b/reactos/dll/win32/updspapi/updspapi.rbuild
@@ -6,6 +6,5 @@
 	<file>main.c</file>
 	<library>wine</library>
 	<library>setupapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/url/url.rbuild b/reactos/dll/win32/url/url.rbuild
index 133de9c8104..049ffad9765 100644
--- a/reactos/dll/win32/url/url.rbuild
+++ b/reactos/dll/win32/url/url.rbuild
@@ -7,6 +7,5 @@
 	<library>wine</library>
 	<library>shell32</library>
 	<library>shlwapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/urlmon/urlmon.rbuild b/reactos/dll/win32/urlmon/urlmon.rbuild
index fd15a7b0ab4..48034c5b4bb 100644
--- a/reactos/dll/win32/urlmon/urlmon.rbuild
+++ b/reactos/dll/win32/urlmon/urlmon.rbuild
@@ -36,7 +36,6 @@
 	<library>wininet</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 <module name="urlmon_local_interface" type="idlinterface">
diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild
index 20d37af814b..6fd34e68547 100644
--- a/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<library>wine</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>imm32</library>
 	<library>win32ksys</library>
diff --git a/reactos/dll/win32/userenv/userenv.rbuild b/reactos/dll/win32/userenv/userenv.rbuild
index 92a5339a23b..0f6e4b58914 100644
--- a/reactos/dll/win32/userenv/userenv.rbuild
+++ b/reactos/dll/win32/userenv/userenv.rbuild
@@ -3,7 +3,6 @@
 	<include base="userenv">.</include>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<pch>precomp.h</pch>
diff --git a/reactos/dll/win32/usp10/usp10.rbuild b/reactos/dll/win32/usp10/usp10.rbuild
index f385bf3ca6f..ad071018a46 100644
--- a/reactos/dll/win32/usp10/usp10.rbuild
+++ b/reactos/dll/win32/usp10/usp10.rbuild
@@ -9,7 +9,6 @@
 	<file>usp10.c</file>
 	<library>wine</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/uxtheme/uxtheme.rbuild b/reactos/dll/win32/uxtheme/uxtheme.rbuild
index 7bee0a3305a..7e4c4dcfce5 100644
--- a/reactos/dll/win32/uxtheme/uxtheme.rbuild
+++ b/reactos/dll/win32/uxtheme/uxtheme.rbuild
@@ -20,7 +20,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>msimg32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
index fb48d1b676a..525213c75a1 100644
--- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
+++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="vdmdbg.spec" />
 	<include base="vdmdbg">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>vdmdbg.c</file>
 	<pch>vdmdbg.h</pch>
 </module>
diff --git a/reactos/dll/win32/version/version.rbuild b/reactos/dll/win32/version/version.rbuild
index d01932da1d1..fcc79152e41 100644
--- a/reactos/dll/win32/version/version.rbuild
+++ b/reactos/dll/win32/version/version.rbuild
@@ -12,7 +12,6 @@
 	<file>version.rc</file>
 	<library>wine</library>
 	<library>lz32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
index 0016ded734c..c6cf6abff82 100644
--- a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
+++ b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
@@ -8,7 +8,6 @@
 	<!-- <define name="USERMODE_MIXER" /> Enable this line to for usermode mixing support -->
 	<library>mmebuddy</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/windowscodecs/windowscodecs.rbuild b/reactos/dll/win32/windowscodecs/windowscodecs.rbuild
index 843ae750a18..563a7a99352 100644
--- a/reactos/dll/win32/windowscodecs/windowscodecs.rbuild
+++ b/reactos/dll/win32/windowscodecs/windowscodecs.rbuild
@@ -12,7 +12,6 @@
 	<library>uuid</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 
 	<file>bmpdecode.c</file>
 	<file>bmpencode.c</file>
diff --git a/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild b/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
index 020db52a706..fec518725e0 100644
--- a/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
+++ b/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
@@ -15,6 +15,5 @@
 	<library>wine</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/winfax/winfax.rbuild b/reactos/dll/win32/winfax/winfax.rbuild
index be1cb60b22a..1f99d1ee5e0 100644
--- a/reactos/dll/win32/winfax/winfax.rbuild
+++ b/reactos/dll/win32/winfax/winfax.rbuild
@@ -1,8 +1,7 @@
 <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="winfax.spec" />
-        <include base="winfax">.</include>
-        <library>kernel32</library>
-        <library>ntdll</library>
-        <file>winfax.c</file>
-        <file>winfax.rc</file>
-</module>
\ No newline at end of file
+	<importlibrary definition="winfax.spec" />
+	<include base="winfax">.</include>
+	<library>ntdll</library>
+	<file>winfax.c</file>
+	<file>winfax.rc</file>
+</module>
diff --git a/reactos/dll/win32/winhttp/winhttp.rbuild b/reactos/dll/win32/winhttp/winhttp.rbuild
index d054b44a746..ae79b5baf6e 100644
--- a/reactos/dll/win32/winhttp/winhttp.rbuild
+++ b/reactos/dll/win32/winhttp/winhttp.rbuild
@@ -18,7 +18,6 @@
 	<library>shlwapi</library>
 	<library>wininet</library>
 	<library>ws2_32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/wininet/wininet.rbuild b/reactos/dll/win32/wininet/wininet.rbuild
index 11f6872b444..4a83d0b0ac4 100644
--- a/reactos/dll/win32/wininet/wininet.rbuild
+++ b/reactos/dll/win32/wininet/wininet.rbuild
@@ -18,7 +18,6 @@
 	<library>shell32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>secur32</library>
 	<library>crypt32</library>
diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild
index c7178b58a4c..e6de9e5fb85 100644
--- a/reactos/dll/win32/winmm/midimap/midimap.rbuild
+++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild
@@ -5,7 +5,6 @@
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>winmm</library>
diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild
index 52688daf28b..ab10fea07ea 100644
--- a/reactos/dll/win32/winmm/winmm.rbuild
+++ b/reactos/dll/win32/winmm/winmm.rbuild
@@ -11,7 +11,6 @@
 	<define name="_WINE" />
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/winspool/winspool.rbuild b/reactos/dll/win32/winspool/winspool.rbuild
index 09fa7a61d66..f5d5df57e98 100644
--- a/reactos/dll/win32/winspool/winspool.rbuild
+++ b/reactos/dll/win32/winspool/winspool.rbuild
@@ -3,7 +3,6 @@
 	<include base="winspool">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>shlwapi</library>
 	<file>info.c</file>
diff --git a/reactos/dll/win32/winsta/winsta.rbuild b/reactos/dll/win32/winsta/winsta.rbuild
index b3a29b4bd51..85e53c1ea53 100644
--- a/reactos/dll/win32/winsta/winsta.rbuild
+++ b/reactos/dll/win32/winsta/winsta.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="winsta.spec" />
 	<include base="winsta">.</include>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<pch>winsta.h</pch>
 	<file>logon.c</file>
diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild
index 2414bf584f4..1c73efd7038 100644
--- a/reactos/dll/win32/wintrust/wintrust.rbuild
+++ b/reactos/dll/win32/wintrust/wintrust.rbuild
@@ -9,7 +9,6 @@
 	<library>cryptui</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>imagehlp</library>
 	<library>ntdll</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/wlanapi/wlanapi.rbuild b/reactos/dll/win32/wlanapi/wlanapi.rbuild
index 348a6adde9c..781a8ae7a44 100644
--- a/reactos/dll/win32/wlanapi/wlanapi.rbuild
+++ b/reactos/dll/win32/wlanapi/wlanapi.rbuild
@@ -4,7 +4,6 @@
 	<include base="wlansvc_client">.</include>
 	<library>wlansvc_client</library>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>rpcrt4</library>
 	<library>pseh</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/wldap32/wldap32.rbuild b/reactos/dll/win32/wldap32/wldap32.rbuild
index ded7bb5e051..d3f16b35479 100644
--- a/reactos/dll/win32/wldap32/wldap32.rbuild
+++ b/reactos/dll/win32/wldap32/wldap32.rbuild
@@ -29,7 +29,6 @@
 	<file>wldap32.rc</file>
 	<library>wine</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/wmi/wmi.rbuild b/reactos/dll/win32/wmi/wmi.rbuild
index 2e6afa625cb..7bdc7767b6a 100644
--- a/reactos/dll/win32/wmi/wmi.rbuild
+++ b/reactos/dll/win32/wmi/wmi.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="wmi.spec" />
 	<include base="wmi">.</include>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>wmi.rc</file>
 </module>
diff --git a/reactos/dll/win32/ws2_32/ws2_32.rbuild b/reactos/dll/win32/ws2_32/ws2_32.rbuild
index 849ed1c88e0..f23493b027e 100644
--- a/reactos/dll/win32/ws2_32/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild
@@ -5,7 +5,6 @@
 	<define name="LE" />
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>dnsapi</library>
diff --git a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
index 88bce90550f..2fee79c1a9e 100644
--- a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
@@ -5,7 +5,6 @@
 	<define name="LE" />
 	<library>wine</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>dnsapi</library>
diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild
index 52794c2398b..045c924e7ff 100644
--- a/reactos/dll/win32/ws2help/ws2help.rbuild
+++ b/reactos/dll/win32/ws2help/ws2help.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/winsock</include>
 	<library>advapi32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>apc.c</file>
 	<file>context.c</file>
diff --git a/reactos/dll/win32/wshirda/wshirda.rbuild b/reactos/dll/win32/wshirda/wshirda.rbuild
index 2e2fe617437..41ca8e4ad84 100644
--- a/reactos/dll/win32/wshirda/wshirda.rbuild
+++ b/reactos/dll/win32/wshirda/wshirda.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="wshirda.spec" />
 	<include base="wshirda">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>wshirda.c</file>
 	<file>wshirda.rc</file>
diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
index 84e3cae9a1d..52f63613b93 100644
--- a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
+++ b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="wshtcpip.spec" />
 	<include base="wshtcpip">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>wshtcpip.c</file>
 	<file>wshtcpip.rc</file>
diff --git a/reactos/dll/win32/wsock32/wsock32.rbuild b/reactos/dll/win32/wsock32/wsock32.rbuild
index 757702b4547..a0d74bc4fd6 100644
--- a/reactos/dll/win32/wsock32/wsock32.rbuild
+++ b/reactos/dll/win32/wsock32/wsock32.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="wsock32.def" />
 	<include base="wsock32">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>stubs.c</file>
 	<file>wsock32.rc</file>
diff --git a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
index 594c97e181d..f538fad8fe6 100644
--- a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
+++ b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
@@ -9,7 +9,6 @@
 	<file>wtsapi32.c</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/reactos/dll/win32/wuapi/wuapi.rbuild b/reactos/dll/win32/wuapi/wuapi.rbuild
index bca3990004d..68d312c3abb 100644
--- a/reactos/dll/win32/wuapi/wuapi.rbuild
+++ b/reactos/dll/win32/wuapi/wuapi.rbuild
@@ -16,6 +16,5 @@
 	<library>uuid</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/xinput1_1/xinput1_1.rbuild b/reactos/dll/win32/xinput1_1/xinput1_1.rbuild
index 8da638ca1c9..0e126933b5c 100644
--- a/reactos/dll/win32/xinput1_1/xinput1_1.rbuild
+++ b/reactos/dll/win32/xinput1_1/xinput1_1.rbuild
@@ -3,7 +3,6 @@
 	<include base="xinput1_1">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<file>xinput1_1_main.c</file>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/dll/win32/xinput1_2/xinput1_2.rbuild b/reactos/dll/win32/xinput1_2/xinput1_2.rbuild
index e35428ba31e..a7aba7ad58b 100644
--- a/reactos/dll/win32/xinput1_2/xinput1_2.rbuild
+++ b/reactos/dll/win32/xinput1_2/xinput1_2.rbuild
@@ -3,7 +3,6 @@
 	<include base="xinput1_2">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<file>xinput1_2_main.c</file>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/dll/win32/xinput1_3/xinput1_3.rbuild b/reactos/dll/win32/xinput1_3/xinput1_3.rbuild
index 1353501bcf5..2a39cb47dfc 100644
--- a/reactos/dll/win32/xinput1_3/xinput1_3.rbuild
+++ b/reactos/dll/win32/xinput1_3/xinput1_3.rbuild
@@ -3,7 +3,6 @@
 	<include base="xinput1_3">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<library>wine</library>
 	<file>xinput1_3_main.c</file>
 	<file>version.rc</file>
diff --git a/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild b/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild
index 0b7097648f2..9db3ca210a7 100644
--- a/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild
+++ b/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild
@@ -3,7 +3,6 @@
 	<include base="xinput9_1_0">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<library>kernel32</library>
 	<file>xinput9_1_0_main.c</file>
 	<file>version.rc</file>
 </module>
diff --git a/reactos/dll/win32/xmllite/xmllite.rbuild b/reactos/dll/win32/xmllite/xmllite.rbuild
index 504dccb6f1e..207c7839091 100644
--- a/reactos/dll/win32/xmllite/xmllite.rbuild
+++ b/reactos/dll/win32/xmllite/xmllite.rbuild
@@ -4,6 +4,5 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<file>xmllite_main.c</file>
 </module>
diff --git a/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild b/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild
index aac33b56743..fc5310819a8 100644
--- a/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild
+++ b/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/libs/sound</include>
 	<include base="wdmaud_kernel">.</include>
 	<include base="libsamplerate">.</include>
-	<library>kernel32</library>
 	<library>setupapi</library>
 	<library>libsamplerate</library>
 	<library>ksuser</library>
diff --git a/reactos/lib/3rdparty/cardlib/cardlib.rbuild b/reactos/lib/3rdparty/cardlib/cardlib.rbuild
index 1ed622c2cf1..4d65605c2cd 100644
--- a/reactos/lib/3rdparty/cardlib/cardlib.rbuild
+++ b/reactos/lib/3rdparty/cardlib/cardlib.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cardlib" type="staticlibrary">
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/subsystems/ntvdm/ntvdm.rbuild b/reactos/subsystems/ntvdm/ntvdm.rbuild
index b291042fe4a..24cd31e358c 100644
--- a/reactos/subsystems/ntvdm/ntvdm.rbuild
+++ b/reactos/subsystems/ntvdm/ntvdm.rbuild
@@ -3,7 +3,6 @@
 <module name="ntvdm" type="win32cui" installbase="system32" installname="ntvdm.exe">
 	<include base="ntvdm">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
diff --git a/reactos/subsystems/win/winsrv/winsrv.rbuild b/reactos/subsystems/win/winsrv/winsrv.rbuild
index 05077cd8835..7d681c98f73 100644
--- a/reactos/subsystems/win/winsrv/winsrv.rbuild
+++ b/reactos/subsystems/win/winsrv/winsrv.rbuild
@@ -6,7 +6,6 @@
 	<include base="csr">include</include>
 	<library>ntdll</library>
 	<library>csrsrv</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>dllmain.c</file>
diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
index 6853d9db758..b49514f7009 100644
--- a/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
+++ b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
@@ -9,7 +9,6 @@
 	<include base="console">.</include>
 	<compilerflag compilerset="gcc">-fms-extensions</compilerflag>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
diff --git a/rosapps/applications/cmdutils/appwiz/appwiz.rbuild b/rosapps/applications/cmdutils/appwiz/appwiz.rbuild
index ff323d56011..1c84412cf6e 100644
--- a/rosapps/applications/cmdutils/appwiz/appwiz.rbuild
+++ b/rosapps/applications/cmdutils/appwiz/appwiz.rbuild
@@ -1,5 +1,4 @@
 <module name="appwiz.exe" type="win32cui" installbase="system32" installname="appwiz.exe">
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>shell32</library>
diff --git a/rosapps/applications/cmdutils/comp/comp.rbuild b/rosapps/applications/cmdutils/comp/comp.rbuild
index 0a748deb8e1..13d249a3aca 100644
--- a/rosapps/applications/cmdutils/comp/comp.rbuild
+++ b/rosapps/applications/cmdutils/comp/comp.rbuild
@@ -1,6 +1,4 @@
 <module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true">
-    <library>kernel32</library>
-    <file>comp.c</file>
-    <file>comp.rc</file>
+	<file>comp.c</file>
+	<file>comp.rc</file>
 </module>
-
diff --git a/rosapps/applications/cmdutils/mode/mode.rbuild b/rosapps/applications/cmdutils/mode/mode.rbuild
index 69790501ee6..11eb3065335 100644
--- a/rosapps/applications/cmdutils/mode/mode.rbuild
+++ b/rosapps/applications/cmdutils/mode/mode.rbuild
@@ -1,8 +1,6 @@
 <module name="mode" type="win32cui" installbase="system32" installname="mode.exe">
 	<include base="mode">.</include>
-	<library>kernel32</library>
 	<library>shell32</library>
 	<library>user32</library>
 	<file>mode.c</file>
 	<file>mode.rc</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/cmdutils/sort/sort.rbuild b/rosapps/applications/cmdutils/sort/sort.rbuild
index a74baabb39a..188fd1eb282 100644
--- a/rosapps/applications/cmdutils/sort/sort.rbuild
+++ b/rosapps/applications/cmdutils/sort/sort.rbuild
@@ -1,5 +1,4 @@
 <module name="sort" type="win32cui" installbase="system32" installname="sort.exe">
-	<library>kernel32</library>
 	<file>sort.c</file>
 	<file>sort.rc</file>
 </module>
diff --git a/rosapps/applications/cmdutils/tee/tee.rbuild b/rosapps/applications/cmdutils/tee/tee.rbuild
index 0b4e71e4f54..aa9583160cf 100644
--- a/rosapps/applications/cmdutils/tee/tee.rbuild
+++ b/rosapps/applications/cmdutils/tee/tee.rbuild
@@ -1,5 +1,4 @@
 <module name="tee" type="win32cui" installbase="system32" installname="tee.exe">
-	<library>kernel32</library>
 	<file>tee.c</file>
 	<file>tee.rc</file>
 </module>
diff --git a/rosapps/applications/cmdutils/touch/touch.rbuild b/rosapps/applications/cmdutils/touch/touch.rbuild
index 57665ef014b..44d6a88419c 100644
--- a/rosapps/applications/cmdutils/touch/touch.rbuild
+++ b/rosapps/applications/cmdutils/touch/touch.rbuild
@@ -1,8 +1,6 @@
 <module name="touch" type="win32cui" installbase="system32" installname="touch.exe">
 	<include base="touch">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>err.c</file>
 	<file>touch.c</file>
 	<file>touch.rc</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/cmdutils/uptime/uptime.rbuild b/rosapps/applications/cmdutils/uptime/uptime.rbuild
index 04f1b755023..008799bd623 100644
--- a/rosapps/applications/cmdutils/uptime/uptime.rbuild
+++ b/rosapps/applications/cmdutils/uptime/uptime.rbuild
@@ -1,6 +1,5 @@
 <module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe" allowwarnings="true">
 <!-- <define name="LINUX_OUTPUT"></define> -->
-	<library>kernel32</library>
 	<file>uptime.c</file>
 	<file>uptime.rc</file>
 </module>
diff --git a/rosapps/applications/cmdutils/y/y.rbuild b/rosapps/applications/cmdutils/y/y.rbuild
index ec87aa83d82..8c2fae60107 100644
--- a/rosapps/applications/cmdutils/y/y.rbuild
+++ b/rosapps/applications/cmdutils/y/y.rbuild
@@ -1,5 +1,4 @@
 <module name="y" type="win32cui" installbase="system32" installname="y.exe">
-	<library>kernel32</library>
 	<file>y.c</file>
 	<file>y.rc</file>
 </module>
diff --git a/rosapps/applications/devutils/gdb2/gdb2.rbuild b/rosapps/applications/devutils/gdb2/gdb2.rbuild
index cb4c496a26e..e853c228c8a 100644
--- a/rosapps/applications/devutils/gdb2/gdb2.rbuild
+++ b/rosapps/applications/devutils/gdb2/gdb2.rbuild
@@ -1,6 +1,4 @@
 <module name="gdb2" type="win32cui" installbase="system32" installname="gdb2.exe"  stdlib="host">
 	<include base="gdb2">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>gdb2.cpp</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/devutils/gdihv/gdihv.rbuild b/rosapps/applications/devutils/gdihv/gdihv.rbuild
index e17d62380a2..afab636ab0d 100644
--- a/rosapps/applications/devutils/gdihv/gdihv.rbuild
+++ b/rosapps/applications/devutils/gdihv/gdihv.rbuild
@@ -1,7 +1,6 @@
 <module name="gdihv" type="win32gui" installbase="system32" installname="gdihv.exe">
 	<include base="gdihv">.</include>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>comctl32</library>
 	<library>psapi</library>
 	<file>gdihv.c</file>
diff --git a/rosapps/applications/devutils/genguid/genguid.rbuild b/rosapps/applications/devutils/genguid/genguid.rbuild
index 9f0a2af846f..83b87a00cbd 100644
--- a/rosapps/applications/devutils/genguid/genguid.rbuild
+++ b/rosapps/applications/devutils/genguid/genguid.rbuild
@@ -1,6 +1,4 @@
 <module name="genguid" type="win32cui" installbase="system32" installname="genguid.exe">
-	<library>kernel32</library>
 	<library>ole32</library>
 	<library>uuid</library>
 	<file>genguid.c</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/devutils/symdump/symdump.rbuild b/rosapps/applications/devutils/symdump/symdump.rbuild
index 1b39987aab6..3d5184aae50 100644
--- a/rosapps/applications/devutils/symdump/symdump.rbuild
+++ b/rosapps/applications/devutils/symdump/symdump.rbuild
@@ -2,6 +2,5 @@
 	<include base="gdihv">.</include>
 	<library>dbghelp</library>
 	<library>shlwapi</library>
-	<library>kernel32</library>
 	<file>symdump.c</file>
 </module>
diff --git a/rosapps/applications/devutils/syscalldump/syscalldump.rbuild b/rosapps/applications/devutils/syscalldump/syscalldump.rbuild
index bd49fd3b36d..ee2a2600527 100644
--- a/rosapps/applications/devutils/syscalldump/syscalldump.rbuild
+++ b/rosapps/applications/devutils/syscalldump/syscalldump.rbuild
@@ -1,6 +1,5 @@
 <module name="syscalldump" type="win32cui" installname="syscalldump.exe">
 	<include base="syscalldump">.</include>
-	<library>kernel32</library>
 	<library>dbghelp</library>
 	<file>syscalldump.c</file>
 </module>
diff --git a/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild b/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
index fe4d77dccf4..817002d2a47 100644
--- a/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
+++ b/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
@@ -1,7 +1,6 @@
 <module name="vgafontedit" type="win32gui" installname="vgafontedit.exe" unicode="yes">
 	<include base="vgafontedit">.</include>
 	
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comdlg32</library>
diff --git a/rosapps/applications/fraginator/fraginator.rbuild b/rosapps/applications/fraginator/fraginator.rbuild
index 0cc8fcc67e5..bba34e4c537 100644
--- a/rosapps/applications/fraginator/fraginator.rbuild
+++ b/rosapps/applications/fraginator/fraginator.rbuild
@@ -3,7 +3,6 @@
 <group>
 	<module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes">
 		<include base="frag">.</include>
-		<library>kernel32</library>
 		<library>advapi32</library>
 		<library>ntdll</library>
 		<library>comctl32</library>
@@ -18,7 +17,6 @@
 
 	<module name="unfrag" type="win32cui" installbase="system32" installname="unfrag.exe" unicode="yes">
 		<include base="unfrag">.</include>
-		<library>kernel32</library>
 		<library>advapi32</library>
 		<library>ntdll</library>
 		<file>Unfrag.cpp</file>
diff --git a/rosapps/applications/net/ncftp/ncftp.rbuild b/rosapps/applications/net/ncftp/ncftp.rbuild
index acd319ffccf..b2b35a8c764 100644
--- a/rosapps/applications/net/ncftp/ncftp.rbuild
+++ b/rosapps/applications/net/ncftp/ncftp.rbuild
@@ -6,7 +6,6 @@
 	<include base="ncftp">ncftp</include>
 
 	<define name="ncftp" />
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>ws2_32</library>
diff --git a/rosapps/applications/net/netreg/netreg.rbuild b/rosapps/applications/net/netreg/netreg.rbuild
index 2303a557cfc..f3d06490040 100644
--- a/rosapps/applications/net/netreg/netreg.rbuild
+++ b/rosapps/applications/net/netreg/netreg.rbuild
@@ -1,6 +1,5 @@
 <module name="netreg" type="win32cui" installbase="system32" installname="netreg.exe"  stdlib="host">
 	<include base="netreg">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ws2_32</library>
 	<library>advapi32</library>
diff --git a/rosapps/applications/net/niclist/niclist.rbuild b/rosapps/applications/net/niclist/niclist.rbuild
index 7b81f584e41..af7819ae348 100644
--- a/rosapps/applications/net/niclist/niclist.rbuild
+++ b/rosapps/applications/net/niclist/niclist.rbuild
@@ -1,6 +1,5 @@
 <module name="niclist" type="win32cui" installbase="system32" installname="niclist.exe">
 	<include base="niclist">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>niclist.c</file>
diff --git a/rosapps/applications/net/roshttpd/roshttpd.rbuild b/rosapps/applications/net/roshttpd/roshttpd.rbuild
index 46ae7a22317..751fcd2622e 100644
--- a/rosapps/applications/net/roshttpd/roshttpd.rbuild
+++ b/rosapps/applications/net/roshttpd/roshttpd.rbuild
@@ -3,7 +3,6 @@
 <module name="roshttpd" type="win32cui" installbase="system32" installname="roshttpd.exe" stdlib="host">
 	<include base="roshttpd">include</include>
 	<define name="__USE_W32_SOCKETS" />
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>user32</library>
 	<compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag>
diff --git a/rosapps/applications/notevil/notevil.rbuild b/rosapps/applications/notevil/notevil.rbuild
index e9b13411c4b..056d0462b75 100644
--- a/rosapps/applications/notevil/notevil.rbuild
+++ b/rosapps/applications/notevil/notevil.rbuild
@@ -1,7 +1,5 @@
 <module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe">
 	<include base="notevil">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>notevil.c</file>
 	<file>notevil.rc</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/screensavers/blankscr/blankscr.rbuild b/rosapps/applications/screensavers/blankscr/blankscr.rbuild
index b74f5122727..73eaeb85ea0 100644
--- a/rosapps/applications/screensavers/blankscr/blankscr.rbuild
+++ b/rosapps/applications/screensavers/blankscr/blankscr.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="yes">
 	<library>scrnsave</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 
diff --git a/rosapps/applications/screensavers/butterflies/butterflies.rbuild b/rosapps/applications/screensavers/butterflies/butterflies.rbuild
index bb37a87a312..b399d268681 100644
--- a/rosapps/applications/screensavers/butterflies/butterflies.rbuild
+++ b/rosapps/applications/screensavers/butterflies/butterflies.rbuild
@@ -3,7 +3,6 @@
 <module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" unicode="yes">
 	<include base="butterflies">.</include>
 	<library>scrnsave</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>opengl32</library>
diff --git a/rosapps/applications/screensavers/circles/circles.rbuild b/rosapps/applications/screensavers/circles/circles.rbuild
index 508c23feedb..50e7013bc5b 100644
--- a/rosapps/applications/screensavers/circles/circles.rbuild
+++ b/rosapps/applications/screensavers/circles/circles.rbuild
@@ -3,7 +3,6 @@
 <module name="circles" type="win32scr" installbase="system32" unicode="true">
 	<include base="circles">.</include>
 	<library>scrnsave</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 
diff --git a/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild b/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild
index 1c73bba5032..1d85dc10e74 100644
--- a/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild
+++ b/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr" unicode="true">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>opengl32</library>
diff --git a/rosapps/applications/screensavers/matrix/matrix.rbuild b/rosapps/applications/screensavers/matrix/matrix.rbuild
index cb69c30ce63..8f4216502d0 100644
--- a/rosapps/applications/screensavers/matrix/matrix.rbuild
+++ b/rosapps/applications/screensavers/matrix/matrix.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="matrix" type="win32scr" installbase="system32" installname="matrix.scr" allowwarnings="true" unicode="true">
 	<include base="matrix">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>winspool</library>
diff --git a/rosapps/applications/screensavers/mazescr/mazescr.rbuild b/rosapps/applications/screensavers/mazescr/mazescr.rbuild
index 1b91d4f9d4c..b91c5386a32 100644
--- a/rosapps/applications/screensavers/mazescr/mazescr.rbuild
+++ b/rosapps/applications/screensavers/mazescr/mazescr.rbuild
@@ -2,7 +2,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 
diff --git a/rosapps/applications/screensavers/starfield/starfield.rbuild b/rosapps/applications/screensavers/starfield/starfield.rbuild
index 1244d1cf7b3..732e4278766 100644
--- a/rosapps/applications/screensavers/starfield/starfield.rbuild
+++ b/rosapps/applications/screensavers/starfield/starfield.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr" unicode="true">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild b/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
index 33381a4c604..33066d931b8 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
@@ -5,7 +5,6 @@
 	<library>fmifs</library>
 	<library>win32err</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 
 	<file>chkdsk.c</file>
 	<file>chkdsk.rc</file>
diff --git a/rosapps/applications/sysutils/chklib/chklib.rbuild b/rosapps/applications/sysutils/chklib/chklib.rbuild
index 918eb0eda27..9c3ed595a2b 100644
--- a/rosapps/applications/sysutils/chklib/chklib.rbuild
+++ b/rosapps/applications/sysutils/chklib/chklib.rbuild
@@ -2,7 +2,6 @@
 	<include base="chklib">..</include>
 
 	<library>win32err</library>
-	<library>kernel32</library>
 
 	<file>chklib.c</file>
 	<file>chklib.rc</file>
diff --git a/rosapps/applications/sysutils/ctm/ctm.rbuild b/rosapps/applications/sysutils/ctm/ctm.rbuild
index f7dee25b4bc..33362bf9652 100644
--- a/rosapps/applications/sysutils/ctm/ctm.rbuild
+++ b/rosapps/applications/sysutils/ctm/ctm.rbuild
@@ -1,7 +1,6 @@
 <module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" unicode="yes">
 	<library>epsapi</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>ctm.c</file>
diff --git a/rosapps/applications/sysutils/gettype/gettype.rbuild b/rosapps/applications/sysutils/gettype/gettype.rbuild
index e8ca1c74885..c5135895be1 100644
--- a/rosapps/applications/sysutils/gettype/gettype.rbuild
+++ b/rosapps/applications/sysutils/gettype/gettype.rbuild
@@ -1,6 +1,5 @@
 <module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe" unicode="yes">
 	<include base="gettype">.</include>
-	<library>kernel32</library>
 	<library>shell32</library>
 	<library>mpr</library>
 	<library>netapi32</library>
diff --git a/rosapps/applications/sysutils/kill/kill.rbuild b/rosapps/applications/sysutils/kill/kill.rbuild
index 9c88922f2ac..998f1363355 100644
--- a/rosapps/applications/sysutils/kill/kill.rbuild
+++ b/rosapps/applications/sysutils/kill/kill.rbuild
@@ -1,6 +1,5 @@
 <module name="kill" type="win32cui" installbase="system32" installname="kill.exe">
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>kill.c</file>
diff --git a/rosapps/applications/sysutils/logevent/logevent.rbuild b/rosapps/applications/sysutils/logevent/logevent.rbuild
index b1c7092ef52..817dc9a9008 100644
--- a/rosapps/applications/sysutils/logevent/logevent.rbuild
+++ b/rosapps/applications/sysutils/logevent/logevent.rbuild
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <module name="logevent" type="win32cui" installbase="system32" installname="logevent.exe" allowwarnings="true">
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>logevent.c</file>
 	<file>logevent.rc</file>
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.rbuild b/rosapps/applications/sysutils/lsdd/lsdd.rbuild
index f3a398e21bd..4c55a631676 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.rbuild
+++ b/rosapps/applications/sysutils/lsdd/lsdd.rbuild
@@ -1,6 +1,5 @@
 <module name="lsdd" type="win32cui" installbase="system32" installname="lsdd.exe">
 	<library>win32err</library>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>lsdd.c</file>
diff --git a/rosapps/applications/sysutils/man/man.rbuild b/rosapps/applications/sysutils/man/man.rbuild
index 53ac813e3f0..31edb30c7cd 100644
--- a/rosapps/applications/sysutils/man/man.rbuild
+++ b/rosapps/applications/sysutils/man/man.rbuild
@@ -1,6 +1,5 @@
 <module name="man" type="win32cui" installbase="system32" installname="man.exe">
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>man.c</file>
diff --git a/rosapps/applications/sysutils/pedump/pedump.rbuild b/rosapps/applications/sysutils/pedump/pedump.rbuild
index 94d7631ae32..814ed0f7293 100644
--- a/rosapps/applications/sysutils/pedump/pedump.rbuild
+++ b/rosapps/applications/sysutils/pedump/pedump.rbuild
@@ -1,6 +1,5 @@
 <module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe">
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>pedump.c</file>
 	<file>pedump.rc</file>
 </module>
diff --git a/rosapps/applications/sysutils/regexpl/regexpl.rbuild b/rosapps/applications/sysutils/regexpl/regexpl.rbuild
index 522d8088816..21100c681a2 100644
--- a/rosapps/applications/sysutils/regexpl/regexpl.rbuild
+++ b/rosapps/applications/sysutils/regexpl/regexpl.rbuild
@@ -1,6 +1,5 @@
 <module name="regexpl" type="win32cui" installbase="system32" installname="regexpl.exe" stdlib="host">
 	<include base="regexpl">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 
@@ -31,4 +30,3 @@
 	<file>Pattern.cpp</file>
 	<file>Settings.cpp</file>
 	<file>Prompt.cpp</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/sysutils/rosddt/rosddt.rbuild b/rosapps/applications/sysutils/rosddt/rosddt.rbuild
index 33f73e64486..e2415771079 100644
--- a/rosapps/applications/sysutils/rosddt/rosddt.rbuild
+++ b/rosapps/applications/sysutils/rosddt/rosddt.rbuild
@@ -2,7 +2,6 @@
 
 	<library>setupapi</library>
 	<library>wininet</library>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>http.c</file>
diff --git a/rosapps/applications/sysutils/screenshot/screenshot.rbuild b/rosapps/applications/sysutils/screenshot/screenshot.rbuild
index c5c46d95f88..e03f3ad5a44 100644
--- a/rosapps/applications/sysutils/screenshot/screenshot.rbuild
+++ b/rosapps/applications/sysutils/screenshot/screenshot.rbuild
@@ -1,6 +1,5 @@
 <module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe" unicode="yes">
 	<include base="screenshot">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comdlg32</library>
diff --git a/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild b/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
index 1b0e7f09870..56a855f263f 100644
--- a/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
+++ b/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
@@ -1,5 +1,4 @@
 <module name="systeminfo" type="win32cui" installbase="system32" installname="systeminfo.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
 	<library>advapi32</library>
diff --git a/rosapps/applications/sysutils/tcat/tcat.rbuild b/rosapps/applications/sysutils/tcat/tcat.rbuild
index e5ea7c8a885..f1bd63a26cd 100644
--- a/rosapps/applications/sysutils/tcat/tcat.rbuild
+++ b/rosapps/applications/sysutils/tcat/tcat.rbuild
@@ -1,6 +1,5 @@
 <module name="tcat" type="win32cui" installbase="system32" installname="tcat.exe">
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 
 	<file>cat.c</file>
diff --git a/rosapps/applications/sysutils/tlist/tlist.rbuild b/rosapps/applications/sysutils/tlist/tlist.rbuild
index a9a71360989..85797f35d60 100644
--- a/rosapps/applications/sysutils/tlist/tlist.rbuild
+++ b/rosapps/applications/sysutils/tlist/tlist.rbuild
@@ -1,7 +1,6 @@
 <module name="tlist" type="win32cui" installbase="system32" installname="tlist.exe">
 	<library>epsapi</library>
 	<!-- <library>tgetopt</library> -->
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
 	<file>tlist.c</file>
diff --git a/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild b/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
index df279416b52..1fac015f328 100644
--- a/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
+++ b/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
@@ -1,5 +1,3 @@
 <module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>patch.c</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/sysutils/utils/cat/cat.rbuild b/rosapps/applications/sysutils/utils/cat/cat.rbuild
index 96a30027da8..b922a2fc8f3 100644
--- a/rosapps/applications/sysutils/utils/cat/cat.rbuild
+++ b/rosapps/applications/sysutils/utils/cat/cat.rbuild
@@ -1,5 +1,3 @@
 <module name="cat" type="win32cui" installbase="bin" installname="cat.exe" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>cat.c</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/sysutils/utils/driver/load/load.rbuild b/rosapps/applications/sysutils/utils/driver/load/load.rbuild
index 8c185b31391..be7125ea02f 100644
--- a/rosapps/applications/sysutils/utils/driver/load/load.rbuild
+++ b/rosapps/applications/sysutils/utils/driver/load/load.rbuild
@@ -1,6 +1,4 @@
 <module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
 	<file>load.c</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild b/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
index 1673cbc1e6f..d9d56ac1a6c 100644
--- a/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
+++ b/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
@@ -1,6 +1,4 @@
 <module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
 	<file>unload.c</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/sysutils/utils/infinst/infinst.rbuild b/rosapps/applications/sysutils/utils/infinst/infinst.rbuild
index ab70f3533cf..f01ecfa2097 100644
--- a/rosapps/applications/sysutils/utils/infinst/infinst.rbuild
+++ b/rosapps/applications/sysutils/utils/infinst/infinst.rbuild
@@ -1,8 +1,6 @@
 <module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
 	<library>setupapi</library>
 	<library>comdlg32</library>
 	<file>infinst.c</file>
-</module>
\ No newline at end of file
diff --git a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
index c7dd94c0c00..4d3d1d27892 100644
--- a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
+++ b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
@@ -1,5 +1,4 @@
 <module name="nts2w32err" type="win32cui" installbase="bin" installname="nts2w32err.exe" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>nts2w32err.c</file>
 </module>
diff --git a/rosapps/applications/sysutils/utils/objdir/objdir.rbuild b/rosapps/applications/sysutils/utils/objdir/objdir.rbuild
index b292bdbe943..70ec2d75233 100644
--- a/rosapps/applications/sysutils/utils/objdir/objdir.rbuild
+++ b/rosapps/applications/sysutils/utils/objdir/objdir.rbuild
@@ -1,5 +1,4 @@
 <module name="objdir" type="win32cui" installbase="bin" installname="objdir.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>objdir.c</file>
 </module>
diff --git a/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild b/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
index 5ad98287b91..2b25e9280e6 100644
--- a/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
+++ b/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
@@ -1,5 +1,4 @@
 <module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe" allowwarnings="true">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>partinfo.c</file>
 </module>
diff --git a/rosapps/applications/sysutils/utils/ps/ps.rbuild b/rosapps/applications/sysutils/utils/ps/ps.rbuild
index d98b610609d..c2a194e4e29 100644
--- a/rosapps/applications/sysutils/utils/ps/ps.rbuild
+++ b/rosapps/applications/sysutils/utils/ps/ps.rbuild
@@ -1,7 +1,6 @@
 <module name="ps" type="win32cui" installbase="bin" installname="ps.exe">
-    <include base="ps">.</include>
-    <library>user32</library>
-    <library>kernel32</library>
-    <library>ntdll</library>
-    <file>ps.c</file>
-</module>
\ No newline at end of file
+	<include base="ps">.</include>
+	<library>user32</library>
+	<library>ntdll</library>
+	<file>ps.c</file>
+</module>
diff --git a/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild b/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
index 18fe20b17bf..c2b097b04eb 100644
--- a/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
+++ b/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
@@ -7,7 +7,6 @@
 	<library>shell32</library>
 	<library>advapi32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>rosperf.c</file>
 	<file>lines.c</file>
diff --git a/rosapps/applications/sysutils/utils/stats/stats.rbuild b/rosapps/applications/sysutils/utils/stats/stats.rbuild
index 5e6400f911a..cc4ba69d0bd 100644
--- a/rosapps/applications/sysutils/utils/stats/stats.rbuild
+++ b/rosapps/applications/sysutils/utils/stats/stats.rbuild
@@ -1,5 +1,4 @@
 <module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>stats.c</file>
 </module>
diff --git a/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild b/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
index 49ce73b11d0..20516832487 100644
--- a/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
+++ b/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
@@ -1,5 +1,4 @@
 <module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" >
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>tickcount.c</file>
 </module>
diff --git a/rosapps/applications/winfile/winfile.rbuild b/rosapps/applications/winfile/winfile.rbuild
index aeed53c2e0a..529220c2c1f 100644
--- a/rosapps/applications/winfile/winfile.rbuild
+++ b/rosapps/applications/winfile/winfile.rbuild
@@ -12,7 +12,6 @@
     <library>user32</library>
     <library>gdi32</library>
     <library>advapi32</library>
-    <library>kernel32</library>
     <library>uuid</library>
     <file>splitpath.c</file>
     <file>winefile.c</file>
diff --git a/rosapps/demos/maze/maze.rbuild b/rosapps/demos/maze/maze.rbuild
index 29c63e40f11..2124212521d 100644
--- a/rosapps/demos/maze/maze.rbuild
+++ b/rosapps/demos/maze/maze.rbuild
@@ -1,5 +1,4 @@
 <module name="maze" type="win32gui" installbase="system32" installname="maze.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>maze.c</file>
diff --git a/rosapps/templates/dialog/dialog.rbuild b/rosapps/templates/dialog/dialog.rbuild
index 645dd936b21..87f47a6dbfd 100644
--- a/rosapps/templates/dialog/dialog.rbuild
+++ b/rosapps/templates/dialog/dialog.rbuild
@@ -1,7 +1,6 @@
 <module name="template_dialog" type="win32cui" installname="dialog.exe" allowwarnings="true">
 	<include base="template_dialog">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/rosapps/templates/imagesoft/imagesoft.rbuild b/rosapps/templates/imagesoft/imagesoft.rbuild
index 2c6d221067f..15aeabe3964 100644
--- a/rosapps/templates/imagesoft/imagesoft.rbuild
+++ b/rosapps/templates/imagesoft/imagesoft.rbuild
@@ -2,7 +2,6 @@
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe" unicode="yes">
 		<include base="imagesoft">.</include>
-		<library>kernel32</library>
 		<library>gdi32</library>
 		<library>user32</library>
 		<library>advapi32</library>
diff --git a/rosapps/templates/mdi/mdi.rbuild b/rosapps/templates/mdi/mdi.rbuild
index 48266d32219..b3bb6e8d0ba 100644
--- a/rosapps/templates/mdi/mdi.rbuild
+++ b/rosapps/templates/mdi/mdi.rbuild
@@ -1,7 +1,6 @@
 <module name="template_mdi" type="win32cui" installname="mdi.exe" allowwarnings="true">
 	<include base="template_mdi">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
  	<file>about.c</file>
diff --git a/rosapps/templates/old_wordpad/old_wordpad.rbuild b/rosapps/templates/old_wordpad/old_wordpad.rbuild
index e8137c71881..4e9346af582 100644
--- a/rosapps/templates/old_wordpad/old_wordpad.rbuild
+++ b/rosapps/templates/old_wordpad/old_wordpad.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="old_wordpad" type="win32gui" installbase="system32" installname="old_wordpad.exe" unicode="yes">
 	<include base="old_wordpad">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comdlg32</library>
diff --git a/rostests/apitests/dciman32api/dciman32api.rbuild b/rostests/apitests/dciman32api/dciman32api.rbuild
index 29adf5e9bf0..7e6687be3f8 100644
--- a/rostests/apitests/dciman32api/dciman32api.rbuild
+++ b/rostests/apitests/dciman32api/dciman32api.rbuild
@@ -1,7 +1,6 @@
 <module name="dciman32api" type="win32cui">
 	<include base="dciman32api">.</include>
 	<library>apitest</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>shell32</library>
diff --git a/rostests/apitests/gdi32api/gdi32api.rbuild b/rostests/apitests/gdi32api/gdi32api.rbuild
index ec234cd64b8..562db78c830 100644
--- a/rostests/apitests/gdi32api/gdi32api.rbuild
+++ b/rostests/apitests/gdi32api/gdi32api.rbuild
@@ -1,7 +1,6 @@
 <module name="gdi32api" type="win32cui">
 	<include base="gdi32api">.</include>
 	<library>apitest</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>shell32</library>
diff --git a/rostests/apitests/user32api/user32api.rbuild b/rostests/apitests/user32api/user32api.rbuild
index 778124044aa..ea33d4e33ea 100644
--- a/rostests/apitests/user32api/user32api.rbuild
+++ b/rostests/apitests/user32api/user32api.rbuild
@@ -1,7 +1,6 @@
 <module name="user32api" type="win32cui">
 	<include base="user32api">.</include>
 	<library>apitest</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>shell32</library>
diff --git a/rostests/apitests/w32knapi/w32knapi.rbuild b/rostests/apitests/w32knapi/w32knapi.rbuild
index be94a19a2b2..4574c831e22 100644
--- a/rostests/apitests/w32knapi/w32knapi.rbuild
+++ b/rostests/apitests/w32knapi/w32knapi.rbuild
@@ -2,7 +2,6 @@
 	<include base="w32knapi">.</include>
 	<library>apitest</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>shell32</library>
diff --git a/rostests/apitests/ws2_32/ws2_32.rbuild b/rostests/apitests/ws2_32/ws2_32.rbuild
index d9d1772502e..c00e7a2ddaf 100644
--- a/rostests/apitests/ws2_32/ws2_32.rbuild
+++ b/rostests/apitests/ws2_32/ws2_32.rbuild
@@ -1,6 +1,5 @@
 <module name="ws2_32_apitests" type="win32cui" unicode="yes">
 	<library>apitest</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>shell32</library>
 	<library>ws2_32</library>
diff --git a/rostests/dibtests/alphablend/alphablend.rbuild b/rostests/dibtests/alphablend/alphablend.rbuild
index 93aa2f9f626..a24f9d3692b 100644
--- a/rostests/dibtests/alphablend/alphablend.rbuild
+++ b/rostests/dibtests/alphablend/alphablend.rbuild
@@ -1,6 +1,5 @@
 <module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe">
 	<include base="alphablend">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>alphablend.c</file>
diff --git a/rostests/dibtests/bitblt/bitblt.rbuild b/rostests/dibtests/bitblt/bitblt.rbuild
index b1edc2681d7..e7a04b0c711 100644
--- a/rostests/dibtests/bitblt/bitblt.rbuild
+++ b/rostests/dibtests/bitblt/bitblt.rbuild
@@ -1,6 +1,5 @@
 <module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe">
 	<include base="bitblt">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>bitblt.c</file>
diff --git a/rostests/dibtests/bltrop/bltrop.rbuild b/rostests/dibtests/bltrop/bltrop.rbuild
index f90a27e67b6..f19491c61bb 100644
--- a/rostests/dibtests/bltrop/bltrop.rbuild
+++ b/rostests/dibtests/bltrop/bltrop.rbuild
@@ -1,8 +1,6 @@
 <module name="bltrop" type="win32gui" installbase="bin" installname="bltrop.exe">
 	<include base="bltrop">.</include>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>bltrop.c</file>
 	<file>bltrop.rc</file>
-</module>
\ No newline at end of file
diff --git a/rostests/dibtests/dibtest/dibtest.rbuild b/rostests/dibtests/dibtest/dibtest.rbuild
index 8fdd3d8e3eb..de99253175b 100644
--- a/rostests/dibtests/dibtest/dibtest.rbuild
+++ b/rostests/dibtests/dibtest/dibtest.rbuild
@@ -1,5 +1,4 @@
 <module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>dibtest.c</file>
diff --git a/rostests/dibtests/icontest/icontest.rbuild b/rostests/dibtests/icontest/icontest.rbuild
index 123afc227e5..8936201e290 100644
--- a/rostests/dibtests/icontest/icontest.rbuild
+++ b/rostests/dibtests/icontest/icontest.rbuild
@@ -1,6 +1,5 @@
 <module name="icontest" type="win32gui" installbase="bin" installname="icontest.exe">
 	<include base="icontest">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
diff --git a/rostests/dibtests/palbitblt/palbitblt.rbuild b/rostests/dibtests/palbitblt/palbitblt.rbuild
index cfbe6022715..1d75d706d0d 100644
--- a/rostests/dibtests/palbitblt/palbitblt.rbuild
+++ b/rostests/dibtests/palbitblt/palbitblt.rbuild
@@ -1,5 +1,4 @@
 <module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" stdlib="host">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>pal.c</file>
diff --git a/rostests/dibtests/patblt/patblt.rbuild b/rostests/dibtests/patblt/patblt.rbuild
index 3017fc94ff6..e7295167e0e 100644
--- a/rostests/dibtests/patblt/patblt.rbuild
+++ b/rostests/dibtests/patblt/patblt.rbuild
@@ -1,5 +1,4 @@
 <module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true" stdlib="host">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>patblt.cpp</file>
diff --git a/rostests/dibtests/stretchblt/stretchblt.rbuild b/rostests/dibtests/stretchblt/stretchblt.rbuild
index 1fa762e5ab5..48626f7c20f 100644
--- a/rostests/dibtests/stretchblt/stretchblt.rbuild
+++ b/rostests/dibtests/stretchblt/stretchblt.rbuild
@@ -1,5 +1,4 @@
 <module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.exe" stdlib="host">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>stretchblt.cpp</file>
diff --git a/rostests/dibtests/vbltest/vbltest.rbuild b/rostests/dibtests/vbltest/vbltest.rbuild
index 75b26c96a48..d715469ba68 100644
--- a/rostests/dibtests/vbltest/vbltest.rbuild
+++ b/rostests/dibtests/vbltest/vbltest.rbuild
@@ -1,8 +1,6 @@
 <module name="vbltest" type="win32gui" installbase="bin" installname="vbltest.exe">
 	<include base="vbltest">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>vbltest.c</file>
 	<file>vbltest.rc</file>
-</module>
\ No newline at end of file
diff --git a/rostests/dxtest/ddraw/ddraw.rbuild b/rostests/dxtest/ddraw/ddraw.rbuild
index d4b66feee87..eca73152570 100644
--- a/rostests/dxtest/ddraw/ddraw.rbuild
+++ b/rostests/dxtest/ddraw/ddraw.rbuild
@@ -1,6 +1,5 @@
 <module name="ddraw_test" type="win32cui" allowwarnings="false">
 	<include base="ddraw_test">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>ole32</library>
diff --git a/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild b/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild
index 5b4c06c058b..ad0499a5d05 100644
--- a/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild
+++ b/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild
@@ -1,6 +1,5 @@
 <module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe">
 	<include base="win32kdxtest">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>d3d8thk</library>
@@ -12,4 +11,3 @@
 	<file>NtGdiDdWaitForVerticalBlank.c</file>
 	<file>NtGdiDdCanCreateSurface.c</file>
 	<file>dump.c</file>
-</module>
\ No newline at end of file
diff --git a/rostests/regtests/gdi/gdi_regtest.rbuild b/rostests/regtests/gdi/gdi_regtest.rbuild
index c3ad3d18008..1c3c010e40e 100644
--- a/rostests/regtests/gdi/gdi_regtest.rbuild
+++ b/rostests/regtests/gdi/gdi_regtest.rbuild
@@ -6,7 +6,6 @@
 	<library>wine</library>
 	<library>gdi32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 
 	<file>xlate.c</file>
diff --git a/rostests/rosautotest/rosautotest.rbuild b/rostests/rosautotest/rosautotest.rbuild
index e1ad3e312b5..5224c24df97 100644
--- a/rostests/rosautotest/rosautotest.rbuild
+++ b/rostests/rosautotest/rosautotest.rbuild
@@ -4,7 +4,6 @@
 	<compilerflag compiler="cxx" compilerset="gcc">-fno-rtti</compilerflag>
 	<include base="rosautotest">.</include>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>shell32</library>
 	<library>user32</library>
 	<library>wininet</library>
diff --git a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
index 36d83106000..a291d22c87d 100644
--- a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
+++ b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
@@ -1,5 +1,4 @@
 <module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ddraw</library>
 	<library>user32</library>
diff --git a/rostests/tests/DxHalTest/DxHalTest.rbuild b/rostests/tests/DxHalTest/DxHalTest.rbuild
index e3465fd1bdb..52587302a6c 100644
--- a/rostests/tests/DxHalTest/DxHalTest.rbuild
+++ b/rostests/tests/DxHalTest/DxHalTest.rbuild
@@ -1,5 +1,4 @@
 <module name="dxhaltest" type="win32cui" installbase="bin" installname="dxhaltest.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>main.c</file>
diff --git a/rostests/tests/Imagelistviewer/imagelistviewer.rbuild b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
index 633413c5482..8593263b062 100644
--- a/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
+++ b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
@@ -1,6 +1,5 @@
 <module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe">
 	<include base="Imagelistviewer">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>setupapi</library>
 	<library>comctl32</library>
diff --git a/rostests/tests/accelerator/accelerator.rbuild b/rostests/tests/accelerator/accelerator.rbuild
index 245b6772ab8..f18f0d19174 100644
--- a/rostests/tests/accelerator/accelerator.rbuild
+++ b/rostests/tests/accelerator/accelerator.rbuild
@@ -1,5 +1,4 @@
 <module name="accelerator" type="win32gui" installbase="bin" installname="accelerator.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>accelerator.c</file>
diff --git a/rostests/tests/alive/alive.rbuild b/rostests/tests/alive/alive.rbuild
index 0888f4a0e75..0f1f48e293c 100644
--- a/rostests/tests/alive/alive.rbuild
+++ b/rostests/tests/alive/alive.rbuild
@@ -1,5 +1,4 @@
 <module name="alive" type="win32cui" installbase="bin" installname="alive.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>alive.c</file>
diff --git a/rostests/tests/apc/apc.rbuild b/rostests/tests/apc/apc.rbuild
index 8e31f903cc1..2dc589b569c 100644
--- a/rostests/tests/apc/apc.rbuild
+++ b/rostests/tests/apc/apc.rbuild
@@ -1,5 +1,4 @@
 <module name="apc" type="win32cui" installbase="bin" installname="apc.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>apc.c</file>
 </module>
diff --git a/rostests/tests/apc2/apc2.rbuild b/rostests/tests/apc2/apc2.rbuild
index 25d8a343fc4..0226796076c 100644
--- a/rostests/tests/apc2/apc2.rbuild
+++ b/rostests/tests/apc2/apc2.rbuild
@@ -1,4 +1,3 @@
 <module name="apc2" type="win32cui" installbase="bin" installname="apc2.exe">
-	<library>kernel32</library>
 	<file>apc2.c</file>
 </module>
diff --git a/rostests/tests/args/args.rbuild b/rostests/tests/args/args.rbuild
index 9fc67e12f1c..ce3579dcf04 100644
--- a/rostests/tests/args/args.rbuild
+++ b/rostests/tests/args/args.rbuild
@@ -1,4 +1,3 @@
 <module name="args" type="win32cui" installbase="bin" installname="args.exe">
-	<library>kernel32</library>
 	<file>args.c</file>
 </module>
diff --git a/rostests/tests/atomtest/atomtest.rbuild b/rostests/tests/atomtest/atomtest.rbuild
index a08c5e232d0..b2d0039c405 100644
--- a/rostests/tests/atomtest/atomtest.rbuild
+++ b/rostests/tests/atomtest/atomtest.rbuild
@@ -1,5 +1,4 @@
 <module name="atomtest" type="win32cui" installbase="bin" installname="atomtest.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>atomtest.c</file>
 </module>
diff --git a/rostests/tests/bench/bench.rbuild b/rostests/tests/bench/bench.rbuild
index 0ea1dbd8e12..15b8d106780 100644
--- a/rostests/tests/bench/bench.rbuild
+++ b/rostests/tests/bench/bench.rbuild
@@ -1,5 +1,4 @@
 <module name="bench-thread" type="win32cui" installbase="bin" installname="bench-thread.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>bench-thread.c</file>
 </module>
diff --git a/rostests/tests/button/button.rbuild b/rostests/tests/button/button.rbuild
index 10a30e7af49..45422cc3e28 100644
--- a/rostests/tests/button/button.rbuild
+++ b/rostests/tests/button/button.rbuild
@@ -1,5 +1,4 @@
 <module name="button" type="win32gui" installbase="bin" installname="button.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>buttontst.c</file>
diff --git a/rostests/tests/button2/button2.rbuild b/rostests/tests/button2/button2.rbuild
index 8b2915ea908..72a87543eb7 100644
--- a/rostests/tests/button2/button2.rbuild
+++ b/rostests/tests/button2/button2.rbuild
@@ -1,5 +1,4 @@
 <module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>buttontst2.c</file>
diff --git a/rostests/tests/capclock/capclock.rbuild b/rostests/tests/capclock/capclock.rbuild
index 5b1e6ced109..778f153151b 100644
--- a/rostests/tests/capclock/capclock.rbuild
+++ b/rostests/tests/capclock/capclock.rbuild
@@ -1,6 +1,5 @@
 <module name="capclock" type="win32gui" installbase="bin" installname="capclock.exe">
 	<include base="capclock">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>capclock.c</file>
diff --git a/rostests/tests/carets/carets.rbuild b/rostests/tests/carets/carets.rbuild
index a4efacaad4c..33379ce421b 100644
--- a/rostests/tests/carets/carets.rbuild
+++ b/rostests/tests/carets/carets.rbuild
@@ -1,6 +1,5 @@
 <module name="carets" type="win32gui" installbase="bin" installname="carets.exe">
 	<include base="carets">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
diff --git a/rostests/tests/combotst/combotst.rbuild b/rostests/tests/combotst/combotst.rbuild
index e22dd0aff18..12bfec4063f 100644
--- a/rostests/tests/combotst/combotst.rbuild
+++ b/rostests/tests/combotst/combotst.rbuild
@@ -1,5 +1,4 @@
 <module name="combotst" type="win32gui" installbase="bin" installname="combotst.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>combotst.c</file>
diff --git a/rostests/tests/consume/consume.rbuild b/rostests/tests/consume/consume.rbuild
index a37f6934496..f6297999dcd 100644
--- a/rostests/tests/consume/consume.rbuild
+++ b/rostests/tests/consume/consume.rbuild
@@ -1,5 +1,4 @@
 <module name="consume" type="win32cui" installbase="bin" installname="consume.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>consume.c</file>
 </module>
diff --git a/rostests/tests/copymove/copymove.rbuild b/rostests/tests/copymove/copymove.rbuild
index 9644f80590b..198255ec035 100644
--- a/rostests/tests/copymove/copymove.rbuild
+++ b/rostests/tests/copymove/copymove.rbuild
@@ -1,5 +1,4 @@
 <module name="copymove" type="win32cui" installbase="bin" installname="copymove.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>copymove.c</file>
 </module>
diff --git a/rostests/tests/count/count.rbuild b/rostests/tests/count/count.rbuild
index 5551dc0a11d..18fe6f29647 100644
--- a/rostests/tests/count/count.rbuild
+++ b/rostests/tests/count/count.rbuild
@@ -1,5 +1,4 @@
 <module name="count" type="win32cui" installbase="bin" installname="count.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>count.c</file>
 </module>
diff --git a/rostests/tests/create-links/create-links.rbuild b/rostests/tests/create-links/create-links.rbuild
index a6c901c621d..5693bddd372 100644
--- a/rostests/tests/create-links/create-links.rbuild
+++ b/rostests/tests/create-links/create-links.rbuild
@@ -1,5 +1,4 @@
 <module name="create-links" type="win32cui" installbase="bin" installname="create-links.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ole32</library>
 	<library>uuid</library>
diff --git a/rostests/tests/dirdlg/dirdlg.rbuild b/rostests/tests/dirdlg/dirdlg.rbuild
index 4b53898af3a..b305100eaf2 100644
--- a/rostests/tests/dirdlg/dirdlg.rbuild
+++ b/rostests/tests/dirdlg/dirdlg.rbuild
@@ -4,7 +4,6 @@
 	<!-- FIXME: workarounds until we have a proper oldnames library -->
 	<define name="chdir">_chdir</define>
 
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>dirdlg.c</file>
diff --git a/rostests/tests/diskspeed/diskspeed.rbuild b/rostests/tests/diskspeed/diskspeed.rbuild
index 0f24bc62c47..59367b61b1d 100644
--- a/rostests/tests/diskspeed/diskspeed.rbuild
+++ b/rostests/tests/diskspeed/diskspeed.rbuild
@@ -1,5 +1,4 @@
 <module name="diskspeed" type="win32cui" installbase="bin" installname="diskspeed.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>diskspeed.c</file>
 </module>
diff --git a/rostests/tests/dnsapi/dnsapi.rbuild b/rostests/tests/dnsapi/dnsapi.rbuild
index 3dead460817..05a6ca1a8c7 100644
--- a/rostests/tests/dnsapi/dnsapi.rbuild
+++ b/rostests/tests/dnsapi/dnsapi.rbuild
@@ -1,5 +1,4 @@
 <module name="dnsapitst" type="win32cui" installbase="bin" installname="dnsapitst.exe">
-	<library>kernel32</library>
 	<library>dnsapi</library>
 	<library>ws2_32</library>
 	<file>dnsapi.c</file>
diff --git a/rostests/tests/dnsquery/dnsquery.rbuild b/rostests/tests/dnsquery/dnsquery.rbuild
index 9883d97e65f..2f209b31e25 100644
--- a/rostests/tests/dnsquery/dnsquery.rbuild
+++ b/rostests/tests/dnsquery/dnsquery.rbuild
@@ -1,5 +1,4 @@
 <module name="dnsquery" type="win32gui" installbase="bin" installname="dnsquery.exe">
-	<library>kernel32</library>
 	<library>dnsapi</library>
 	<library>ws2_32</library>
 	<file>dnsquery.c</file>
diff --git a/rostests/tests/edit/edit.rbuild b/rostests/tests/edit/edit.rbuild
index fbb833be9c5..4c257e5bfd3 100644
--- a/rostests/tests/edit/edit.rbuild
+++ b/rostests/tests/edit/edit.rbuild
@@ -1,5 +1,4 @@
 <module name="edit" type="win32gui" installbase="bin" installname="edit.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>edittest.c</file>
diff --git a/rostests/tests/enhmetafile/enhmetafile.rbuild b/rostests/tests/enhmetafile/enhmetafile.rbuild
index 92f4f4d1a48..4223d630970 100644
--- a/rostests/tests/enhmetafile/enhmetafile.rbuild
+++ b/rostests/tests/enhmetafile/enhmetafile.rbuild
@@ -1,5 +1,4 @@
 <module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>enhmetafile.c</file>
diff --git a/rostests/tests/enumfonts/enumfonts.rbuild b/rostests/tests/enumfonts/enumfonts.rbuild
index c6773b4540c..3fea2ce0a5c 100644
--- a/rostests/tests/enumfonts/enumfonts.rbuild
+++ b/rostests/tests/enumfonts/enumfonts.rbuild
@@ -1,5 +1,4 @@
 <module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe" stdlib="host">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>enumfonts.cpp</file>
diff --git a/rostests/tests/enumwnd/enumwnd.rbuild b/rostests/tests/enumwnd/enumwnd.rbuild
index c44ff096744..82b8401d11a 100644
--- a/rostests/tests/enumwnd/enumwnd.rbuild
+++ b/rostests/tests/enumwnd/enumwnd.rbuild
@@ -1,5 +1,4 @@
 <module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>enumwnd.c</file>
diff --git a/rostests/tests/enumws/enumws.rbuild b/rostests/tests/enumws/enumws.rbuild
index f58aeffd65b..78597aca8af 100644
--- a/rostests/tests/enumws/enumws.rbuild
+++ b/rostests/tests/enumws/enumws.rbuild
@@ -1,5 +1,4 @@
 <module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>enumws.c</file>
diff --git a/rostests/tests/event/event.rbuild b/rostests/tests/event/event.rbuild
index 53c6eea4d96..b2bf9e92c35 100644
--- a/rostests/tests/event/event.rbuild
+++ b/rostests/tests/event/event.rbuild
@@ -1,5 +1,4 @@
 <module name="event" type="win32gui" installbase="bin" installname="event.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>event.c</file>
 </module>
diff --git a/rostests/tests/fiber/fiber.rbuild b/rostests/tests/fiber/fiber.rbuild
index 02e52ea088c..38ad1bb125b 100644
--- a/rostests/tests/fiber/fiber.rbuild
+++ b/rostests/tests/fiber/fiber.rbuild
@@ -1,5 +1,4 @@
 <module name="fiber" type="win32cui" installbase="bin" installname="fiber.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>fiber.c</file>
 </module>
diff --git a/rostests/tests/gethostbyname/gethostbyname.rbuild b/rostests/tests/gethostbyname/gethostbyname.rbuild
index e3caab96c5e..63e024e4991 100644
--- a/rostests/tests/gethostbyname/gethostbyname.rbuild
+++ b/rostests/tests/gethostbyname/gethostbyname.rbuild
@@ -1,5 +1,4 @@
 <module name="gethostbyname" type="win32gui" installbase="bin" installname="gethostbyname.exe">
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>gethostbyname.c</file>
 </module>
diff --git a/rostests/tests/global_mem/global_mem.rbuild b/rostests/tests/global_mem/global_mem.rbuild
index 6fbddd92e07..f6ff723384a 100644
--- a/rostests/tests/global_mem/global_mem.rbuild
+++ b/rostests/tests/global_mem/global_mem.rbuild
@@ -1,5 +1,4 @@
 <module name="global_mem" type="win32gui" installbase="bin" installname="global_mem.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>global_mem.c</file>
 </module>
diff --git a/rostests/tests/gradient/gradient.rbuild b/rostests/tests/gradient/gradient.rbuild
index b15629cd935..d085e899dff 100644
--- a/rostests/tests/gradient/gradient.rbuild
+++ b/rostests/tests/gradient/gradient.rbuild
@@ -1,5 +1,4 @@
 <module name="gradient" type="win32gui" installbase="bin" installname="gradient.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>gradient.c</file>
diff --git a/rostests/tests/guithreadinfo/guithreadinfo.rbuild b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
index 72397795b47..e6637d740b8 100644
--- a/rostests/tests/guithreadinfo/guithreadinfo.rbuild
+++ b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
@@ -1,5 +1,4 @@
 <module name="guithreadinfo" type="win32gui" installbase="bin" installname="guithreadinfo.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>guithreadinfo.c</file>
 </module>
diff --git a/rostests/tests/hello/hello.rbuild b/rostests/tests/hello/hello.rbuild
index 8b126e1a394..e5016ffba83 100644
--- a/rostests/tests/hello/hello.rbuild
+++ b/rostests/tests/hello/hello.rbuild
@@ -1,5 +1,4 @@
 <module name="hello" type="win32cui" installbase="bin" installname="hello.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>hello.c</file>
diff --git a/rostests/tests/hivetest/hivetest.rbuild b/rostests/tests/hivetest/hivetest.rbuild
index 34ad447bfc9..988c3abf850 100644
--- a/rostests/tests/hivetest/hivetest.rbuild
+++ b/rostests/tests/hivetest/hivetest.rbuild
@@ -1,5 +1,4 @@
 <module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
 	<library>advapi32</library>
diff --git a/rostests/tests/iptest/iptest.rbuild b/rostests/tests/iptest/iptest.rbuild
index 3baa33d2399..d5707db646a 100644
--- a/rostests/tests/iptest/iptest.rbuild
+++ b/rostests/tests/iptest/iptest.rbuild
@@ -1,5 +1,4 @@
 <module name="iptest" type="win32gui" installbase="bin" installname="iptest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>iptest.cpp</file>
 </module>
diff --git a/rostests/tests/isotest/isotest.rbuild b/rostests/tests/isotest/isotest.rbuild
index a3f5921285e..4ddf085f5d2 100644
--- a/rostests/tests/isotest/isotest.rbuild
+++ b/rostests/tests/isotest/isotest.rbuild
@@ -1,5 +1,4 @@
 <module name="isotest" type="win32cui" installbase="bin" installname="isotest.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>isotest.c</file>
 </module>
diff --git a/rostests/tests/lantst/lantest.rbuild b/rostests/tests/lantst/lantest.rbuild
index a1cfc272032..c9bbac74bc9 100644
--- a/rostests/tests/lantst/lantest.rbuild
+++ b/rostests/tests/lantst/lantest.rbuild
@@ -1,5 +1,4 @@
 <module name="lantest" type="win32gui" installbase="bin" installname="lantest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>lantest.cpp</file>
 </module>
diff --git a/rostests/tests/lineclip/lineclip.rbuild b/rostests/tests/lineclip/lineclip.rbuild
index c631a8a94a7..ac8811e4721 100644
--- a/rostests/tests/lineclip/lineclip.rbuild
+++ b/rostests/tests/lineclip/lineclip.rbuild
@@ -1,5 +1,4 @@
 <module name="lineclip" type="win32gui" installbase="bin" installname="lineclip.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>lineclip.c</file>
diff --git a/rostests/tests/linetest/linetest.rbuild b/rostests/tests/linetest/linetest.rbuild
index 9efb94a00e6..e2f90590d99 100644
--- a/rostests/tests/linetest/linetest.rbuild
+++ b/rostests/tests/linetest/linetest.rbuild
@@ -1,5 +1,4 @@
 <module name="linetest" type="win32gui" installbase="bin" installname="linetest.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>linetest.c</file>
diff --git a/rostests/tests/lpctst/lpctst.rbuild b/rostests/tests/lpctst/lpctst.rbuild
index b2936689a76..6dd03a63bd1 100644
--- a/rostests/tests/lpctst/lpctst.rbuild
+++ b/rostests/tests/lpctst/lpctst.rbuild
@@ -1,5 +1,4 @@
 <module name="lpctst" type="win32gui" installbase="bin" installname="lpctst.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>lpctst.c</file>
 </module>
diff --git a/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
index 9429d5ebf81..1dfece66aab 100644
--- a/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
+++ b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
@@ -1,5 +1,4 @@
 <module name="map_dup_inherit" type="win32cui" installbase="bin" installname="map_dup_inherit.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>map_dup_inherit.c</file>
 </module>
diff --git a/rostests/tests/mdi/mdi.rbuild b/rostests/tests/mdi/mdi.rbuild
index 98ed290fbae..04481eca1c9 100644
--- a/rostests/tests/mdi/mdi.rbuild
+++ b/rostests/tests/mdi/mdi.rbuild
@@ -1,5 +1,4 @@
 <module name="mdi" type="win32gui" installbase="bin" installname="mdi.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/rostests/tests/miditest/miditest.rbuild b/rostests/tests/miditest/miditest.rbuild
index 9103c3b8c8f..3b942ddd3d6 100644
--- a/rostests/tests/miditest/miditest.rbuild
+++ b/rostests/tests/miditest/miditest.rbuild
@@ -1,5 +1,4 @@
 <module name="miditest" type="win32gui" installbase="bin" installname="miditest.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
 	<file>miditest.c</file>
diff --git a/rostests/tests/mktime/mktime.rbuild b/rostests/tests/mktime/mktime.rbuild
index 4a5fee25242..d8fa65d4d83 100644
--- a/rostests/tests/mktime/mktime.rbuild
+++ b/rostests/tests/mktime/mktime.rbuild
@@ -1,5 +1,4 @@
 <module name="mktime" type="win32gui" installbase="bin" installname="mktime.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mktime.c</file>
 </module>
diff --git a/rostests/tests/moztest/moztest.rbuild b/rostests/tests/moztest/moztest.rbuild
index facd6f53a2f..ba7e8ead9c8 100644
--- a/rostests/tests/moztest/moztest.rbuild
+++ b/rostests/tests/moztest/moztest.rbuild
@@ -1,5 +1,4 @@
 <module name="moztest" type="win32cui" installbase="bin" installname="moztest.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>ws2_32</library>
 	<file>moztest.c</file>
diff --git a/rostests/tests/mstest/mstest.rbuild b/rostests/tests/mstest/mstest.rbuild
index 62e7b39c78f..f29a7244ece 100644
--- a/rostests/tests/mstest/mstest.rbuild
+++ b/rostests/tests/mstest/mstest.rbuild
@@ -1,5 +1,4 @@
 <module name="mstest" type="win32gui" installbase="bin" installname="mstest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mstest.c</file>
 </module>
diff --git a/rostests/tests/multithrdwin/multithrdwin.rbuild b/rostests/tests/multithrdwin/multithrdwin.rbuild
index 86a6b7363b9..faf432f2ff2 100644
--- a/rostests/tests/multithrdwin/multithrdwin.rbuild
+++ b/rostests/tests/multithrdwin/multithrdwin.rbuild
@@ -1,5 +1,4 @@
 <module name="multithrdwin" type="win32gui" installbase="bin" installname="multithrdwin.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
diff --git a/rostests/tests/multiwin/multiwin.rbuild b/rostests/tests/multiwin/multiwin.rbuild
index d585e37eb78..c37b37f17bf 100644
--- a/rostests/tests/multiwin/multiwin.rbuild
+++ b/rostests/tests/multiwin/multiwin.rbuild
@@ -1,5 +1,4 @@
 <module name="multiwin" type="win32gui" installbase="bin" installname="multiwin.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>multiwin.c</file>
diff --git a/rostests/tests/mutex/mutex.rbuild b/rostests/tests/mutex/mutex.rbuild
index 8c6cb6e8072..c8a8a2bd59c 100644
--- a/rostests/tests/mutex/mutex.rbuild
+++ b/rostests/tests/mutex/mutex.rbuild
@@ -1,5 +1,4 @@
 <module name="mutex" type="win32gui" installbase="bin" installname="mutex.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mutex.c</file>
 </module>
diff --git a/rostests/tests/nameserverlist/nameserverlist.rbuild b/rostests/tests/nameserverlist/nameserverlist.rbuild
index 8c2294502e3..bd2224c0525 100644
--- a/rostests/tests/nameserverlist/nameserverlist.rbuild
+++ b/rostests/tests/nameserverlist/nameserverlist.rbuild
@@ -1,5 +1,4 @@
 <module name="nameserverlist" type="win32cui" installbase="bin" installname="nameserverlist.exe">
-	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<file>nameserverlist.c</file>
 </module>
diff --git a/rostests/tests/noexecute/noexecute.rbuild b/rostests/tests/noexecute/noexecute.rbuild
index e543938efea..9d8b50acd3c 100644
--- a/rostests/tests/noexecute/noexecute.rbuild
+++ b/rostests/tests/noexecute/noexecute.rbuild
@@ -1,6 +1,5 @@
 <module name="noexecute" type="win32cui" installbase="bin" installname="noexecute.exe">
 	<library>pseh</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>noexecute.c</file>
 </module>
diff --git a/rostests/tests/nptest/nptest.rbuild b/rostests/tests/nptest/nptest.rbuild
index 88d772da864..ce3ebe05a42 100644
--- a/rostests/tests/nptest/nptest.rbuild
+++ b/rostests/tests/nptest/nptest.rbuild
@@ -1,5 +1,4 @@
 <module name="nptest" type="win32gui" installbase="bin" installname="nptest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>nptest.c</file>
 </module>
diff --git a/rostests/tests/oskittcp/oskittcp.rbuild b/rostests/tests/oskittcp/oskittcp.rbuild
index 21e7ef0116d..a9c29623c38 100644
--- a/rostests/tests/oskittcp/oskittcp.rbuild
+++ b/rostests/tests/oskittcp/oskittcp.rbuild
@@ -1,5 +1,4 @@
 <module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tcptest.cpp</file>
 </module>
diff --git a/rostests/tests/p_dup_handle/p_dup_handle.rbuild b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
index 5bcead2aa0a..a404bc49f5f 100644
--- a/rostests/tests/p_dup_handle/p_dup_handle.rbuild
+++ b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
@@ -1,5 +1,4 @@
 <module name="p_dup_handle" type="win32cui" installbase="bin" installname="p_dup_handle.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>p_dup_handle.c</file>
 </module>
diff --git a/rostests/tests/polytest/polytest.rbuild b/rostests/tests/polytest/polytest.rbuild
index e94ad02e659..afe43b4e927 100644
--- a/rostests/tests/polytest/polytest.rbuild
+++ b/rostests/tests/polytest/polytest.rbuild
@@ -1,5 +1,4 @@
 <module name="polytest" type="win32gui" installbase="bin" installname="polytest.exe" allowwarnings="true">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>polytest.cpp</file>
 </module>
diff --git a/rostests/tests/popupmenu/popupmenu.rbuild b/rostests/tests/popupmenu/popupmenu.rbuild
index 1b8e6aca0b4..bf2c82a6462 100644
--- a/rostests/tests/popupmenu/popupmenu.rbuild
+++ b/rostests/tests/popupmenu/popupmenu.rbuild
@@ -1,6 +1,5 @@
 <module name="popupmenu" type="win32gui" installbase="bin" installname="popupmenu.exe">
 	<include base="popupmenu">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>popupmenu.c</file>
diff --git a/rostests/tests/primitives/primitives.rbuild b/rostests/tests/primitives/primitives.rbuild
index f9310e81098..370350dd414 100644
--- a/rostests/tests/primitives/primitives.rbuild
+++ b/rostests/tests/primitives/primitives.rbuild
@@ -1,5 +1,4 @@
 <module name="primitives" type="win32gui" installbase="bin" installname="primitives.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>primitives.cpp</file>
diff --git a/rostests/tests/pteb/pteb.rbuild b/rostests/tests/pteb/pteb.rbuild
index bf01de681e1..a32e34a6f6e 100644
--- a/rostests/tests/pteb/pteb.rbuild
+++ b/rostests/tests/pteb/pteb.rbuild
@@ -1,5 +1,4 @@
 <module name="pteb" type="win32gui" installbase="bin" installname="pteb.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>pteb.c</file>
 </module>
diff --git a/rostests/tests/readconsole/readconsole.rbuild b/rostests/tests/readconsole/readconsole.rbuild
index 31cdbc2309c..c854aeffc8a 100644
--- a/rostests/tests/readconsole/readconsole.rbuild
+++ b/rostests/tests/readconsole/readconsole.rbuild
@@ -1,4 +1,3 @@
 <module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe">
-	<library>kernel32</library>
 	<file>main.c</file>
 </module>
diff --git a/rostests/tests/regdump/regdump.rbuild b/rostests/tests/regdump/regdump.rbuild
index e475c049a71..ff7cdba8944 100644
--- a/rostests/tests/regdump/regdump.rbuild
+++ b/rostests/tests/regdump/regdump.rbuild
@@ -1,5 +1,4 @@
 <module name="regdump" type="win32cui" installbase="bin" installname="regdump.exe">
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
 	<file>main.c</file>
diff --git a/rostests/tests/regqueryvalue/regqueryvalue.rbuild b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
index 482ada835b4..480491b5c47 100644
--- a/rostests/tests/regqueryvalue/regqueryvalue.rbuild
+++ b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
@@ -1,5 +1,4 @@
 <module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/regtest/regtest.rbuild b/rostests/tests/regtest/regtest.rbuild
index be8c2d61351..8cf55c50dff 100644
--- a/rostests/tests/regtest/regtest.rbuild
+++ b/rostests/tests/regtest/regtest.rbuild
@@ -1,5 +1,4 @@
 <module name="regtest" type="win32gui" installbase="bin" installname="regtest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>regtest.c</file>
 </module>
diff --git a/rostests/tests/sectest/sectest.rbuild b/rostests/tests/sectest/sectest.rbuild
index f26b607dd5d..b3405639853 100644
--- a/rostests/tests/sectest/sectest.rbuild
+++ b/rostests/tests/sectest/sectest.rbuild
@@ -1,5 +1,4 @@
 <module name="sectest" type="win32gui" installbase="bin" installname="sectest.exe" allowwarnings="true">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>sectest.c</file>
 </module>
diff --git a/rostests/tests/sertest/sertest.rbuild b/rostests/tests/sertest/sertest.rbuild
index eb50480c0b7..924c73af075 100644
--- a/rostests/tests/sertest/sertest.rbuild
+++ b/rostests/tests/sertest/sertest.rbuild
@@ -1,5 +1,4 @@
 <module name="sertest" type="win32gui" installbase="bin" installname="sertest.exe" allowwarnings="true">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>sertest.c</file>
 </module>
diff --git a/rostests/tests/shaptest/shaptest.rbuild b/rostests/tests/shaptest/shaptest.rbuild
index bca071b401f..48398589a1e 100644
--- a/rostests/tests/shaptest/shaptest.rbuild
+++ b/rostests/tests/shaptest/shaptest.rbuild
@@ -1,5 +1,4 @@
 <module name="shaptest" type="win32gui" installbase="bin" installname="shaptest.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>shaptest.c</file>
diff --git a/rostests/tests/shm/shm.rbuild b/rostests/tests/shm/shm.rbuild
index 6e2bcbcfe02..702cad48182 100644
--- a/rostests/tests/shm/shm.rbuild
+++ b/rostests/tests/shm/shm.rbuild
@@ -1,5 +1,4 @@
 <module name="shm" type="win32gui" installbase="bin" installname="shm.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>shm.c</file>
 </module>
diff --git a/rostests/tests/statst/statst.rbuild b/rostests/tests/statst/statst.rbuild
index 90f6315b61d..d376f443c14 100644
--- a/rostests/tests/statst/statst.rbuild
+++ b/rostests/tests/statst/statst.rbuild
@@ -1,5 +1,4 @@
 <module name="statst" type="win32gui" installbase="bin" installname="statst.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>statst.c</file>
diff --git a/rostests/tests/statst2/statst2.rbuild b/rostests/tests/statst2/statst2.rbuild
index 898ec415a30..8ef65a7ec8c 100644
--- a/rostests/tests/statst2/statst2.rbuild
+++ b/rostests/tests/statst2/statst2.rbuild
@@ -1,5 +1,4 @@
 <module name="statst2" type="win32gui" installbase="bin" installname="statst2.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>statst2.c</file>
diff --git a/rostests/tests/subclass/subclass.rbuild b/rostests/tests/subclass/subclass.rbuild
index fc3d9fa90a9..f92a22330c1 100644
--- a/rostests/tests/subclass/subclass.rbuild
+++ b/rostests/tests/subclass/subclass.rbuild
@@ -1,5 +1,4 @@
 <module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>subclass.c</file>
diff --git a/rostests/tests/suspend/suspend.rbuild b/rostests/tests/suspend/suspend.rbuild
index 0d532e8e368..a2077b06d57 100644
--- a/rostests/tests/suspend/suspend.rbuild
+++ b/rostests/tests/suspend/suspend.rbuild
@@ -1,5 +1,4 @@
 <module name="suspend" type="win32gui" installbase="bin" installname="suspend.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>suspend.c</file>
 </module>
diff --git a/rostests/tests/tcpsvr/tcpsvr.rbuild b/rostests/tests/tcpsvr/tcpsvr.rbuild
index fe8ab81f9a2..506274eee39 100644
--- a/rostests/tests/tcpsvr/tcpsvr.rbuild
+++ b/rostests/tests/tcpsvr/tcpsvr.rbuild
@@ -1,5 +1,4 @@
 <module name="tcpsvr" type="win32cui" installbase="bin" installname="tcpsvr.exe">
-	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>tcpsvr.c</file>
 </module>
diff --git a/rostests/tests/terminate/terminate.rbuild b/rostests/tests/terminate/terminate.rbuild
index 750ac884cc3..5c651e1107a 100644
--- a/rostests/tests/terminate/terminate.rbuild
+++ b/rostests/tests/terminate/terminate.rbuild
@@ -1,5 +1,4 @@
 <module name="terminate" type="win32cui" installbase="bin" installname="terminate.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>terminate.c</file>
 </module>
diff --git a/rostests/tests/thread/thread.rbuild b/rostests/tests/thread/thread.rbuild
index 3d3efdda624..15e413233ab 100644
--- a/rostests/tests/thread/thread.rbuild
+++ b/rostests/tests/thread/thread.rbuild
@@ -1,5 +1,4 @@
 <module name="thread" type="win32gui" installbase="bin" installname="thread.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>thread.c</file>
 </module>
diff --git a/rostests/tests/thread_msg/thread_msg.rbuild b/rostests/tests/thread_msg/thread_msg.rbuild
index ed655fbcbce..041c9e95b01 100644
--- a/rostests/tests/thread_msg/thread_msg.rbuild
+++ b/rostests/tests/thread_msg/thread_msg.rbuild
@@ -1,5 +1,4 @@
 <module name="thread_msg" type="win32gui" installbase="bin" installname="thread_msg.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>thread_msg.c</file>
diff --git a/rostests/tests/threadwait/threadwait.rbuild b/rostests/tests/threadwait/threadwait.rbuild
index ee9722722a6..8afada02cfd 100644
--- a/rostests/tests/threadwait/threadwait.rbuild
+++ b/rostests/tests/threadwait/threadwait.rbuild
@@ -1,5 +1,4 @@
 <module name="threadwait" type="win32gui" installbase="bin" installname="threadwait.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>threadwait.c</file>
 </module>
diff --git a/rostests/tests/tmrqueue/tmrqueue.rbuild b/rostests/tests/tmrqueue/tmrqueue.rbuild
index 9d7e67a5e9f..67140e61b04 100644
--- a/rostests/tests/tmrqueue/tmrqueue.rbuild
+++ b/rostests/tests/tmrqueue/tmrqueue.rbuild
@@ -1,5 +1,4 @@
 <module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tmrqueue.c</file>
 </module>
diff --git a/rostests/tests/tokentest/tokentest.rbuild b/rostests/tests/tokentest/tokentest.rbuild
index ecab4815597..5d4ed10de95 100644
--- a/rostests/tests/tokentest/tokentest.rbuild
+++ b/rostests/tests/tokentest/tokentest.rbuild
@@ -1,5 +1,4 @@
 <module name="tokentest" type="win32gui" installbase="bin" installname="tokentest.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tokentest.c</file>
 </module>
diff --git a/rostests/tests/txtscale/txtscale.rbuild b/rostests/tests/txtscale/txtscale.rbuild
index 3be68892d01..3f3af4fbbe3 100644
--- a/rostests/tests/txtscale/txtscale.rbuild
+++ b/rostests/tests/txtscale/txtscale.rbuild
@@ -1,5 +1,4 @@
 <module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe" allowwarnings ="true" stdlib="host">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/rostests/tests/vmtest/vmtest.rbuild b/rostests/tests/vmtest/vmtest.rbuild
index 22440409426..d4bcf82c3c4 100644
--- a/rostests/tests/vmtest/vmtest.rbuild
+++ b/rostests/tests/vmtest/vmtest.rbuild
@@ -1,5 +1,4 @@
 <module name="vmtest" type="win32cui" installbase="bin" installname="vmtest.exe" allowwarnings="true">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>vmtest.c</file>
 </module>
diff --git a/rostests/tests/wclickat/wclickat.rbuild b/rostests/tests/wclickat/wclickat.rbuild
index 0c08d47fa22..17adf0b0233 100644
--- a/rostests/tests/wclickat/wclickat.rbuild
+++ b/rostests/tests/wclickat/wclickat.rbuild
@@ -1,5 +1,4 @@
 <module name="wclickat" type="win32gui" installbase="bin" installname="wclickat.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>wclickat.c</file>
diff --git a/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild b/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild
index e7b407e1d30..d647069d3b6 100644
--- a/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild
+++ b/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild
@@ -1,4 +1,3 @@
 <module name="wcstombs-tests" type="win32cui" installbase="bin" installname="wcstombs-tests.exe">
-	<library>kernel32</library>
 	<file>wcstombs-tests.c</file>
 </module>
diff --git a/rostests/tests/winhello/winhello.rbuild b/rostests/tests/winhello/winhello.rbuild
index d18991f744e..9ee3e128e71 100644
--- a/rostests/tests/winhello/winhello.rbuild
+++ b/rostests/tests/winhello/winhello.rbuild
@@ -1,5 +1,4 @@
 <module name="winhello" type="win32gui" installbase="bin" installname="winhello.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>winhello.c</file>
diff --git a/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
index 4a3ab103065..12b61e673f1 100644
--- a/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
+++ b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
@@ -1,5 +1,4 @@
 <module name="wm_erasebkgnd" type="win32gui" installbase="bin" installname="wm_erasebkgnd.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>wm_erasebkgnd.cpp</file>
diff --git a/rostests/tests/wm_paint/wm_paint.rbuild b/rostests/tests/wm_paint/wm_paint.rbuild
index e9cf18170f7..4c1e5e63951 100644
--- a/rostests/tests/wm_paint/wm_paint.rbuild
+++ b/rostests/tests/wm_paint/wm_paint.rbuild
@@ -1,5 +1,4 @@
 <module name="wm_paint" type="win32gui" installbase="bin" installname="wm_paint.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>wm_paint.c</file>
diff --git a/rostests/tests/wpickclick/wpickclick.rbuild b/rostests/tests/wpickclick/wpickclick.rbuild
index 380964d4262..876f5753785 100644
--- a/rostests/tests/wpickclick/wpickclick.rbuild
+++ b/rostests/tests/wpickclick/wpickclick.rbuild
@@ -1,5 +1,4 @@
 <module name="wpickclick" type="win32gui" installbase="bin" installname="wpickclick.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>wpickclick.c</file>
 </module>
diff --git a/rostests/tests/zwcontinue/zwcontinue.rbuild b/rostests/tests/zwcontinue/zwcontinue.rbuild
index 8eda36b9fa4..f4cba28443f 100644
--- a/rostests/tests/zwcontinue/zwcontinue.rbuild
+++ b/rostests/tests/zwcontinue/zwcontinue.rbuild
@@ -1,5 +1,4 @@
 <module name="zwcontinue" type="win32gui" installbase="bin" installname="zwcontinue.exe">
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>zwcontinue.c</file>
 </module>
diff --git a/rostests/win32/cmd/cmd_test.rbuild b/rostests/win32/cmd/cmd_test.rbuild
index 954f9292a98..56b358501b5 100644
--- a/rostests/win32/cmd/cmd_test.rbuild
+++ b/rostests/win32/cmd/cmd_test.rbuild
@@ -7,7 +7,6 @@
 	<library>rtshared</library>
 	<library>regtests</library>
 	<library>cmd_base</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>cmd_base</library>
 	<library>pseh</library>
diff --git a/rostests/win32/kernel32/queuetest/queuetest.rbuild b/rostests/win32/kernel32/queuetest/queuetest.rbuild
index 483e5d83fc3..7fb8749a83f 100644
--- a/rostests/win32/kernel32/queuetest/queuetest.rbuild
+++ b/rostests/win32/kernel32/queuetest/queuetest.rbuild
@@ -1,4 +1,3 @@
 <module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe">
-	<library>kernel32</library>
 	<file>queuetest.c</file>
 </module>
diff --git a/rostests/win32/kmtloader/kmtloader.rbuild b/rostests/win32/kmtloader/kmtloader.rbuild
index fa40a2d6449..f7a5002e0c9 100644
--- a/rostests/win32/kmtloader/kmtloader.rbuild
+++ b/rostests/win32/kmtloader/kmtloader.rbuild
@@ -1,5 +1,4 @@
 <module name="kmtloader" type="win32cui" installbase="system32" installname="kmtloader.exe">
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>kmtloader.c</file>
 </module>
diff --git a/rostests/win32/smss/movefile/movefile.rbuild b/rostests/win32/smss/movefile/movefile.rbuild
index f3c763ea721..21033a1930f 100644
--- a/rostests/win32/smss/movefile/movefile.rbuild
+++ b/rostests/win32/smss/movefile/movefile.rbuild
@@ -1,8 +1,6 @@
 <module name="movefile" type="win32cui" installbase="system32" installname="movefiletest.exe">
 	<include base="movefile">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<file>movefile.cpp</file>
 	<file>movefile.rc</file>
-</module>
\ No newline at end of file
diff --git a/rostests/win32/user32/drawcaption/drawcaption.rbuild b/rostests/win32/user32/drawcaption/drawcaption.rbuild
index 7316fcecff2..351250ec530 100644
--- a/rostests/win32/user32/drawcaption/drawcaption.rbuild
+++ b/rostests/win32/user32/drawcaption/drawcaption.rbuild
@@ -3,7 +3,6 @@
 <group>
 <module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe" unicode="true">
 	<include base="drawcap">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>drawcap.c</file>
@@ -12,10 +11,8 @@
 
 <module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe" unicode="true">
 	<include base="capicon">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>capicon.c</file>
 	<file>capicon.rc</file>
 </module>
-</group>
\ No newline at end of file
diff --git a/rostests/win32/user32/kbdlayout/kbdlayout.rbuild b/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
index b7b6245570c..b2c73909635 100644
--- a/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
+++ b/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
@@ -1,6 +1,5 @@
 <module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe">
 	<include base="kbdlayout">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>kbdlayout.c</file>
diff --git a/rostests/win32/user32/sysicon/sysicon.rbuild b/rostests/win32/user32/sysicon/sysicon.rbuild
index f71133422b8..030452bbb2c 100644
--- a/rostests/win32/user32/sysicon/sysicon.rbuild
+++ b/rostests/win32/user32/sysicon/sysicon.rbuild
@@ -1,6 +1,5 @@
 <module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe" unicode="true">
 	<include base="capicon">.</include>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>sysicon.c</file>
diff --git a/rostests/winetests/GUI/GUI.rbuild b/rostests/winetests/GUI/GUI.rbuild
index 2e3722df945..8aceb4b1268 100644
--- a/rostests/winetests/GUI/GUI.rbuild
+++ b/rostests/winetests/GUI/GUI.rbuild
@@ -6,7 +6,6 @@
 	<redefine name="_WIN32_WINNT">0x501</redefine>
     <define name="__ROS_LONG64__" />
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<file>browsewnd.c</file>
diff --git a/rostests/winetests/advapi32/advapi32.rbuild b/rostests/winetests/advapi32/advapi32.rbuild
index d78d2bcd005..b11e57e1a5b 100644
--- a/rostests/winetests/advapi32/advapi32.rbuild
+++ b/rostests/winetests/advapi32/advapi32.rbuild
@@ -1,24 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" allowwarnings="true">
-    <include base="advapi32_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>advapi32</library>
-    <library>kernel32</library>
-    <library>ntdll</library>
-    <library>uuid</library>
-    <library>ole32</library>
-    <file>cred.c</file>
-    <file>crypt.c</file>
-    <file>crypt_lmhash.c</file>
-    <file>crypt_md4.c</file>
-    <file>crypt_md5.c</file>
-    <file>crypt_sha.c</file>
-    <file>lsa.c</file>
-    <file>registry.c</file>
-    <file>security.c</file>
-    <file>service.c</file>
-    <file>testlist.c</file>
+	<include base="advapi32_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>advapi32</library>
+	<library>ntdll</library>
+	<library>uuid</library>
+	<library>ole32</library>
+	<file>cred.c</file>
+	<file>crypt.c</file>
+	<file>crypt_lmhash.c</file>
+	<file>crypt_md4.c</file>
+	<file>crypt_md5.c</file>
+	<file>crypt_sha.c</file>
+	<file>lsa.c</file>
+	<file>registry.c</file>
+	<file>security.c</file>
+	<file>service.c</file>
+	<file>testlist.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/advpack/advpack.rbuild b/rostests/winetests/advpack/advpack.rbuild
index c6b9566aa0b..cc1868832df 100644
--- a/rostests/winetests/advpack/advpack.rbuild
+++ b/rostests/winetests/advpack/advpack.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>cabinet</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/browseui/browseui.rbuild b/rostests/winetests/browseui/browseui.rbuild
index d6b5e3768b7..12d5649fc37 100644
--- a/rostests/winetests/browseui/browseui.rbuild
+++ b/rostests/winetests/browseui/browseui.rbuild
@@ -7,7 +7,6 @@
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<file>autocomplete.c</file>
diff --git a/rostests/winetests/cabinet/cabinet.rbuild b/rostests/winetests/cabinet/cabinet.rbuild
index 5ce09e639d9..727c66b9c9f 100644
--- a/rostests/winetests/cabinet/cabinet.rbuild
+++ b/rostests/winetests/cabinet/cabinet.rbuild
@@ -9,7 +9,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>cabinet</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/comcat/comcat.rbuild b/rostests/winetests/comcat/comcat.rbuild
index ecf216d68b8..f6f98c32876 100644
--- a/rostests/winetests/comcat/comcat.rbuild
+++ b/rostests/winetests/comcat/comcat.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/comctl32/comctl32.rbuild b/rostests/winetests/comctl32/comctl32.rbuild
index 2e455094586..94804620870 100644
--- a/rostests/winetests/comctl32/comctl32.rbuild
+++ b/rostests/winetests/comctl32/comctl32.rbuild
@@ -34,7 +34,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/comdlg32/comdlg32.rbuild b/rostests/winetests/comdlg32/comdlg32.rbuild
index c2e5d0daf66..d24dc1bd3c8 100644
--- a/rostests/winetests/comdlg32/comdlg32.rbuild
+++ b/rostests/winetests/comdlg32/comdlg32.rbuild
@@ -12,7 +12,6 @@
 	<library>comdlg32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/credui/credui.rbuild b/rostests/winetests/credui/credui.rbuild
index 8f0f6c75806..90863a6492d 100644
--- a/rostests/winetests/credui/credui.rbuild
+++ b/rostests/winetests/credui/credui.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>credui</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/crypt32/crypt32.rbuild b/rostests/winetests/crypt32/crypt32.rbuild
index 3870f336383..91374248284 100644
--- a/rostests/winetests/crypt32/crypt32.rbuild
+++ b/rostests/winetests/crypt32/crypt32.rbuild
@@ -23,7 +23,6 @@
 	<library>wine</library>
 	<library>crypt32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/cryptnet/cryptnet.rbuild b/rostests/winetests/cryptnet/cryptnet.rbuild
index 3b9c8a395bb..309455432af 100644
--- a/rostests/winetests/cryptnet/cryptnet.rbuild
+++ b/rostests/winetests/cryptnet/cryptnet.rbuild
@@ -6,6 +6,5 @@
 	<library>wine</library>
 	<library>cryptnet</library>
 	<library>crypt32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/cryptui/cryptui.rbuild b/rostests/winetests/cryptui/cryptui.rbuild
index 2733b35d0f3..2c6daf31b46 100644
--- a/rostests/winetests/cryptui/cryptui.rbuild
+++ b/rostests/winetests/cryptui/cryptui.rbuild
@@ -6,7 +6,5 @@
 	<library>wine</library>
 	<library>cryptui</library>
 	<library>crypt32</library>
-	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
-</module>
\ No newline at end of file
diff --git a/rostests/winetests/dnsapi/dnsapi.rbuild b/rostests/winetests/dnsapi/dnsapi.rbuild
index fa4c8b7757c..918d8d6f49e 100644
--- a/rostests/winetests/dnsapi/dnsapi.rbuild
+++ b/rostests/winetests/dnsapi/dnsapi.rbuild
@@ -6,6 +6,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>dnsapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/fusion/fusion.rbuild b/rostests/winetests/fusion/fusion.rbuild
index db37aa35602..6114362de3c 100644
--- a/rostests/winetests/fusion/fusion.rbuild
+++ b/rostests/winetests/fusion/fusion.rbuild
@@ -8,6 +8,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/gdi32/gdi32.rbuild b/rostests/winetests/gdi32/gdi32.rbuild
index 9726a057872..69f291d729f 100644
--- a/rostests/winetests/gdi32/gdi32.rbuild
+++ b/rostests/winetests/gdi32/gdi32.rbuild
@@ -1,27 +1,24 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true">
-    <include base="gdi32_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>ntdll</library>
-    <library>gdi32</library>
-    <library>kernel32</library>
-    <library>user32</library>
-    <library>advapi32</library>
-    <file>bitmap.c</file>
-    <file>brush.c</file>
-    <file>clipping.c</file>
-    <file>dc.c</file>
-    <file>gdiobj.c</file>
-    <file>generated.c</file>
-    <file>icm.c</file>
-    <file>font.c</file>
-    <file>mapping.c</file>
-    <file>metafile.c</file>
-    <file>palette.c</file>
-    <file>path.c</file>
-    <file>pen.c</file>
-    <file>testlist.c</file>
+	<include base="gdi32_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<file>bitmap.c</file>
+	<file>brush.c</file>
+	<file>clipping.c</file>
+	<file>dc.c</file>
+	<file>gdiobj.c</file>
+	<file>generated.c</file>
+	<file>icm.c</file>
+	<file>font.c</file>
+	<file>mapping.c</file>
+	<file>metafile.c</file>
+	<file>palette.c</file>
+	<file>path.c</file>
+	<file>pen.c</file>
+	<file>testlist.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/gdiplus/gdiplus.rbuild b/rostests/winetests/gdiplus/gdiplus.rbuild
index 531e90b48a6..588629eef2e 100644
--- a/rostests/winetests/gdiplus/gdiplus.rbuild
+++ b/rostests/winetests/gdiplus/gdiplus.rbuild
@@ -20,7 +20,6 @@
 	<library>gdiplus</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ole32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/hlink/hlink.rbuild b/rostests/winetests/hlink/hlink.rbuild
index 7f77113d0a6..771cae3a8a3 100644
--- a/rostests/winetests/hlink/hlink.rbuild
+++ b/rostests/winetests/hlink/hlink.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>hlink</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/icmp/icmp.rbuild b/rostests/winetests/icmp/icmp.rbuild
index 827d44ded66..460e46218b0 100644
--- a/rostests/winetests/icmp/icmp.rbuild
+++ b/rostests/winetests/icmp/icmp.rbuild
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="icmp_winetest" type="win32cui" installbase="bin" installname="icmp_winetest.exe" allowwarnings="true">
-    <include base="icmp_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>kernel32</library>
-    <library>ntdll</library>
-    <library>icmp</library>
-    <file>icmp.c</file>
-    <file>testlist.c</file>
+	<include base="icmp_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<library>icmp</library>
+	<file>icmp.c</file>
+	<file>testlist.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/imm32/imm32.rbuild b/rostests/winetests/imm32/imm32.rbuild
index efd37b6d02d..94abb2a8262 100644
--- a/rostests/winetests/imm32/imm32.rbuild
+++ b/rostests/winetests/imm32/imm32.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>imm32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/inetcomm/inetcomm.rbuild b/rostests/winetests/inetcomm/inetcomm.rbuild
index 0eaaa72f892..ae1daf3c188 100644
--- a/rostests/winetests/inetcomm/inetcomm.rbuild
+++ b/rostests/winetests/inetcomm/inetcomm.rbuild
@@ -8,6 +8,5 @@
 	<library>inetcomm</library>
 	<library>oleaut32</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/inetmib1/inetmib1.rbuild b/rostests/winetests/inetmib1/inetmib1.rbuild
index 8ed78cb9b7d..467cfb35fed 100644
--- a/rostests/winetests/inetmib1/inetmib1.rbuild
+++ b/rostests/winetests/inetmib1/inetmib1.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>snmpapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/iphlpapi/iphlpapi.rbuild b/rostests/winetests/iphlpapi/iphlpapi.rbuild
index 644c9c0efc0..ced63e68810 100644
--- a/rostests/winetests/iphlpapi/iphlpapi.rbuild
+++ b/rostests/winetests/iphlpapi/iphlpapi.rbuild
@@ -7,7 +7,6 @@
 	<file>iphlpapi.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/itss/itss.rbuild b/rostests/winetests/itss/itss.rbuild
index ee81500e787..f143add644f 100644
--- a/rostests/winetests/itss/itss.rbuild
+++ b/rostests/winetests/itss/itss.rbuild
@@ -6,6 +6,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/jscript/jscript.rbuild b/rostests/winetests/jscript/jscript.rbuild
index b37bb04bcd0..e679b74c6fd 100644
--- a/rostests/winetests/jscript/jscript.rbuild
+++ b/rostests/winetests/jscript/jscript.rbuild
@@ -11,7 +11,6 @@
 	<library>wine</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/kernel32/kernel32.rbuild b/rostests/winetests/kernel32/kernel32.rbuild
index 90c06299232..0745bbc805d 100644
--- a/rostests/winetests/kernel32/kernel32.rbuild
+++ b/rostests/winetests/kernel32/kernel32.rbuild
@@ -1,46 +1,43 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true">
-    <include base="kernel32_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>ntdll</library>
-    <library>kernel32</library>
-    <library>user32</library>
-    <library>advapi32</library>
-    <file>actctx.c</file>
-    <file>alloc.c</file>
-    <file>atom.c</file>
-    <file>change.c</file>
-    <file>codepage.c</file>
-    <file>comm.c</file>
-    <file>console.c</file>
-    <file>debugger.c</file>
-    <file>directory.c</file>
-    <file>drive.c</file>
-    <file>environ.c</file>
-    <file>file.c</file>
-    <file>format_msg.c</file>
-    <!-- <file>generated.c</file> -->
-    <file>heap.c</file>
-    <file>interlck.c</file>
-    <file>loader.c</file>
-    <file>locale.c</file>
-    <file>mailslot.c</file>
-    <file>module.c</file>
-    <file>path.c</file>
-    <file>pipe.c</file>
-    <file>process.c</file>
-    <file>profile.c</file>
-    <file>resource.c</file>
-    <file>sync.c</file>
-    <file>thread.c</file>
-    <file>time.c</file>
-    <file>timer.c</file>
-    <file>toolhelp.c</file>
-    <file>version.c</file>
-    <file>virtual.c</file>
-    <file>volume.c</file>
-    <file>testlist.c</file>
+	<include base="kernel32_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<file>actctx.c</file>
+	<file>alloc.c</file>
+	<file>atom.c</file>
+	<file>change.c</file>
+	<file>codepage.c</file>
+	<file>comm.c</file>
+	<file>console.c</file>
+	<file>debugger.c</file>
+	<file>directory.c</file>
+	<file>drive.c</file>
+	<file>environ.c</file>
+	<file>file.c</file>
+	<file>format_msg.c</file>
+	<!-- <file>generated.c</file> -->
+	<file>heap.c</file>
+	<file>interlck.c</file>
+	<file>loader.c</file>
+	<file>locale.c</file>
+	<file>mailslot.c</file>
+	<file>module.c</file>
+	<file>path.c</file>
+	<file>pipe.c</file>
+	<file>process.c</file>
+	<file>profile.c</file>
+	<file>resource.c</file>
+	<file>sync.c</file>
+	<file>thread.c</file>
+	<file>time.c</file>
+	<file>timer.c</file>
+	<file>toolhelp.c</file>
+	<file>version.c</file>
+	<file>virtual.c</file>
+	<file>volume.c</file>
+	<file>testlist.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/localspl/localspl.rbuild b/rostests/winetests/localspl/localspl.rbuild
index 2fb7d3f6aca..5e8ca464e6d 100644
--- a/rostests/winetests/localspl/localspl.rbuild
+++ b/rostests/winetests/localspl/localspl.rbuild
@@ -4,7 +4,6 @@
 	<file>localmon.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/localui/localui.rbuild b/rostests/winetests/localui/localui.rbuild
index 21e163d2f74..a219470a038 100644
--- a/rostests/winetests/localui/localui.rbuild
+++ b/rostests/winetests/localui/localui.rbuild
@@ -4,7 +4,6 @@
 	<file>localui.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>winspool</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/lz32/lz32.rbuild b/rostests/winetests/lz32/lz32.rbuild
index f189ae9366d..205c347d865 100644
--- a/rostests/winetests/lz32/lz32.rbuild
+++ b/rostests/winetests/lz32/lz32.rbuild
@@ -8,7 +8,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>lz32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/mapi32/mapi32.rbuild b/rostests/winetests/mapi32/mapi32.rbuild
index b92eb328cfc..4d27118fbd8 100644
--- a/rostests/winetests/mapi32/mapi32.rbuild
+++ b/rostests/winetests/mapi32/mapi32.rbuild
@@ -9,7 +9,6 @@
 	<file>util.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
diff --git a/rostests/winetests/mlang/mlang.rbuild b/rostests/winetests/mlang/mlang.rbuild
index 37b3b2ab3de..05d515cedbe 100644
--- a/rostests/winetests/mlang/mlang.rbuild
+++ b/rostests/winetests/mlang/mlang.rbuild
@@ -11,7 +11,6 @@
 	<library>oleaut32</library>
 	<library>ole32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/msacm32/msacm32.rbuild b/rostests/winetests/msacm32/msacm32.rbuild
index 8dc00928dc7..477d64fdc50 100644
--- a/rostests/winetests/msacm32/msacm32.rbuild
+++ b/rostests/winetests/msacm32/msacm32.rbuild
@@ -5,7 +5,6 @@
 	<include base="msacm32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>msacm32</library>
 	<file>msacm.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/mscms/mscms.rbuild b/rostests/winetests/mscms/mscms.rbuild
index 24f2765165d..8da6ea1ea1d 100644
--- a/rostests/winetests/mscms/mscms.rbuild
+++ b/rostests/winetests/mscms/mscms.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/msctf/msctf.rbuild b/rostests/winetests/msctf/msctf.rbuild
index 3298accfce2..537242ad582 100644
--- a/rostests/winetests/msctf/msctf.rbuild
+++ b/rostests/winetests/msctf/msctf.rbuild
@@ -6,6 +6,5 @@
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/mshtml/mshtml.rbuild b/rostests/winetests/mshtml/mshtml.rbuild
index f844a7b52fb..280dced8372 100644
--- a/rostests/winetests/mshtml/mshtml.rbuild
+++ b/rostests/winetests/mshtml/mshtml.rbuild
@@ -19,7 +19,6 @@
 	<library>user32</library>
 	<library>urlmon</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/msi/msi.rbuild b/rostests/winetests/msi/msi.rbuild
index 72de4ebbb37..2e9a6d6215e 100644
--- a/rostests/winetests/msi/msi.rbuild
+++ b/rostests/winetests/msi/msi.rbuild
@@ -23,7 +23,6 @@
 	<library>oleaut32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>version</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/mstask/mstask.rbuild b/rostests/winetests/mstask/mstask.rbuild
index 3b1976937f7..9085f9ca1ce 100644
--- a/rostests/winetests/mstask/mstask.rbuild
+++ b/rostests/winetests/mstask/mstask.rbuild
@@ -10,7 +10,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>ole32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/msvcrt/msvcrt.rbuild b/rostests/winetests/msvcrt/msvcrt.rbuild
index fd9918c6224..ca047facb44 100644
--- a/rostests/winetests/msvcrt/msvcrt.rbuild
+++ b/rostests/winetests/msvcrt/msvcrt.rbuild
@@ -20,7 +20,6 @@
 	<define name="rmdir">_rmdir</define>
 	<define name="putenv">_putenv</define>
 
-	<library>kernel32</library>
 	<file>cpp.c</file>
 	<file>data.c</file>
 	<file>dir.c</file>
diff --git a/rostests/winetests/msvcrtd/msvcrtd.rbuild b/rostests/winetests/msvcrtd/msvcrtd.rbuild
index 5a2ede1b50e..3c77e151cbc 100644
--- a/rostests/winetests/msvcrtd/msvcrtd.rbuild
+++ b/rostests/winetests/msvcrtd/msvcrtd.rbuild
@@ -4,6 +4,5 @@
 	<file>debug.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/msvfw32/msvfw32.rbuild b/rostests/winetests/msvfw32/msvfw32.rbuild
index b3c14cabb27..2328b4f5b33 100644
--- a/rostests/winetests/msvfw32/msvfw32.rbuild
+++ b/rostests/winetests/msvfw32/msvfw32.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>msvfw32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/msxml3/msxml3.rbuild b/rostests/winetests/msxml3/msxml3.rbuild
index 3fa8b4d9f97..d57321d38af 100644
--- a/rostests/winetests/msxml3/msxml3.rbuild
+++ b/rostests/winetests/msxml3/msxml3.rbuild
@@ -14,7 +14,6 @@
 	<library>user32</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/netapi32/netapi32.rbuild b/rostests/winetests/netapi32/netapi32.rbuild
index 7bf6e3a764d..65791cb29f9 100644
--- a/rostests/winetests/netapi32/netapi32.rbuild
+++ b/rostests/winetests/netapi32/netapi32.rbuild
@@ -11,7 +11,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/ntdll/ntdll.rbuild b/rostests/winetests/ntdll/ntdll.rbuild
index dd9dc574e61..448d93c0c0c 100644
--- a/rostests/winetests/ntdll/ntdll.rbuild
+++ b/rostests/winetests/ntdll/ntdll.rbuild
@@ -1,28 +1,25 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" allowwarnings="true">
-    <include base="ntdll_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>kernel32</library>
-    <library>ntdll</library>
-    <file>atom.c</file>
-    <file>change.c</file>
-    <file>env.c</file>
-    <file>error.c</file>
-    <file>exception.c</file>
-    <file>file.c</file>
-    <file>info.c</file>
-    <file>large_int.c</file>
-    <file>om.c</file>
-    <file>path.c</file>
-    <file>port.c</file>
-    <file>reg.c</file>
-    <file>rtlbitmap.c</file>
-    <file>rtl.c</file>
-    <file>rtlstr.c</file>
-    <file>string.c</file>
-    <file>time.c</file>
-    <file>testlist.c</file>
+	<include base="ntdll_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<file>atom.c</file>
+	<file>change.c</file>
+	<file>env.c</file>
+	<file>error.c</file>
+	<file>exception.c</file>
+	<file>file.c</file>
+	<file>info.c</file>
+	<file>large_int.c</file>
+	<file>om.c</file>
+	<file>path.c</file>
+	<file>port.c</file>
+	<file>reg.c</file>
+	<file>rtlbitmap.c</file>
+	<file>rtl.c</file>
+	<file>rtlstr.c</file>
+	<file>string.c</file>
+	<file>time.c</file>
+	<file>testlist.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/ntdsapi/ntdsapi.rbuild b/rostests/winetests/ntdsapi/ntdsapi.rbuild
index fd4a5b5c610..ce6c229164c 100644
--- a/rostests/winetests/ntdsapi/ntdsapi.rbuild
+++ b/rostests/winetests/ntdsapi/ntdsapi.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>ntdsapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/ntprint/ntprint.rbuild b/rostests/winetests/ntprint/ntprint.rbuild
index 52b0625efa0..a60b8e96540 100644
--- a/rostests/winetests/ntprint/ntprint.rbuild
+++ b/rostests/winetests/ntprint/ntprint.rbuild
@@ -4,6 +4,5 @@
 	<file>ntprint.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/odbccp32/odbccp32.rbuild b/rostests/winetests/odbccp32/odbccp32.rbuild
index 6e57a47079d..8da1e1f38b4 100644
--- a/rostests/winetests/odbccp32/odbccp32.rbuild
+++ b/rostests/winetests/odbccp32/odbccp32.rbuild
@@ -8,7 +8,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>odbccp32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/ole32/ole32.rbuild b/rostests/winetests/ole32/ole32.rbuild
index edd6406b76a..828e63d45eb 100644
--- a/rostests/winetests/ole32/ole32.rbuild
+++ b/rostests/winetests/ole32/ole32.rbuild
@@ -24,7 +24,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/oleacc/oleacc.rbuild b/rostests/winetests/oleacc/oleacc.rbuild
index aafe10981e4..4a67b292704 100644
--- a/rostests/winetests/oleacc/oleacc.rbuild
+++ b/rostests/winetests/oleacc/oleacc.rbuild
@@ -4,7 +4,6 @@
 	<file>main.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>oleacc</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/oleaut32/oleaut32.rbuild b/rostests/winetests/oleaut32/oleaut32.rbuild
index c16f769ebf9..e24a24b8bf0 100644
--- a/rostests/winetests/oleaut32/oleaut32.rbuild
+++ b/rostests/winetests/oleaut32/oleaut32.rbuild
@@ -13,7 +13,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<library>tmarshal_interface</library>
diff --git a/rostests/winetests/pdh/pdh.rbuild b/rostests/winetests/pdh/pdh.rbuild
index f8a653e29cf..ee4439487d8 100644
--- a/rostests/winetests/pdh/pdh.rbuild
+++ b/rostests/winetests/pdh/pdh.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>pdh</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/powrprof/powrprof.rbuild b/rostests/winetests/powrprof/powrprof.rbuild
index 9100ba8406c..24587e4c50b 100644
--- a/rostests/winetests/powrprof/powrprof.rbuild
+++ b/rostests/winetests/powrprof/powrprof.rbuild
@@ -6,7 +6,6 @@
 	<library>powrprof</library>
 	<library>ntdll</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<file>testlist.c</file>
 	<file>pwrprof.c</file>
 </module>
diff --git a/rostests/winetests/psapi/psapi.rbuild b/rostests/winetests/psapi/psapi.rbuild
index a9034f75549..689556c350c 100644
--- a/rostests/winetests/psapi/psapi.rbuild
+++ b/rostests/winetests/psapi/psapi.rbuild
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" allowwarnings="true">
-    <include base="psapi_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>kernel32</library>
-    <library>ntdll</library>
-    <library>psapi</library>
-    <file>testlist.c</file>
-    <file>psapi_main.c</file>
+	<include base="psapi_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<library>psapi</library>
+	<file>testlist.c</file>
+	<file>psapi_main.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/qmgr/qmgr.rbuild b/rostests/winetests/qmgr/qmgr.rbuild
index dab70725999..ea3ecdea9c3 100644
--- a/rostests/winetests/qmgr/qmgr.rbuild
+++ b/rostests/winetests/qmgr/qmgr.rbuild
@@ -11,6 +11,5 @@
 	<library>ole32</library>
 	<library>shlwapi</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/quartz/quartz.rbuild b/rostests/winetests/quartz/quartz.rbuild
index 60cb3b61c5c..4e6ab816799 100644
--- a/rostests/winetests/quartz/quartz.rbuild
+++ b/rostests/winetests/quartz/quartz.rbuild
@@ -13,6 +13,5 @@
 	<library>oleaut32</library>
 	<library>ole32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/rasapi32/rasapi32.rbuild b/rostests/winetests/rasapi32/rasapi32.rbuild
index 964a155dfb3..dff0d77da22 100644
--- a/rostests/winetests/rasapi32/rasapi32.rbuild
+++ b/rostests/winetests/rasapi32/rasapi32.rbuild
@@ -4,6 +4,5 @@
 	<file>rasapi.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/riched20/riched20.rbuild b/rostests/winetests/riched20/riched20.rbuild
index b8afebde771..a1515c64a48 100644
--- a/rostests/winetests/riched20/riched20.rbuild
+++ b/rostests/winetests/riched20/riched20.rbuild
@@ -14,7 +14,6 @@
 	<library>oleaut32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/riched32/riched32.rbuild b/rostests/winetests/riched32/riched32.rbuild
index a1580b914f3..13d3136017e 100644
--- a/rostests/winetests/riched32/riched32.rbuild
+++ b/rostests/winetests/riched32/riched32.rbuild
@@ -9,7 +9,6 @@
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/rpcrt4/rpcrt4.rbuild b/rostests/winetests/rpcrt4/rpcrt4.rbuild
index 4d3b10509bb..3f7686e46d8 100644
--- a/rostests/winetests/rpcrt4/rpcrt4.rbuild
+++ b/rostests/winetests/rpcrt4/rpcrt4.rbuild
@@ -19,7 +19,6 @@
 		<library>rpcrt4_winetest_server</library>
 		<library>rpcrt4_winetest_client</library>
 		<library>rpcrt4</library>
-		<library>kernel32</library>
 		<library>ntdll</library>
 		<file>cstub.c</file>
 		<file>generated.c</file>
diff --git a/rostests/winetests/rsabase/rsabase.rbuild b/rostests/winetests/rsabase/rsabase.rbuild
index c4af042b20b..0aba4aa4238 100644
--- a/rostests/winetests/rsabase/rsabase.rbuild
+++ b/rostests/winetests/rsabase/rsabase.rbuild
@@ -5,7 +5,6 @@
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>rsabase.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/rsaenh/rsaenh.rbuild b/rostests/winetests/rsaenh/rsaenh.rbuild
index 469db2970ce..78e47099110 100644
--- a/rostests/winetests/rsaenh/rsaenh.rbuild
+++ b/rostests/winetests/rsaenh/rsaenh.rbuild
@@ -8,7 +8,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/schannel/schannel.rbuild b/rostests/winetests/schannel/schannel.rbuild
index 4eea0f86408..22fb80863ed 100644
--- a/rostests/winetests/schannel/schannel.rbuild
+++ b/rostests/winetests/schannel/schannel.rbuild
@@ -5,7 +5,6 @@
 	<include base="schannel_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>main.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/secur32/secur32.rbuild b/rostests/winetests/secur32/secur32.rbuild
index 38919aed5e7..9aa670f26fb 100644
--- a/rostests/winetests/secur32/secur32.rbuild
+++ b/rostests/winetests/secur32/secur32.rbuild
@@ -8,6 +8,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/serialui/serialui.rbuild b/rostests/winetests/serialui/serialui.rbuild
index d8293f9e512..9c5e14d62ec 100644
--- a/rostests/winetests/serialui/serialui.rbuild
+++ b/rostests/winetests/serialui/serialui.rbuild
@@ -4,6 +4,5 @@
 	<file>confdlg.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/setupapi/setupapi.rbuild b/rostests/winetests/setupapi/setupapi.rbuild
index 80e8d5336ca..0953d66b796 100644
--- a/rostests/winetests/setupapi/setupapi.rbuild
+++ b/rostests/winetests/setupapi/setupapi.rbuild
@@ -1,21 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" allowwarnings="true">
-    <include base="setupapi_winetest">.</include>
-    <define name="__ROS_LONG64__" />
-    <library>ntdll</library>
-    <library>kernel32</library>
-    <library>advapi32</library>
-    <library>setupapi</library>
-    <library>user32</library>
-    <file>devclass.c</file>
-    <file>devinst.c</file>
-    <file>install.c</file>
-    <file>misc.c</file>
-    <file>parser.c</file>
-    <file>query.c</file>
-    <file>stringtable.c</file>
-    <file>testlist.c</file>
+	<include base="setupapi_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<library>advapi32</library>
+	<library>setupapi</library>
+	<library>user32</library>
+	<file>devclass.c</file>
+	<file>devinst.c</file>
+	<file>install.c</file>
+	<file>misc.c</file>
+	<file>parser.c</file>
+	<file>query.c</file>
+	<file>stringtable.c</file>
+	<file>testlist.c</file>
 </module>
-</group>
diff --git a/rostests/winetests/shdocvw/shdocvw.rbuild b/rostests/winetests/shdocvw/shdocvw.rbuild
index 8d65bd2f57f..181826f91e0 100644
--- a/rostests/winetests/shdocvw/shdocvw.rbuild
+++ b/rostests/winetests/shdocvw/shdocvw.rbuild
@@ -16,7 +16,6 @@
 	<library>oleaut32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/shell32/shell32.rbuild b/rostests/winetests/shell32/shell32.rbuild
index 18a1c94ced2..5d7c99a5aa1 100644
--- a/rostests/winetests/shell32/shell32.rbuild
+++ b/rostests/winetests/shell32/shell32.rbuild
@@ -13,7 +13,6 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<file>appbar.c</file>
diff --git a/rostests/winetests/shlwapi/shlwapi.rbuild b/rostests/winetests/shlwapi/shlwapi.rbuild
index f17bcd6e8ea..cd5cffd19a3 100644
--- a/rostests/winetests/shlwapi/shlwapi.rbuild
+++ b/rostests/winetests/shlwapi/shlwapi.rbuild
@@ -21,7 +21,6 @@
 	<library>advapi32</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/snmpapi/snmpapi.rbuild b/rostests/winetests/snmpapi/snmpapi.rbuild
index 49cc1d20cfc..e3c21397bf5 100644
--- a/rostests/winetests/snmpapi/snmpapi.rbuild
+++ b/rostests/winetests/snmpapi/snmpapi.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>snmpapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/spoolss/spoolss.rbuild b/rostests/winetests/spoolss/spoolss.rbuild
index 462ed4444c5..5747b731b3b 100644
--- a/rostests/winetests/spoolss/spoolss.rbuild
+++ b/rostests/winetests/spoolss/spoolss.rbuild
@@ -4,6 +4,5 @@
 	<file>spoolss.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/twain_32/twain_32.rbuild b/rostests/winetests/twain_32/twain_32.rbuild
index 786ba212422..688e6f86a6d 100644
--- a/rostests/winetests/twain_32/twain_32.rbuild
+++ b/rostests/winetests/twain_32/twain_32.rbuild
@@ -6,6 +6,5 @@
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/urlmon/urlmon.rbuild b/rostests/winetests/urlmon/urlmon.rbuild
index b16d69a7151..593386f2b97 100644
--- a/rostests/winetests/urlmon/urlmon.rbuild
+++ b/rostests/winetests/urlmon/urlmon.rbuild
@@ -17,7 +17,6 @@
 	<library>ole32</library>
 	<library>user32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/user32/user32.rbuild b/rostests/winetests/user32/user32.rbuild
index 580c0ebe9ff..d0dd6900245 100644
--- a/rostests/winetests/user32/user32.rbuild
+++ b/rostests/winetests/user32/user32.rbuild
@@ -1,39 +1,36 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
 <module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true">
-    <include base="user32_winetest">.</include>
-    <include base="ReactOS">include/reactos/wine</include>
-    <define name="__ROS_LONG64__" />
-    <library>ntdll</library>
-    <library>user32</library>
-    <library>gdi32</library>
-    <library>advapi32</library>
-    <library>kernel32</library>
-    <file>broadcast.c</file>
-    <file>class.c</file>
-    <file>clipboard.c</file>
-    <file>combo.c</file>
-    <file>cursoricon.c</file>
-    <file>dce.c</file>
-    <file>dde.c</file>
-    <file>dialog.c</file>
-    <file>edit.c</file>
-    <!-- <file>generated.c</file> -->
-    <file>input.c</file>
-    <file>listbox.c</file>
-    <file>menu.c</file>
-    <file>monitor.c</file>
-    <file>msg.c</file>
-    <file>resource.c</file>
-    <file>scroll.c</file>
-    <file>static.c</file>
-    <file>sysparams.c</file>
-    <file>text.c</file>
-    <file>win.c</file>
-    <file>winstation.c</file>
-    <file>wsprintf.c</file>
-    <file>testlist.c</file>
-    <file>resource.rc</file>
+	<include base="user32_winetest">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__ROS_LONG64__" />
+	<library>ntdll</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<file>broadcast.c</file>
+	<file>class.c</file>
+	<file>clipboard.c</file>
+	<file>combo.c</file>
+	<file>cursoricon.c</file>
+	<file>dce.c</file>
+	<file>dde.c</file>
+	<file>dialog.c</file>
+	<file>edit.c</file>
+	<!-- <file>generated.c</file> -->
+	<file>input.c</file>
+	<file>listbox.c</file>
+	<file>menu.c</file>
+	<file>monitor.c</file>
+	<file>msg.c</file>
+	<file>resource.c</file>
+	<file>scroll.c</file>
+	<file>static.c</file>
+	<file>sysparams.c</file>
+	<file>text.c</file>
+	<file>win.c</file>
+	<file>winstation.c</file>
+	<file>wsprintf.c</file>
+	<file>testlist.c</file>
+	<file>resource.rc</file>
 </module>
-</group>
diff --git a/rostests/winetests/userenv/userenv.rbuild b/rostests/winetests/userenv/userenv.rbuild
index 621b330c47b..1b14029ad23 100644
--- a/rostests/winetests/userenv/userenv.rbuild
+++ b/rostests/winetests/userenv/userenv.rbuild
@@ -6,6 +6,5 @@
 	<library>wine</library>
 	<library>userenv</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/usp10/usp10.rbuild b/rostests/winetests/usp10/usp10.rbuild
index d376e4845c8..94457b5edd8 100644
--- a/rostests/winetests/usp10/usp10.rbuild
+++ b/rostests/winetests/usp10/usp10.rbuild
@@ -10,7 +10,6 @@
 	<library>usp10</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/uxtheme/uxtheme.rbuild b/rostests/winetests/uxtheme/uxtheme.rbuild
index 917aad8b8c0..8876207bb33 100644
--- a/rostests/winetests/uxtheme/uxtheme.rbuild
+++ b/rostests/winetests/uxtheme/uxtheme.rbuild
@@ -8,7 +8,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/version/version.rbuild b/rostests/winetests/version/version.rbuild
index 7f88072fd2f..b46ca7e68ab 100644
--- a/rostests/winetests/version/version.rbuild
+++ b/rostests/winetests/version/version.rbuild
@@ -10,7 +10,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>version</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/winetest/winetest.rbuild b/rostests/winetests/winetest/winetest.rbuild
index 291b30f5713..e23523412a0 100644
--- a/rostests/winetests/winetest/winetest.rbuild
+++ b/rostests/winetests/winetest/winetest.rbuild
@@ -9,7 +9,6 @@
 	<library>gdi32</library>
 	<library>advapi32</library>
 	<library>ws2_32</library>
-	<library>kernel32</library>
 	<file>gui.c</file>
 	<file>main.c</file>
 	<file>send.c</file>
diff --git a/rostests/winetests/winhttp/winhttp.rbuild b/rostests/winetests/winhttp/winhttp.rbuild
index b12b9d31e02..3e5de6d1731 100644
--- a/rostests/winetests/winhttp/winhttp.rbuild
+++ b/rostests/winetests/winhttp/winhttp.rbuild
@@ -10,7 +10,6 @@
 	<file>winhttp.c</file>
 	<library>wine</library>
 	<library>winhttp</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/wininet/wininet.rbuild b/rostests/winetests/wininet/wininet.rbuild
index 32abbc60f1f..4edfeed88fd 100644
--- a/rostests/winetests/wininet/wininet.rbuild
+++ b/rostests/winetests/wininet/wininet.rbuild
@@ -7,7 +7,6 @@
 	<library>wine</library>
 	<library>wininet</library>
 	<library>ws2_32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>ftp.c</file>
 	<file>generated.c</file>
diff --git a/rostests/winetests/winmm/winmm.rbuild b/rostests/winetests/winmm/winmm.rbuild
index 07ea90a400d..778b2e6dead 100644
--- a/rostests/winetests/winmm/winmm.rbuild
+++ b/rostests/winetests/winmm/winmm.rbuild
@@ -5,7 +5,6 @@
 	<library>dxguid</library>
 	<library>winmm</library>
 	<library>user32</library>
-	<library>kernel32</library>
 	<file>capture.c</file>
 	<file>mci.c</file>
 	<file>mixer.c</file>
diff --git a/rostests/winetests/wintrust/wintrust.rbuild b/rostests/winetests/wintrust/wintrust.rbuild
index 31d4f79e7b5..7b7caa73ba7 100644
--- a/rostests/winetests/wintrust/wintrust.rbuild
+++ b/rostests/winetests/wintrust/wintrust.rbuild
@@ -13,7 +13,6 @@
 	<library>wintrust</library>
 	<library>crypt32</library>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/wlanapi/wlanapi.rbuild b/rostests/winetests/wlanapi/wlanapi.rbuild
index 4e33b4e3a1a..021d3cb9a26 100644
--- a/rostests/winetests/wlanapi/wlanapi.rbuild
+++ b/rostests/winetests/wlanapi/wlanapi.rbuild
@@ -6,7 +6,6 @@
 	<define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>wlanapi</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>wlanapi.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/wldap32/wldap32.rbuild b/rostests/winetests/wldap32/wldap32.rbuild
index 06f6f6f8ded..da1ad318c62 100644
--- a/rostests/winetests/wldap32/wldap32.rbuild
+++ b/rostests/winetests/wldap32/wldap32.rbuild
@@ -5,6 +5,5 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>wldap32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
diff --git a/rostests/winetests/ws2_32/ws2_32.rbuild b/rostests/winetests/ws2_32/ws2_32.rbuild
index 4b644b60887..c5ac9fc4f62 100644
--- a/rostests/winetests/ws2_32/ws2_32.rbuild
+++ b/rostests/winetests/ws2_32/ws2_32.rbuild
@@ -9,7 +9,6 @@
 	<file>testlist.c</file>
 	<library>wine</library>
 	<library>ws2_32</library>
-	<library>kernel32</library>
 	<library>ntdll</library>
 </module>
 </group>