No need to define __USE_W32API

svn path=/trunk/; revision=29815

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>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>

reactos/base/applications/calc/calc.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="calc" type="win32gui" installbase="system32" installname="calc.exe">
 	<include base="calc">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="WINVER">0x0501</define>
 	<define name="UNICODE" />

reactos/base/applications/charmap/charmap.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>

reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

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">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

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">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/applications/control/control.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
 	<include base="control">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>

reactos/base/applications/games/solitaire/solitaire.rbuild

@@ -4,7 +4,6 @@
 	<include base="sol">.</include>
 	<include base="sol">cardlib</include>
 	<linkerflag>-lstdc++</linkerflag>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

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">
 	<include base="winemine">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</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>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/applications/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" allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>hostname.c</file>
 	<file>hostname.rc</file>

reactos/base/applications/logoff/logoff.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="logoff" type="win32cui" installbase="system32" installname="logoff.exe">
 	<include base="logoff">.</include>
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<library>advapi32</library>
 	<library>user32</library>

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>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/applications/msconfig/msconfig.rbuild

@@ -4,7 +4,6 @@
 	<include base="msconfig">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>

reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe" unicode="yes">
 <include base="devmgmt">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>

reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild

@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true">
-    <include base="eventvwr">.</include>
-    <define name="__REACTOS__" />
-    <define name="__USE_W32API" />
-    <define name="_WIN32_IE">0x600</define>
-    <define name="_WIN32_WINNT">0x501</define>
-    <library>kernel32</library>
-    <library>user32</library>
-    <library>comctl32</library>
-    <library>advapi32</library>
-    <file>eventvwr.c</file>
-    <file>eventvwr.rc</file>
-  </module>
+<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true">
+	<include base="eventvwr">.</include>
+	<define name="__REACTOS__" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>comctl32</library>
+	<library>advapi32</library>
+	<file>eventvwr.c</file>
+	<file>eventvwr.rc</file>
+</module>
 </rbuild>

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>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</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>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>

reactos/base/applications/network/dwnl/dwnl.rbuild

@@ -6,7 +6,6 @@
 	<library>urlmon</library>
 	<library>wininet</library>
 	<library>uuid</library>
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<define name="_WIN32_IE">0x0600</define>
 	<file>dwnl.c</file>

reactos/base/applications/network/finger/finger.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
 	<include base="finger">.</include>
-	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<library>kernel32</library>
 	<library>ws2_32</library>

reactos/base/applications/network/ftp/ftp.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" allowwarnings="true">
 	<include base="ftp">.</include>
-	<define name="__USE_W32API" />
 	<define name="lint" />
 	<library>kernel32</library>
 	<library>ws2_32</library>

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" allowwarnings="true">
 	<include base="ipconfig">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>iphlpapi</library>

reactos/base/applications/network/net/net.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="net" type="win32cui" installbase="system32" installname="net.exe">
 	<include base="ping">.</include>
-	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

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" allowwarnings="true">
 	<include base="netstat">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>

reactos/base/applications/network/ping/ping.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ping" type="win32cui" installbase="system32" installname="ping.exe">
 	<include base="ping">.</include>
-	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

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">
 	<include base="route">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>kernel32</library>

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" allowwarnings ="true">
 	<include base="telnet">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>user32</library>

reactos/base/applications/network/tracert/tracert.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe">
 	<include base="tracert">.</include>
-	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

reactos/base/applications/network/whois/whois.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="whois" type="win32cui" installbase="system32" installname="whois.exe">
-	<define name="__USE_W32API" />
 	<include base="whois">.</include>
 	<library>kernel32</library>
 	<library>ws2_32</library>

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>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<library>kernel32</library>
 	<library>user32</library>

reactos/base/applications/regedit/clb/clb.rbuild

@@ -5,7 +5,6 @@
 	<include base="clb">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>

reactos/base/applications/regedit/regedit.rbuild

@@ -3,7 +3,6 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="regedit" type="win32gui" installname="regedit.exe">
 	<include base="regedit">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0501</define>

reactos/base/applications/sc/sc.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sc" type="win32cui" installbase="system32" installname="sc.exe">
-	<define name="__USE_W32API" />
 	<define name="DEFINE_GUID" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

reactos/base/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">
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 

reactos/base/applications/screensavers/logon/logon.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr">
 	<include base="logon">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 

reactos/base/applications/screensavers/matrix/matrix.rbuild

@@ -3,7 +3,6 @@
 <module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true">
 	<include base="matrix">.</include>
 
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="UNICODE" />

reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr">
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 

reactos/base/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">
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 

reactos/base/applications/shutdown/shutdown.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe">
 	<include base="shutdown">.</include>
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<library>advapi32</library>
 	<library>user32</library>

reactos/base/applications/sndvol32/sndvol32.rbuild

