[General]

- Remove the "kernel32" library reference in all .rbuild files of user-mode modules, because this one is already added by "mingw_common". Also fix the indentation in some files.

svn path=/trunk/; revision=44368

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>

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>

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">

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>

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>

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>

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>

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>

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>

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>

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" />

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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" />

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>