@@ -3,7 +3,6 @@
 <module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe">
 	<include base="ReactOS">include/wine</include>
 	<include base="sndvol32">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0500</define>

reactos/base/applications/taskmgr/taskmgr.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe">
 	<include base="taskmgr">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="UNICODE" />

reactos/base/applications/winhelp/winhelp.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winhelp" type="win32gui" installbase="system32" installname="winhelp.exe" unicode="no">
 	<include base="winhelp">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>

reactos/base/applications/wordpad/wordpad.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" unicode="yes" allowwarnings="true">
 	<include base="wordpad">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

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" allowwarnings="true">
 	<include base="audiosrv">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="WINVER">0x0501</define>
 	<library>kernel32</library>

reactos/base/services/dhcp/dhcp.rbuild

@@ -3,7 +3,6 @@
 <module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe" allowwarnings="true">
 	<include base="dhcp">.</include>
 	<include base="dhcp">include</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>

reactos/base/services/eventlog/eventlog.rbuild

@@ -5,7 +5,6 @@
 	<include base="eventlog_server">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>

reactos/base/services/rpcss/rpcss.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe">
 	<include base="rpcss">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>rpcss.c</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">
 	<include base="arp">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>

reactos/base/services/umpnpmgr/umpnpmgr.rbuild

@@ -4,7 +4,6 @@
 	<include base="umpnpmgr">.</include>
 	<include base="pnp_server">.</include>
 	<include base="pnp_client">.</include>
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>

reactos/base/setup/reactos/reactos.rbuild

@@ -5,7 +5,6 @@
 	<include base="reactos">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</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">
 	<include base="setup">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0400</define>

reactos/base/setup/usetup/usetup.rbuild

@@ -6,7 +6,6 @@
 	<include base="zlib">.</include>
 	<include base="inflib">.</include>
 	<include base="ReactOS">include/reactos/drivers</include>
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0502</define>
 	<define name="__NO_CTYPE_INLINES" />

reactos/base/setup/vmwinst/vmwinst.rbuild

@@ -3,7 +3,6 @@
 <module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe">
 	<include base="vmwinst">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/setup/welcome/welcome.rbuild

@@ -5,7 +5,6 @@
 	<include base="welcome">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>kernel32</library>

reactos/base/shell/cmd/cmd.rbuild

@@ -4,7 +4,6 @@
 <module name="cmd_base" type="objectlibrary">
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd_base">.</include>
-	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="_DEBUG_MEM" />
@@ -72,7 +71,6 @@
 <module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes">
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd">.</include>
-	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>cmd_base</library>

reactos/base/shell/explorer/explorer.rbuild

@@ -4,7 +4,6 @@
 <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true">
 	<linkerflag>-fexceptions</linkerflag>
 	<include base="explorer">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="WIN32" />
 	<define name="_ROS_" />

reactos/base/shell/explorer/notifyhook/notifyhook.rbuild

@@ -3,7 +3,6 @@
 <module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}" installbase="system32" installname="notifyhook.dll">
 	<importlibrary definition="notifyhook.def" />
 	<include base="notifyhook">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_NOTIFYHOOK_IMPL" />
 	<library>kernel32</library>

reactos/base/system/autochk/autochk.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="autochk" type="nativecui" installbase="system32" installname="autochk.exe">
 	<include base="autochk">.</include>
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>nt</library>
 	<library>ntdll</library>

reactos/base/system/expand/expand.rbuild

@@ -3,7 +3,6 @@
 <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" >
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="expand">.</include>
-	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>lz32</library>

reactos/base/system/format/format.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="format" type="win32cui" installbase="system32" installname="format.exe" allowwarnings="true">
 	<include base="format">.</include>
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>

reactos/base/system/lsass/lsass.rbuild

@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<library>advapi32</library>
 	<library>ntdll</library>
 	<library>kernel32</library>

reactos/base/system/msiexec/msiexec.rbuild

@@ -3,7 +3,6 @@
 <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true">
 	<include base="msiexec">.</include>
 	<include base="ReactOS">include/wine</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x501</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>

reactos/base/system/regsvr32/regsvr32.rbuild

@@ -3,7 +3,6 @@
 <module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe">
 	<include base="regsvr32">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>shell32</library>

reactos/base/system/rundll32/rundll32.rbuild

@@ -3,7 +3,6 @@
 <module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe">
 	<include base="rundll32">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<file>rundll32.c</file>

reactos/base/system/services/services.rbuild

@@ -4,7 +4,6 @@
 	<include base="services">.</include>
 	<include base="scm_server">.</include>
 	<include base="ReactOS">include/reactos/subsys</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>scm_server</library>

reactos/base/system/smss/smss.rbuild

@@ -3,7 +3,6 @@
 <module name="smss" type="nativecui" installbase="system32" installname="smss.exe">
 	<include base="smss">.</include>
 	<include base="ReactOS">include/reactos/subsys</include>
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>nt</library>
 	<library>smlib</library>

reactos/base/system/userinit/userinit.rbuild

@@ -4,7 +4,6 @@
 	<include base="userinit">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>

reactos/base/system/winlogon/winlogon.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winlogon" type="win32gui" installbase="system32" installname="winlogon.exe">
 	<include base="winlogon">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>
 	<library>ntdll</library>

reactos/boot/freeldr/fdebug/fdebug.rbuild

@@ -4,7 +4,6 @@
 	<include base="freeldr_fdebug">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>

reactos/boot/freeldr/freeldr/freeldr_arch.rbuild

@@ -7,7 +7,6 @@
 				<include base="freeldr_base">include</include>
 				<include base="freeldr_base">cache</include>
 				<include base="ntoskrnl">include</include>
-				<define name="__USE_W32API" />
 				<define name="_NTHAL_" />
 				<compilerflag>-ffreestanding</compilerflag>
 				<compilerflag>-fno-builtin</compilerflag>
@@ -51,7 +50,6 @@
 				<include base="ntoskrnl">include</include>
 				<include base="ReactOS">include/reactos/libs</include>
 				<include base="ReactOS">include/reactos/elf</include>
-				<define name="__USE_W32API" />
 				<define name="_NTHAL_" />
 				<compilerflag>-ffreestanding</compilerflag>
 				<compilerflag>-fno-builtin</compilerflag>
@@ -78,7 +76,6 @@
 				<include base="freeldr_base">include</include>
 				<include base="freeldr_base">cache</include>
 				<include base="ntoskrnl">include</include>
-				<define name="__USE_W32API" />
 				<define name="DEBUG" />
 				<define name="_NTHAL_" />
 				<file>boot.s</file>

reactos/boot/freeldr/freeldr/freeldr_base.rbuild

@@ -5,7 +5,6 @@
 	<include base="freeldr_base">cache</include>
 	<include base="cmlib">.</include>
 	<include base="ntoskrnl">include</include>
-	<define name="__USE_W32API" />
 	<define name="_NTHAL_" />
 	<define name="_NTSYSTEM_" />
 	<compilerflag>-ffreestanding</compilerflag>

reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild

@@ -3,7 +3,6 @@
 <module name="freeldr_base64k" type="objectlibrary">
 	<include base="freeldr_base64k">include</include>
 	<include base="ntoskrnl">include</include>
-	<define name="__USE_W32API" />
 	<define name="_NTHAL_" />
 	<compilerflag>-ffreestanding</compilerflag>
 	<compilerflag>-fno-builtin</compilerflag>

reactos/boot/freeldr/freeldr/freeldr_main.rbuild

@@ -3,7 +3,6 @@
 <module name="freeldr_main" type="objectlibrary">
 	<include base="freeldr_main">include</include>
 	<include base="ntoskrnl">include</include>
-	<define name="__USE_W32API" />
 	<define name="_NTHAL_" />
 	<compilerflag>-ffreestanding</compilerflag>
 	<compilerflag>-fno-builtin</compilerflag>

reactos/boot/freeldr/freeldr/freeldr_startup.rbuild

@@ -3,7 +3,6 @@
 <module name="freeldr_startup" type="objectlibrary">
 	<include base="freeldr_startup">include</include>
 	<include base="ntoskrnl">include</include>
-	<define name="__USE_W32API" />
 	<compilerflag>-ffreestanding</compilerflag>
 	<compilerflag>-fno-builtin</compilerflag>
 	<compilerflag>-fno-inline</compilerflag>

reactos/boot/freeldr/freeldr/setupldr_main.rbuild

@@ -3,7 +3,6 @@
 <module name="setupldr_main" type="objectlibrary">
 	<include base="setupldr_main">include</include>
 	<include base="ntoskrnl">include</include>
-	<define name="__USE_W32API" />
 	<define name="_NTHAL_" />
 	<compilerflag>-ffreestanding</compilerflag>
 	<compilerflag>-fno-builtin</compilerflag>

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>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>install.c</file>
 	<file>volume.c</file>

reactos/drivers/base/beep/beep.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="beep" type="kernelmodedriver" installbase="system32/drivers" installname="beep.sys">
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>beep.c</file>

reactos/drivers/base/bootvid/bootvid.rbuild

@@ -4,7 +4,6 @@
 	<importlibrary definition="bootvid.def"></importlibrary>
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
 	<include base="bootvid">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>bootvid.c</file>

reactos/drivers/base/kdcom/kdcom.rbuild

@@ -1,11 +1,10 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll">
-	<importlibrary definition="kdcom.def"></importlibrary>
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
-	<include base="kdcom">.</include>
-	<define name="__USE_W32API" />
-	<library>ntoskrnl</library>
-	<library>hal</library>
-	<file>kdbg.c</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll">
+	<importlibrary definition="kdcom.def"></importlibrary>
+	<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
+	<include base="kdcom">.</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<file>kdbg.c</file>
+</module>

reactos/drivers/base/null/null.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="null" type="kernelmodedriver" installbase="system32/drivers" installname="null.sys">
 	<include base="null">.</include>
-	<define name="__USE_W32API" />
 	<library>pseh</library>
 	<library>ntoskrnl</library>
 	<library>hal</library>

reactos/drivers/bus/acpi/acpi.rbuild

@@ -3,7 +3,6 @@
 <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true">
 	<include base="acpi">include</include>
 	<include base="acpi">ospm/include</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<directory name="dispatcher">

reactos/drivers/bus/isapnp/isapnp.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys">
 	<include base="isapnp">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>isapnp.c</file>

reactos/drivers/bus/pci/pci.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys">
 	<include base="pci">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>fdo.c</file>

reactos/drivers/filesystems/cdfs/cdfs.rbuild

@@ -3,7 +3,6 @@
 <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="cdfs">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>cdfs.c</file>

reactos/drivers/filesystems/fs_rec/fs_rec.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="fs_rec" type="kernelmodedriver" installbase="system32/drivers" installname="fs_rec.sys">
 	<include base="fs_rec">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>blockdev.c</file>

reactos/drivers/filesystems/msfs/msfs.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msfs" type="kernelmodedriver" installbase="system32/drivers" installname="msfs.sys">
 	<include base="msfs">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>create.c</file>

reactos/drivers/filesystems/mup/mup.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mup" type="kernelmodedriver" installbase="system32/drivers" installname="mup.sys">
 	<include base="mup">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>create.c</file>

reactos/drivers/filesystems/npfs/npfs.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys">
 	<include base="npfs">.</include>
-	<define name="__USE_W32API" />
 	<define name="__NO_CTYPE_INLINES" />
 	<library>ntoskrnl</library>
 	<library>hal</library>

reactos/drivers/filesystems/npfs_new/npfs.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys">
 	<include base="npfs">.</include>
-	<define name="__USE_W32API" />
 	<define name="__NO_CTYPE_INLINES" />
 	<library>ntoskrnl</library>
 	<library>hal</library>

reactos/drivers/filesystems/ntfs/ntfs.rbuild

@@ -3,7 +3,6 @@
 <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="ntfs">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>attrib.c</file>

reactos/drivers/filesystems/vfat/vfatfs.rbuild

@@ -3,7 +3,6 @@
 <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="vfatfs">.</include>
-	<define name="__USE_W32API" />
 	<linkerflag>-lgcc</linkerflag>
 	<library>ntoskrnl</library>
 	<library>hal</library>

reactos/drivers/input/i8042prt/i8042prt.rbuild

@@ -3,7 +3,6 @@
 <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="i8042prt">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>i8042prt.c</file>

reactos/drivers/input/kbdclass/kbdclass.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
-	<define name="__USE_W32API" />
 	<define name="NDEBUG" />
 	<library>pseh</library>
 	<library>ntoskrnl</library>

reactos/drivers/input/mouclass/mouclass.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mouclass" type="kernelmodedriver" installbase="system32/drivers" installname="mouclass.sys">
 	<include base="mouclass">.</include>
-	<define name="__USE_W32API" />
 	<define name="NDEBUG" />
 	<library>pseh</library>
 	<library>ntoskrnl</library>

reactos/drivers/input/sermouse/sermouse.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sermouse" type="kernelmodedriver" installbase="system32/drivers" installname="sermouse.sys">
 	<include base="sermouse">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>createclose.c</file>

reactos/drivers/ksfilter/ks/ks.rbuild

@@ -6,7 +6,6 @@
 	<include base="ks">../include</include>
 	<importlibrary definition="ks.def" />
 	<library>ntoskrnl</library>
-	<define name="__USE_W32API" />
 	<define name="BUILDING_KS" />
 	<define name="_NTDDK_" />
 	<define name="_COMDDK_" />

reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild

@@ -8,7 +8,6 @@
 
 <module name="mpu401" type="kernelmodedriver">
 	<include base="mpu401_nt4">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>mpu401.c</file>

reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild

@@ -6,7 +6,6 @@
 	<importlibrary definition="sb16_nt4.def" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
-	<define name="__USE_W32API" />
 	<file>main.c</file>
 	<file>control.c</file>
 	<file>interrupt.c</file>

reactos/drivers/multimedia/audio/sndblst/sndblst.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="sndblst" type="kernelmodedriver" allowwarnings="true">
 	<include base="sndblst">.</include>
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>card.c</file>

reactos/drivers/multimedia/audio/sound/sound.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="sound" type="kernelmodedriver">
-	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<include base="sound">.\include</include>