Index: base/applications/cacls/cacls.rbuild
===================================================================
--- base/applications/cacls/cacls.rbuild	(revision 29544)
+++ base/applications/cacls/cacls.rbuild	(working copy)
@@ -3,9 +3,6 @@
 <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>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
Index: base/applications/calc/calc.rbuild
===================================================================
--- base/applications/calc/calc.rbuild	(revision 29544)
+++ base/applications/calc/calc.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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" />
 	<define name="_UNICODE" />
 	<library>kernel32</library>
Index: base/applications/charmap/charmap.rbuild
===================================================================
--- base/applications/charmap/charmap.rbuild	(revision 29544)
+++ base/applications/charmap/charmap.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>gdi32</library>
 	<library>kernel32</library>
Index: base/applications/cmdutils/dbgprint/dbgprint.rbuild
===================================================================
--- base/applications/cmdutils/dbgprint/dbgprint.rbuild	(revision 29544)
+++ base/applications/cmdutils/dbgprint/dbgprint.rbuild	(working copy)
@@ -2,8 +2,6 @@
 <!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>
 	<library>ntdll</library>
 	<file>dbgprint.c</file>
Index: base/applications/cmdutils/find/find.rbuild
===================================================================
--- base/applications/cmdutils/find/find.rbuild	(revision 29544)
+++ base/applications/cmdutils/find/find.rbuild	(working copy)
@@ -2,8 +2,6 @@
 <!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>
 	<library>user32</library>
 	<file>find.c</file>
Index: base/applications/cmdutils/more/more.rbuild
===================================================================
--- base/applications/cmdutils/more/more.rbuild	(revision 29544)
+++ base/applications/cmdutils/more/more.rbuild	(working copy)
@@ -2,8 +2,6 @@
 <!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>
 	<library>ntdll</library>
 	<library>user32</library>
Index: base/applications/control/control.rbuild
===================================================================
--- base/applications/control/control.rbuild	(revision 29544)
+++ base/applications/control/control.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>user32</library>
 	<library>comctl32</library>
Index: base/applications/games/solitaire/solitaire.rbuild
===================================================================
--- base/applications/games/solitaire/solitaire.rbuild	(revision 29544)
+++ base/applications/games/solitaire/solitaire.rbuild	(working copy)
@@ -5,8 +5,6 @@
 	<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>
 	<library>user32</library> 
 	<library>gdi32</library> 
Index: base/applications/games/winemine/winemine.rbuild
===================================================================
--- base/applications/games/winemine/winemine.rbuild	(revision 29544)
+++ base/applications/games/winemine/winemine.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>gdi32</library>
 	<library>user32</library>
Index: base/applications/hh/hh.rbuild
===================================================================
--- base/applications/hh/hh.rbuild	(revision 29544)
+++ base/applications/hh/hh.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>user32</library>
 	<library>gdi32</library>
Index: base/applications/mmc/mmc.rbuild
===================================================================
--- base/applications/mmc/mmc.rbuild	(revision 29544)
+++ base/applications/mmc/mmc.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>user32</library>
 	<library>gdi32</library>
Index: base/applications/msconfig/msconfig.rbuild
===================================================================
--- base/applications/msconfig/msconfig.rbuild	(revision 29544)
+++ base/applications/msconfig/msconfig.rbuild	(working copy)
@@ -5,8 +5,6 @@
 	<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>
 	<library>user32</library>
 	<library>advapi32</library>
Index: base/applications/mscutils/devmgmt/devmgmt.rbuild
===================================================================
--- base/applications/mscutils/devmgmt/devmgmt.rbuild	(revision 29544)
+++ base/applications/mscutils/devmgmt/devmgmt.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>setupapi</library>
 	<library>gdi32</library>
Index: base/applications/mscutils/servman/servman.rbuild
===================================================================
--- base/applications/mscutils/servman/servman.rbuild	(revision 29544)
+++ base/applications/mscutils/servman/servman.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>user32</library>
 	<library>gdi32</library>
Index: base/applications/network/dwnl/dwnl.rbuild
===================================================================
--- base/applications/network/dwnl/dwnl.rbuild	(revision 29544)
+++ base/applications/network/dwnl/dwnl.rbuild	(working copy)
@@ -5,7 +5,5 @@
 	<library>kernel32</library>
 	<library>urlmon</library>
 	<define name="__USE_W32API" />
-	<define name="WINVER">0x0501</define>
-	<define name="_WIN32_IE">0x0600</define>
 	<file>dwnl.c</file>
 </module>
Index: base/applications/network/net/net.rbuild
===================================================================
--- base/applications/network/net/net.rbuild	(revision 29544)
+++ base/applications/network/net/net.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<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>
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>main.c</file>
Index: base/applications/network/netstat/netstat.rbuild
===================================================================
--- base/applications/network/netstat/netstat.rbuild	(revision 29544)
+++ base/applications/network/netstat/netstat.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>user32</library>
 	<library>ws2_32</library>
Index: base/applications/network/ping/ping.rbuild
===================================================================
--- base/applications/network/ping/ping.rbuild	(revision 29544)
+++ base/applications/network/ping/ping.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<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>
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>ping.c</file>
Index: base/applications/network/tracert/tracert.rbuild
===================================================================
--- base/applications/network/tracert/tracert.rbuild	(revision 29544)
+++ base/applications/network/tracert/tracert.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<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>
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>tracert.c</file>
Index: base/applications/notepad/notepad.rbuild
===================================================================
--- base/applications/notepad/notepad.rbuild	(revision 29544)
+++ base/applications/notepad/notepad.rbuild	(working copy)
@@ -3,7 +3,6 @@
 <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>
 	<library>gdi32</library>
Index: base/applications/regedit/clb/clb.rbuild
===================================================================
--- base/applications/regedit/clb/clb.rbuild	(revision 29544)
+++ base/applications/regedit/clb/clb.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<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>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
Index: base/applications/regedit/regedit.rbuild
===================================================================
--- base/applications/regedit/regedit.rbuild	(revision 29544)
+++ base/applications/regedit/regedit.rbuild	(working copy)
@@ -6,8 +6,6 @@
 	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0600</define>
 	<library>uuid</library>
 	<library>kernel32</library>
 	<library>user32</library>
Index: base/applications/screensavers/matrix/matrix.rbuild
===================================================================
--- base/applications/screensavers/matrix/matrix.rbuild	(revision 29544)
+++ base/applications/screensavers/matrix/matrix.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<include base="matrix">.</include>
 
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 
Index: base/applications/sndvol32/sndvol32.rbuild
===================================================================
--- base/applications/sndvol32/sndvol32.rbuild	(revision 29544)
+++ base/applications/sndvol32/sndvol32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>user32</library>
 	<library>advapi32</library>
Index: base/applications/taskmgr/taskmgr.rbuild
===================================================================
--- base/applications/taskmgr/taskmgr.rbuild	(revision 29544)
+++ base/applications/taskmgr/taskmgr.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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" />
 	<define name="_UNICODE" />
 	<library>msvcrt</library>
Index: base/applications/winhelp/winhelp.rbuild
===================================================================
--- base/applications/winhelp/winhelp.rbuild	(revision 29544)
+++ base/applications/winhelp/winhelp.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>kernel32</library>
 	<library>user32</library>
Index: base/applications/wordpad/wordpad.rbuild
===================================================================
--- base/applications/wordpad/wordpad.rbuild	(revision 29544)
+++ base/applications/wordpad/wordpad.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>user32</library>
 	<library>gdi32</library>
Index: base/services/audiosrv/audiosrv.rbuild
===================================================================
--- base/services/audiosrv/audiosrv.rbuild	(revision 29544)
+++ base/services/audiosrv/audiosrv.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <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>
 	<library>advapi32</library>
 	<library>user32</library>
Index: base/services/dhcp/dhcp.rbuild
===================================================================
--- base/services/dhcp/dhcp.rbuild	(revision 29544)
+++ base/services/dhcp/dhcp.rbuild	(working copy)
@@ -4,7 +4,6 @@
 	<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>
 	<library>ws2_32</library>
Index: base/services/umpnpmgr/umpnpmgr.rbuild
===================================================================
--- base/services/umpnpmgr/umpnpmgr.rbuild	(revision 29544)
+++ base/services/umpnpmgr/umpnpmgr.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<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>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>pnp_server</library>
Index: base/setup/reactos/reactos.rbuild
===================================================================
--- base/setup/reactos/reactos.rbuild	(revision 29544)
+++ base/setup/reactos/reactos.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <module name="reactos" type="win32gui">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<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>
Index: base/setup/setup/setup.rbuild
===================================================================
--- base/setup/setup/setup.rbuild	(revision 29544)
+++ base/setup/setup/setup.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="_WIN32_IE">0x0400</define>
 	<library>kernel32</library>
 	<library>userenv</library>
 	<file>setup.c</file>
Index: base/setup/usetup/usetup.rbuild
===================================================================
--- base/setup/usetup/usetup.rbuild	(revision 29544)
+++ base/setup/usetup/usetup.rbuild	(working copy)
@@ -8,7 +8,6 @@
 	<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" />
 	<linkerflag>-lgcc</linkerflag>
 	<library>zlib</library>
Index: base/setup/vmwinst/vmwinst.rbuild
===================================================================
--- base/setup/vmwinst/vmwinst.rbuild	(revision 29544)
+++ base/setup/vmwinst/vmwinst.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<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>
 	<library>advapi32</library>
 	<library>comctl32</library>
Index: base/setup/welcome/welcome.rbuild
===================================================================
--- base/setup/welcome/welcome.rbuild	(revision 29544)
+++ base/setup/welcome/welcome.rbuild	(working copy)
@@ -3,8 +3,6 @@
 <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<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" />
Index: base/shell/cmd/cmd.rbuild
===================================================================
--- base/shell/cmd/cmd.rbuild	(revision 29544)
+++ base/shell/cmd/cmd.rbuild	(working copy)
@@ -6,7 +6,6 @@
 	<include base="cmd_base">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
-	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="_DEBUG_MEM" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
@@ -74,7 +73,6 @@
 	<include base="cmd">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>cmd_base</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
Index: base/shell/explorer-new/explorer.rbuild
===================================================================
--- base/shell/explorer-new/explorer.rbuild	(revision 29544)
+++ base/shell/explorer-new/explorer.rbuild	(working copy)
@@ -3,9 +3,6 @@
 <module name="explorer_new" type="win32gui" installname="explorer_new.exe" unicode="true">
 	<include base="explorer_new">.</include>
 	<define name="WIN32" />
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>gdi32</library>
Index: base/shell/explorer/explorer.rbuild
===================================================================
--- base/shell/explorer/explorer.rbuild	(revision 29544)
+++ base/shell/explorer/explorer.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="WIN32" />
 	<define name="_ROS_" />
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="WINVER">0x0500</define>
 	<define name="__WINDRES__" />
 	<library>kernel32</library>
 	<library>gdi32</library>
Index: base/shell/explorer/notifyhook/notifyhook.rbuild
===================================================================
--- base/shell/explorer/notifyhook/notifyhook.rbuild	(revision 29544)
+++ base/shell/explorer/notifyhook/notifyhook.rbuild	(working copy)
@@ -4,7 +4,6 @@
 	<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>
 	<library>user32</library>
Index: base/system/expand/expand.rbuild
===================================================================
--- base/system/expand/expand.rbuild	(revision 29544)
+++ base/system/expand/expand.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="expand">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>lz32</library>
 	<library>user32</library>
 	<library>kernel32</library>
Index: base/system/msiexec/msiexec.rbuild
===================================================================
--- base/system/msiexec/msiexec.rbuild	(revision 29544)
+++ base/system/msiexec/msiexec.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<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>
 	<library>uuid</library>
 	<library>wine</library>
 	<library>ntdll</library>
Index: base/system/winlogon/winlogon.rbuild
===================================================================
--- base/system/winlogon/winlogon.rbuild	(revision 29544)
+++ base/system/winlogon/winlogon.rbuild	(working copy)
@@ -3,7 +3,6 @@
 <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>
 	<library>kernel32</library>
Index: boot/freeldr/fdebug/fdebug.rbuild
===================================================================
--- boot/freeldr/fdebug/fdebug.rbuild	(revision 29544)
+++ boot/freeldr/fdebug/fdebug.rbuild	(working copy)
@@ -5,8 +5,6 @@
 	<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>
 	<library>user32</library>
 	<library>comdlg32</library>
Index: dll/cpl/access/access.rbuild
===================================================================
--- dll/cpl/access/access.rbuild	(revision 29544)
+++ dll/cpl/access/access.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<importlibrary definition="access.def" />
 	<include base="access">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
-	<define name="WINVER">0x609</define>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
Index: dll/cpl/appwiz/appwiz.rbuild
===================================================================
--- dll/cpl/appwiz/appwiz.rbuild	(revision 29544)
+++ dll/cpl/appwiz/appwiz.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
Index: dll/cpl/desk/desk.rbuild
===================================================================
--- dll/cpl/desk/desk.rbuild	(revision 29544)
+++ dll/cpl/desk/desk.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<importlibrary definition="desk.def" />
 	<include base="desk">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="_WIN32" />
 	<library>kernel32</library>
 	<library>user32</library>
Index: dll/cpl/hdwwiz/hdwwiz.rbuild
===================================================================
--- dll/cpl/hdwwiz/hdwwiz.rbuild	(revision 29544)
+++ dll/cpl/hdwwiz/hdwwiz.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="hdwwiz.def" />
 	<include base="hdwwiz">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>setupapi</library>
 	<library>kernel32</library>
 	<file>hdwwiz.c</file>
Index: dll/cpl/input/input.rbuild
===================================================================
--- dll/cpl/input/input.rbuild	(revision 29544)
+++ dll/cpl/input/input.rbuild	(working copy)
@@ -6,8 +6,6 @@
 	<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>
 	<library>advapi32</library>
 	<library>user32</library>
Index: dll/cpl/intl/intl.rbuild
===================================================================
--- dll/cpl/intl/intl.rbuild	(revision 29544)
+++ dll/cpl/intl/intl.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<importlibrary definition="intl.def" />
 	<include base="intl">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
-	<define name="WINVER">0x609</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
Index: dll/cpl/main/main.rbuild
===================================================================
--- dll/cpl/main/main.rbuild	(revision 29544)
+++ dll/cpl/main/main.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="main.def" />
 	<include base="main">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
Index: dll/cpl/main/mouse.c
===================================================================
--- dll/cpl/main/mouse.c	(revision 29544)
+++ dll/cpl/main/mouse.c	(working copy)
@@ -28,8 +28,6 @@
 //TODO:
 //  add missing icons
 
-#define WINVER 0x0501
-
 #include <windows.h>
 #include <winuser.h>
 #include <devguid.h>
Index: dll/cpl/mmsys/mmsys.rbuild
===================================================================
--- dll/cpl/mmsys/mmsys.rbuild	(revision 29544)
+++ dll/cpl/mmsys/mmsys.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="mmsys.def" />
 	<include base="mmsys">.</include>
 	<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>
Index: dll/cpl/ncpa/ncpa.rbuild
===================================================================
--- dll/cpl/ncpa/ncpa.rbuild	(revision 29544)
+++ dll/cpl/ncpa/ncpa.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="ncpa.def" />
 	<include base="ncpa">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
Index: dll/cpl/odbccp32/odbccp32.rbuild
===================================================================
--- dll/cpl/odbccp32/odbccp32.rbuild	(revision 29544)
+++ dll/cpl/odbccp32/odbccp32.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="odbccp32.def" />
 	<include base="odbccp32">.</include>
 	<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>
Index: dll/cpl/powercfg/powercfg.rbuild
===================================================================
--- dll/cpl/powercfg/powercfg.rbuild	(revision 29544)
+++ dll/cpl/powercfg/powercfg.rbuild	(working copy)
@@ -5,8 +5,6 @@
 	<include base="powercfg">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>powrprof</library>
Index: dll/cpl/sysdm/sysdm.rbuild
===================================================================
--- dll/cpl/sysdm/sysdm.rbuild	(revision 29544)
+++ dll/cpl/sysdm/sysdm.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<importlibrary definition="sysdm.def" />
 	<include base="sysdm">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>setupapi</library>
Index: dll/cpl/timedate/timedate.rbuild
===================================================================
--- dll/cpl/timedate/timedate.rbuild	(revision 29544)
+++ dll/cpl/timedate/timedate.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="timedate.def" />
 	<include base="timedate">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
Index: dll/cpl/usrmgr/usrmgr.rbuild
===================================================================
--- dll/cpl/usrmgr/usrmgr.rbuild	(revision 29544)
+++ dll/cpl/usrmgr/usrmgr.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<importlibrary definition="usrmgr.def" />
 	<include base="usrmgr">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
Index: dll/directx/ddraw/ddraw.rbuild
===================================================================
--- dll/directx/ddraw/ddraw.rbuild	(revision 29544)
+++ dll/directx/ddraw/ddraw.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<include base="ddraw">.</include>
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
Index: dll/directx/devenum/devenum.rbuild
===================================================================
--- dll/directx/devenum/devenum.rbuild	(revision 29544)
+++ dll/directx/devenum/devenum.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/dinput8/dinput8.rbuild
===================================================================
--- dll/directx/dinput8/dinput8.rbuild	(revision 29544)
+++ dll/directx/dinput8/dinput8.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/dinput/dinput.rbuild
===================================================================
--- dll/directx/dinput/dinput.rbuild	(revision 29544)
+++ dll/directx/dinput/dinput.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/dplay/dplay.rbuild
===================================================================
--- dll/directx/dplay/dplay.rbuild	(revision 29544)
+++ dll/directx/dplay/dplay.rbuild	(working copy)
@@ -7,9 +7,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/dplayx/dplayx.rbuild
===================================================================
--- dll/directx/dplayx/dplayx.rbuild	(revision 29544)
+++ dll/directx/dplayx/dplayx.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/dsound/dsound.rbuild
===================================================================
--- dll/directx/dsound/dsound.rbuild	(revision 29544)
+++ dll/directx/dsound/dsound.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<include base="dsound">.</include>
 	<include base="ReactOS">include/reactos/wine</include>	
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/dxdiagn/dxdiagn.rbuild
===================================================================
--- dll/directx/dxdiagn/dxdiagn.rbuild	(revision 29544)
+++ dll/directx/dxdiagn/dxdiagn.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/directx/wine/d3d8/d3d8.rbuild
===================================================================
--- dll/directx/wine/d3d8/d3d8.rbuild	(revision 29544)
+++ dll/directx/wine/d3d8/d3d8.rbuild	(working copy)
@@ -7,9 +7,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="__WINESRC__" />
 	<define name="USE_WIN32_OPENGL" />
 
Index: dll/directx/wine/wined3d/wined3d.rbuild
===================================================================
--- dll/directx/wine/wined3d/wined3d.rbuild	(revision 29544)
+++ dll/directx/wine/wined3d/wined3d.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<include base="wined3d">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="__WINESRC__" />
 	<define name="USE_WIN32_OPENGL" />
 
Index: dll/keyboard/kbdbe/kbdbe.rbuild
===================================================================
--- dll/keyboard/kbdbe/kbdbe.rbuild	(revision 29544)
+++ dll/keyboard/kbdbe/kbdbe.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbe.c</file>
 	<file>kbdbe.rc</file>
 </module>
Index: dll/keyboard/kbdbur/kbdbur.rbuild
===================================================================
--- dll/keyboard/kbdbur/kbdbur.rbuild	(revision 29544)
+++ dll/keyboard/kbdbur/kbdbur.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbur.c</file>
 	<file>kbdbur.rc</file>
 </module>
Index: dll/keyboard/kbdda/kbdda.rbuild
===================================================================
--- dll/keyboard/kbdda/kbdda.rbuild	(revision 29544)
+++ dll/keyboard/kbdda/kbdda.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdda.c</file>
 	<file>kbdda.rc</file>
 </module>
Index: dll/keyboard/kbddv/kbddv.rbuild
===================================================================
--- dll/keyboard/kbddv/kbddv.rbuild	(revision 29544)
+++ dll/keyboard/kbddv/kbddv.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbddv.c</file>
 	<file>kbddv.rc</file>
 </module>
Index: dll/keyboard/kbdes/kbdes.rbuild
===================================================================
--- dll/keyboard/kbdes/kbdes.rbuild	(revision 29544)
+++ dll/keyboard/kbdes/kbdes.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdes.c</file>
 	<file>kbdes.rc</file>
 </module>
Index: dll/keyboard/kbdfi/kbdfi.rbuild
===================================================================
--- dll/keyboard/kbdfi/kbdfi.rbuild	(revision 29544)
+++ dll/keyboard/kbdfi/kbdfi.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfi.c</file>
 	<file>kbdfi.rc</file>
 </module>
Index: dll/keyboard/kbdfr/kbdfr.rbuild
===================================================================
--- dll/keyboard/kbdfr/kbdfr.rbuild	(revision 29544)
+++ dll/keyboard/kbdfr/kbdfr.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfr.c</file>
 	<file>kbdfr.rc</file>
 </module>
Index: dll/keyboard/kbdgr/kbdgr.rbuild
===================================================================
--- dll/keyboard/kbdgr/kbdgr.rbuild	(revision 29544)
+++ dll/keyboard/kbdgr/kbdgr.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgr.c</file>
 	<file>kbdgr.rc</file>
 </module>
Index: dll/keyboard/kbdhe/kbdhe.rbuild
===================================================================
--- dll/keyboard/kbdhe/kbdhe.rbuild	(revision 29544)
+++ dll/keyboard/kbdhe/kbdhe.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdhe.c</file>
 	<file>kbdhe.rc</file>
 </module>
\ No newline at end of file
Index: dll/keyboard/kbdheb/kbdheb.rbuild
===================================================================
--- dll/keyboard/kbdheb/kbdheb.rbuild	(revision 29544)
+++ dll/keyboard/kbdheb/kbdheb.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdheb.c</file>
 	<file>kbdheb.rc</file>
 </module>
\ No newline at end of file
Index: dll/keyboard/kbdhu/kbdhu.rbuild
===================================================================
--- dll/keyboard/kbdhu/kbdhu.rbuild	(revision 29544)
+++ dll/keyboard/kbdhu/kbdhu.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdhu.c</file>
 	<file>kbdhu.rc</file>
 </module>
Index: dll/keyboard/kbdit/kbdit.rbuild
===================================================================
--- dll/keyboard/kbdit/kbdit.rbuild	(revision 29544)
+++ dll/keyboard/kbdit/kbdit.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdit.c</file>
 	<file>kbdit.rc</file>
 </module>
Index: dll/keyboard/kbdja/kbdja.rbuild
===================================================================
--- dll/keyboard/kbdja/kbdja.rbuild	(revision 29544)
+++ dll/keyboard/kbdja/kbdja.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdja.c</file>
 	<file>kbdja.rc</file>
 </module>
Index: dll/keyboard/kbdlt/kbdlt.rbuild
===================================================================
--- dll/keyboard/kbdlt/kbdlt.rbuild	(revision 29544)
+++ dll/keyboard/kbdlt/kbdlt.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdlt.c</file>
 	<file>kbdlt.rc</file>
 </module>
Index: dll/keyboard/kbdno/kbdno.rbuild
===================================================================
--- dll/keyboard/kbdno/kbdno.rbuild	(revision 29544)
+++ dll/keyboard/kbdno/kbdno.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdno.c</file>
 	<file>kbdno.rc</file>
 </module>
Index: dll/keyboard/kbdpl1/kbdpl1.rbuild
===================================================================
--- dll/keyboard/kbdpl1/kbdpl1.rbuild	(revision 29544)
+++ dll/keyboard/kbdpl1/kbdpl1.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdpl1.c</file>
 	<file>kbdpl1.rc</file>
 </module>
Index: dll/keyboard/kbdpo/kbdpo.rbuild
===================================================================
--- dll/keyboard/kbdpo/kbdpo.rbuild	(revision 29544)
+++ dll/keyboard/kbdpo/kbdpo.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdpo.c</file>
 	<file>kbdpo.rc</file>
 </module>
Index: dll/keyboard/kbdru/kbdru.rbuild
===================================================================
--- dll/keyboard/kbdru/kbdru.rbuild	(revision 29544)
+++ dll/keyboard/kbdru/kbdru.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdru.c</file>
 	<file>kbdru.rc</file>
 </module>
Index: dll/keyboard/kbdsg/kbdsg.rbuild
===================================================================
--- dll/keyboard/kbdsg/kbdsg.rbuild	(revision 29544)
+++ dll/keyboard/kbdsg/kbdsg.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsg.c</file>
 	<file>kbdsg.rc</file>
 </module>
Index: dll/keyboard/kbdsk/kbdsk.rbuild
===================================================================
--- dll/keyboard/kbdsk/kbdsk.rbuild	(revision 29544)
+++ dll/keyboard/kbdsk/kbdsk.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsk.c</file>
 	<file>kbdsk.rc</file>
 </module>
Index: dll/keyboard/kbdsw/kbdsw.rbuild
===================================================================
--- dll/keyboard/kbdsw/kbdsw.rbuild	(revision 29544)
+++ dll/keyboard/kbdsw/kbdsw.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsw.c</file>
 	<file>kbdsw.rc</file>
 </module>
Index: dll/keyboard/kbdth/kbdth.rbuild
===================================================================
--- dll/keyboard/kbdth/kbdth.rbuild	(revision 29544)
+++ dll/keyboard/kbdth/kbdth.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth.c</file>
 	<file>kbdth.rc</file>
 </module>
Index: dll/keyboard/kbduk/kbduk.rbuild
===================================================================
--- dll/keyboard/kbduk/kbduk.rbuild	(revision 29544)
+++ dll/keyboard/kbduk/kbduk.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbduk.c</file>
 	<file>kbduk.rc</file>
 </module>
Index: dll/keyboard/kbdur/kbdur.rbuild
===================================================================
--- dll/keyboard/kbdur/kbdur.rbuild	(revision 29544)
+++ dll/keyboard/kbdur/kbdur.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdur.c</file>
 	<file>kbdur.rc</file>
 </module>
Index: dll/keyboard/kbdus/kbdus.rbuild
===================================================================
--- dll/keyboard/kbdus/kbdus.rbuild	(revision 29544)
+++ dll/keyboard/kbdus/kbdus.rbuild	(working copy)
@@ -5,7 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdus.c</file>
 	<file>kbdus.rc</file>
 </module>
Index: dll/ntdll/ntdll.rbuild
===================================================================
--- dll/ntdll/ntdll.rbuild	(revision 29544)
+++ dll/ntdll/ntdll.rbuild	(working copy)
@@ -8,7 +8,6 @@
 	<define name="__NTDLL__" />
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0502</define>
 	<define name="_NTOSKRNL_" />
 	<define name="__NO_CTYPE_INLINES" />
 	<library>rtl</library>
Index: dll/win32/aclui/aclui.rbuild
===================================================================
--- dll/win32/aclui/aclui.rbuild	(revision 29544)
+++ dll/win32/aclui/aclui.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<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>
 	<define name="SUPPORT_UXTHEME" />
 	<library>ntdll</library>
 	<library>kernel32</library>
Index: dll/win32/advapi32/advapi32.rbuild
===================================================================
--- dll/win32/advapi32/advapi32.rbuild	(revision 29544)
+++ dll/win32/advapi32/advapi32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<include base="lsa_client">.</include>
 	<include base="eventlog_client">.</include>
 	<define name="__USE_W32API" />
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="UNICODE"></define>
 	<define name="_UNICODE"></define>
 	<library>scm_client</library>
Index: dll/win32/advpack/advpack.rbuild
===================================================================
--- dll/win32/advpack/advpack.rbuild	(revision 29544)
+++ dll/win32/advpack/advpack.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>setupapi</library>
Index: dll/win32/authz/authz.rbuild
===================================================================
--- dll/win32/authz/authz.rbuild	(revision 29544)
+++ dll/win32/authz/authz.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<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>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
Index: dll/win32/avifil32/avifil32.rbuild
===================================================================
--- dll/win32/avifil32/avifil32.rbuild	(revision 29544)
+++ dll/win32/avifil32/avifil32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>msacm32</library>
 	<library>msvfw32</library>
Index: dll/win32/browseui/browseui.rbuild
===================================================================
--- dll/win32/browseui/browseui.rbuild	(revision 29544)
+++ dll/win32/browseui/browseui.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
-	<define name="WINVER">0x600</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
Index: dll/win32/cabinet/cabinet.rbuild
===================================================================
--- dll/win32/cabinet/cabinet.rbuild	(revision 29544)
+++ dll/win32/cabinet/cabinet.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/clusapi/clusapi.rbuild
===================================================================
--- dll/win32/clusapi/clusapi.rbuild	(revision 29544)
+++ dll/win32/clusapi/clusapi.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/comcat/comcat.rbuild
===================================================================
--- dll/win32/comcat/comcat.rbuild	(revision 29544)
+++ dll/win32/comcat/comcat.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
Index: dll/win32/comctl32/comctl32.rbuild
===================================================================
--- dll/win32/comctl32/comctl32.rbuild	(revision 29544)
+++ dll/win32/comctl32/comctl32.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>
Index: dll/win32/comdlg32/comdlg32.rbuild
===================================================================
--- dll/win32/comdlg32/comdlg32.rbuild	(revision 29544)
+++ dll/win32/comdlg32/comdlg32.rbuild	(working copy)
@@ -7,9 +7,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>shell32</library>
 	<library>shlwapi</library>
Index: dll/win32/console/console.rbuild
===================================================================
--- dll/win32/console/console.rbuild	(revision 29544)
+++ dll/win32/console/console.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<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>
 	<library>user32</library>
 	<library>comctl32</library>
Index: dll/win32/crtdll/crtdll.rbuild
===================================================================
--- dll/win32/crtdll/crtdll.rbuild	(revision 29544)
+++ dll/win32/crtdll/crtdll.rbuild	(working copy)
@@ -6,8 +6,6 @@
 	<include base="crt">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="__NO_CTYPE_INLINES" />
Index: dll/win32/crypt32/crypt32.rbuild
===================================================================
--- dll/win32/crypt32/crypt32.rbuild	(revision 29544)
+++ dll/win32/crypt32/crypt32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>advapi32</library>
Index: dll/win32/cryptdll/cryptdll.rbuild
===================================================================
--- dll/win32/cryptdll/cryptdll.rbuild	(revision 29544)
+++ dll/win32/cryptdll/cryptdll.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>kernel32</library>
Index: dll/win32/cryptnet/cryptnet.rbuild
===================================================================
--- dll/win32/cryptnet/cryptnet.rbuild	(revision 29544)
+++ dll/win32/cryptnet/cryptnet.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/cryptui/cryptui.rbuild
===================================================================
--- dll/win32/cryptui/cryptui.rbuild	(revision 29544)
+++ dll/win32/cryptui/cryptui.rbuild	(working copy)
@@ -2,9 +2,6 @@
 	<importlibrary definition="cryptui.def" />
 	<include base="cryptui">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/dbghelp/dbghelp.rbuild
===================================================================
--- dll/win32/dbghelp/dbghelp.rbuild	(revision 29544)
+++ dll/win32/dbghelp/dbghelp.rbuild	(working copy)
@@ -3,9 +3,6 @@
 	<include base="dbghelp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>pseh</library>
 	<library>ntdll</library>
Index: dll/win32/devmgr/devmgr.rbuild
===================================================================
--- dll/win32/devmgr/devmgr.rbuild	(revision 29544)
+++ dll/win32/devmgr/devmgr.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="_SETUPAPI_VER">0x501</define>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/dhcpcsvc/dhcpcsvc.rbuild
===================================================================
--- dll/win32/dhcpcsvc/dhcpcsvc.rbuild	(revision 29544)
+++ dll/win32/dhcpcsvc/dhcpcsvc.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="dhcpcsvc">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT=0x0500" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>msvcrt</library>
Index: dll/win32/fmifs/fmifs.rbuild
===================================================================
--- dll/win32/fmifs/fmifs.rbuild	(revision 29544)
+++ dll/win32/fmifs/fmifs.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="fmifs">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<file>chkdsk.c</file>
Index: dll/win32/gdi32/gdi32.rbuild
===================================================================
--- dll/win32/gdi32/gdi32.rbuild	(revision 29544)
+++ dll/win32/gdi32/gdi32.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
Index: dll/win32/gdiplus/gdiplus.rbuild
===================================================================
--- dll/win32/gdiplus/gdiplus.rbuild	(revision 29544)
+++ dll/win32/gdiplus/gdiplus.rbuild	(working copy)
@@ -7,9 +7,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>gdi32</library>
Index: dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
===================================================================
--- dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild	(revision 29544)
+++ dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild	(working copy)
@@ -7,9 +7,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<dependency>wineheaders</dependency>
 	<library>wine</library>
 	<library>advapi32</library>
Index: dll/win32/hid/hid.rbuild
===================================================================
--- dll/win32/hid/hid.rbuild	(revision 29544)
+++ dll/win32/hid/hid.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<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>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<file>hid.c</file>
Index: dll/win32/icmp/icmp.rbuild
===================================================================
--- dll/win32/icmp/icmp.rbuild	(revision 29544)
+++ dll/win32/icmp/icmp.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="icmp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ws2_32</library>
Index: dll/win32/imagehlp/imagehlp.rbuild
===================================================================
--- dll/win32/imagehlp/imagehlp.rbuild	(revision 29544)
+++ dll/win32/imagehlp/imagehlp.rbuild	(working copy)
@@ -2,8 +2,6 @@
 	<importlibrary definition="imagehlp.def" />
 	<include base="imagehlp">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x600</define>
-	<define name="WINVER">0x0600</define>
 	<define name="_IMAGEHLP_SOURCE_"></define>
 	<library>wine</library>
 	<library>ntdll</library>
Index: dll/win32/imm32/imm32.rbuild
===================================================================
--- dll/win32/imm32/imm32.rbuild	(revision 29544)
+++ dll/win32/imm32/imm32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>
Index: dll/win32/kernel32/kernel32.rbuild
===================================================================
--- dll/win32/kernel32/kernel32.rbuild	(revision 29544)
+++ dll/win32/kernel32/kernel32.rbuild	(working copy)
@@ -7,9 +7,7 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="__NO_CTYPE_INLINES" />
-	<define name="WINVER">0x609</define>
 	<pch>k32.h</pch>
 	<directory name="debug">
 		<file>debugger.c</file>
Index: dll/win32/lsasrv/lsasrv.rbuild
===================================================================
--- dll/win32/lsasrv/lsasrv.rbuild	(revision 29544)
+++ dll/win32/lsasrv/lsasrv.rbuild	(working copy)
@@ -5,8 +5,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_WINNT">0x0600</define>
 	<linkerflag>-nostartfiles</linkerflag>
 	<linkerflag>-nostdlib</linkerflag>
 	<library>lsa_server</library>
Index: dll/win32/lz32/lz32.rbuild
===================================================================
--- dll/win32/lz32/lz32.rbuild	(revision 29544)
+++ dll/win32/lz32/lz32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/mapi32/mapi32.rbuild
===================================================================
--- dll/win32/mapi32/mapi32.rbuild	(revision 29544)
+++ dll/win32/mapi32/mapi32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>shlwapi</library>
 	<library>shell32</library>
Index: dll/win32/mlang/mlang.rbuild
===================================================================
--- dll/win32/mlang/mlang.rbuild	(revision 29544)
+++ dll/win32/mlang/mlang.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
Index: dll/win32/mpr/mpr.rbuild
===================================================================
--- dll/win32/mpr/mpr.rbuild	(revision 29544)
+++ dll/win32/mpr/mpr.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>advapi32</library>
Index: dll/win32/msacm32/msacm32.rbuild
===================================================================
--- dll/win32/msacm32/msacm32.rbuild	(revision 29544)
+++ dll/win32/msacm32/msacm32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
Index: dll/win32/msi/msi.rbuild
===================================================================
--- dll/win32/msi/msi.rbuild	(revision 29544)
+++ dll/win32/msi/msi.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>urlmon</library>
 	<library>wininet</library>
Index: dll/win32/msimg32/msimg32.rbuild
===================================================================
--- dll/win32/msimg32/msimg32.rbuild	(revision 29544)
+++ dll/win32/msimg32/msimg32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>gdi32</library>
 	<library>kernel32</library>
Index: dll/win32/msvcrt20/msvcrt20.rbuild
===================================================================
--- dll/win32/msvcrt20/msvcrt20.rbuild	(revision 29544)
+++ dll/win32/msvcrt20/msvcrt20.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
 	<define name="__REACTOS__" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MT" />
 	<library>wine</library>
Index: dll/win32/msvcrt/msvcrt.rbuild
===================================================================
--- dll/win32/msvcrt/msvcrt.rbuild	(revision 29544)
+++ dll/win32/msvcrt/msvcrt.rbuild	(working copy)
@@ -8,8 +8,6 @@
 	<include base="crt">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MT" />
Index: dll/win32/msvfw32/msvfw32.rbuild
===================================================================
--- dll/win32/msvfw32/msvfw32.rbuild	(revision 29544)
+++ dll/win32/msvfw32/msvfw32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>winmm</library>
 	<library>comctl32</library>
Index: dll/win32/netapi32/netapi32.rbuild
===================================================================
--- dll/win32/netapi32/netapi32.rbuild	(revision 29544)
+++ dll/win32/netapi32/netapi32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>
Index: dll/win32/netid/netid.rbuild
===================================================================
--- dll/win32/netid/netid.rbuild	(revision 29544)
+++ dll/win32/netid/netid.rbuild	(working copy)
@@ -2,9 +2,6 @@
 	<importlibrary definition="netid.spec.def" />
 	<include base="netid">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
Index: dll/win32/newdev/newdev.rbuild
===================================================================
--- dll/win32/newdev/newdev.rbuild	(revision 29544)
+++ dll/win32/newdev/newdev.rbuild	(working copy)
@@ -1,8 +1,6 @@
 <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll" unicode="true">
 	<include base="newdev">.</include>
 	<importlibrary definition="newdev.spec.def" />
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<file>newdev.c</file>
 	<file>stubs.c</file>
 	<file>wizard.c</file>
Index: dll/win32/ntmarta/ntmarta.rbuild
===================================================================
--- dll/win32/ntmarta/ntmarta.rbuild	(revision 29544)
+++ dll/win32/ntmarta/ntmarta.rbuild	(working copy)
@@ -4,9 +4,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x600</define>
-	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
Index: dll/win32/objsel/objsel.rbuild
===================================================================
--- dll/win32/objsel/objsel.rbuild	(revision 29544)
+++ dll/win32/objsel/objsel.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
Index: dll/win32/odbccp32/odbccp32.rbuild
===================================================================
--- dll/win32/odbccp32/odbccp32.rbuild	(revision 29544)
+++ dll/win32/odbccp32/odbccp32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>advapi32</library>
Index: dll/win32/ole32/ole32.rbuild
===================================================================
--- dll/win32/ole32/ole32.rbuild	(revision 29544)
+++ dll/win32/ole32/ole32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>user32</library>
Index: dll/win32/oleacc/oleacc.rbuild
===================================================================
--- dll/win32/oleacc/oleacc.rbuild	(revision 29544)
+++ dll/win32/oleacc/oleacc.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/oleaut32/oleaut32.rbuild
===================================================================
--- dll/win32/oleaut32/oleaut32.rbuild	(revision 29544)
+++ dll/win32/oleaut32/oleaut32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>rpcrt4</library>
Index: dll/win32/oledlg/oledlg.rbuild
===================================================================
--- dll/win32/oledlg/oledlg.rbuild	(revision 29544)
+++ dll/win32/oledlg/oledlg.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>comdlg32</library>
Index: dll/win32/olepro32/olepro32.rbuild
===================================================================
--- dll/win32/olepro32/olepro32.rbuild	(revision 29544)
+++ dll/win32/olepro32/olepro32.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>oleaut32</library>
 	<library>kernel32</library>
Index: dll/win32/powrprof/powrprof.rbuild
===================================================================
--- dll/win32/powrprof/powrprof.rbuild	(revision 29544)
+++ dll/win32/powrprof/powrprof.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>kernel32</library>
Index: dll/win32/riched20/riched20.rbuild
===================================================================
--- dll/win32/riched20/riched20.rbuild	(revision 29544)
+++ dll/win32/riched20/riched20.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>imm32</library>
Index: dll/win32/riched32/riched32.rbuild
===================================================================
--- dll/win32/riched32/riched32.rbuild	(revision 29544)
+++ dll/win32/riched32/riched32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>riched20</library>
 	<library>user32</library>
Index: dll/win32/rpcrt4/rpcrt4.rbuild
===================================================================
--- dll/win32/rpcrt4/rpcrt4.rbuild	(revision 29544)
+++ dll/win32/rpcrt4/rpcrt4.rbuild	(working copy)
@@ -5,8 +5,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
 	<define name="_STDDEF_H" />
 	<define name="_RPCRT4_" />
Index: dll/win32/rpcrt4_new/rpcrt4.rbuild
===================================================================
--- dll/win32/rpcrt4_new/rpcrt4.rbuild	(revision 29544)
+++ dll/win32/rpcrt4_new/rpcrt4.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="_STDDEF_H" />
 	<define name="_RPCRT4_" />
 	<define name="COM_NO_WINDOWS_H" />
Index: dll/win32/secur32/secur32.rbuild
===================================================================
--- dll/win32/secur32/secur32.rbuild	(revision 29544)
+++ dll/win32/secur32/secur32.rbuild	(working copy)
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<define name="__SECUR32__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
Index: dll/win32/security/security.rbuild
===================================================================
--- dll/win32/security/security.rbuild	(revision 29544)
+++ dll/win32/security/security.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="security">.</include>
 	<define name="__SECURITY__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
Index: dll/win32/sensapi/sensapi.rbuild
===================================================================
--- dll/win32/sensapi/sensapi.rbuild	(revision 29544)
+++ dll/win32/sensapi/sensapi.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: dll/win32/setupapi/setupapi.rbuild
===================================================================
--- dll/win32/setupapi/setupapi.rbuild	(revision 29544)
+++ dll/win32/setupapi/setupapi.rbuild	(working copy)
@@ -8,9 +8,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="__WINESRC__" />
 	<define name="_SETUPAPI_" />
 	<define name="_SETUPAPI_VER">0x501</define>
Index: dll/win32/shdocvw/shdocvw.rbuild
===================================================================
--- dll/win32/shdocvw/shdocvw.rbuild	(revision 29544)
+++ dll/win32/shdocvw/shdocvw.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<define name="_SHDOCVW_" />
 	<library>wine</library>
 	<library>uuid</library>
Index: dll/win32/shell32/shell32.rbuild
===================================================================
--- dll/win32/shell32/shell32.rbuild	(revision 29544)
+++ dll/win32/shell32/shell32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<include base="recyclebin">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
-	<define name="WINVER">0x600</define>
 	<define name="_SHELL32_" />
 	<define name="COM_NO_WINDOWS_H" />
 	<library>wine</library>
Index: dll/win32/shellext/deskadp/deskadp.rbuild
===================================================================
--- dll/win32/shellext/deskadp/deskadp.rbuild	(revision 29544)
+++ dll/win32/shellext/deskadp/deskadp.rbuild	(working copy)
@@ -2,9 +2,6 @@
 	<importlibrary definition="deskadp.spec.def" />
 	<include base="deskadp">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
Index: dll/win32/shellext/deskmon/deskmon.rbuild
===================================================================
--- dll/win32/shellext/deskmon/deskmon.rbuild	(revision 29544)
+++ dll/win32/shellext/deskmon/deskmon.rbuild	(working copy)
@@ -2,9 +2,6 @@
 	<importlibrary definition="deskmon.spec.def" />
 	<include base="deskmon">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
Index: dll/win32/shellext/devcpux/devcpux.rbuild
===================================================================
--- dll/win32/shellext/devcpux/devcpux.rbuild	(revision 29544)
+++ dll/win32/shellext/devcpux/devcpux.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
Index: dll/win32/shellext/slayer/slayer.rbuild
===================================================================
--- dll/win32/shellext/slayer/slayer.rbuild	(revision 29544)
+++ dll/win32/shellext/slayer/slayer.rbuild	(working copy)
@@ -4,8 +4,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x601</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
Index: dll/win32/shfolder/shfolder.rbuild
===================================================================
--- dll/win32/shfolder/shfolder.rbuild	(revision 29544)
+++ dll/win32/shfolder/shfolder.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>shell32</library>
 	<library>kernel32</library>
Index: dll/win32/shlwapi/shlwapi.rbuild
===================================================================
--- dll/win32/shlwapi/shlwapi.rbuild	(revision 29544)
+++ dll/win32/shlwapi/shlwapi.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>
Index: dll/win32/stdole2.tlb/stdole2.rbuild
===================================================================
--- dll/win32/stdole2.tlb/stdole2.rbuild	(revision 29544)
+++ dll/win32/stdole2.tlb/stdole2.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<file>std_ole_v2.idl</file>
 </module>
 <module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb">
@@ -18,9 +15,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>kernel32</library>
 	<file>stdole2.tlb.spec</file>
 	<file>rsrc.rc</file>
Index: dll/win32/syssetup/syssetup.rbuild
===================================================================
--- dll/win32/syssetup/syssetup.rbuild	(revision 29544)
+++ dll/win32/syssetup/syssetup.rbuild	(working copy)
@@ -2,9 +2,6 @@
 	<importlibrary definition="syssetup.def" />
 	<include base="syssetup">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="_SETUPAPI_VER">0x0501</define>
 	<library>pseh</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/win32/ufat/ufat.rbuild
===================================================================
--- dll/win32/ufat/ufat.rbuild	(revision 29544)
+++ dll/win32/ufat/ufat.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="ufat">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0600</define>
 	<library>vfatlib</library>
 	<library>ntdll</library>
 	<file>ufat.c</file>
Index: dll/win32/ufatx/ufatx.rbuild
===================================================================
--- dll/win32/ufatx/ufatx.rbuild	(revision 29544)
+++ dll/win32/ufatx/ufatx.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="ufatx">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0600</define>
 	<library>vfatxlib</library>
 	<library>ntdll</library>
 	<file>ufatx.rc</file>
Index: dll/win32/urlmon/urlmon.rbuild
===================================================================
--- dll/win32/urlmon/urlmon.rbuild	(revision 29544)
+++ dll/win32/urlmon/urlmon.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>shlwapi</library>
Index: dll/win32/user32/user32.rbuild
===================================================================
--- dll/win32/user32/user32.rbuild	(revision 29544)
+++ dll/win32/user32/user32.rbuild	(working copy)
@@ -6,8 +6,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>gdi32</library>
Index: dll/win32/userenv/userenv.rbuild
===================================================================
--- dll/win32/userenv/userenv.rbuild	(revision 29544)
+++ dll/win32/userenv/userenv.rbuild	(working copy)
@@ -2,9 +2,6 @@
 	<importlibrary definition="userenv.def" />
 	<include base="userenv">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
Index: dll/win32/usp10/usp10.rbuild
===================================================================
--- dll/win32/usp10/usp10.rbuild	(revision 29544)
+++ dll/win32/usp10/usp10.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/win32/uxtheme/uxtheme.rbuild
===================================================================
--- dll/win32/uxtheme/uxtheme.rbuild	(revision 29544)
+++ dll/win32/uxtheme/uxtheme.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>
Index: dll/win32/version/version.rbuild
===================================================================
--- dll/win32/version/version.rbuild	(revision 29544)
+++ dll/win32/version/version.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>lz32</library>
 	<library>kernel32</library>
Index: dll/win32/wininet/wininet.rbuild
===================================================================
--- dll/win32/wininet/wininet.rbuild	(revision 29544)
+++ dll/win32/wininet/wininet.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
Index: dll/win32/winmm/midimap/midimap.rbuild
===================================================================
--- dll/win32/winmm/midimap/midimap.rbuild	(revision 29544)
+++ dll/win32/winmm/midimap/midimap.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
Index: dll/win32/winmm/wavemap/wavemap.rbuild
===================================================================
--- dll/win32/winmm/wavemap/wavemap.rbuild	(revision 29544)
+++ dll/win32/winmm/wavemap/wavemap.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
     <library>msacm32</library>
 	<library>uuid</library>
Index: dll/win32/winmm/winmm.rbuild
===================================================================
--- dll/win32/winmm/winmm.rbuild	(revision 29544)
+++ dll/win32/winmm/winmm.rbuild	(working copy)
@@ -13,9 +13,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
Index: dll/win32/winsta/winsta.rbuild
===================================================================
--- dll/win32/winsta/winsta.rbuild	(revision 29544)
+++ dll/win32/winsta/winsta.rbuild	(working copy)
@@ -3,7 +3,6 @@
 	<include base="winsta">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<library>ntdll</library>
 	<pch>winsta.h</pch>
 	<file>main.c</file>
Index: dll/win32/wintrust/wintrust.rbuild
===================================================================
--- dll/win32/wintrust/wintrust.rbuild	(revision 29544)
+++ dll/win32/wintrust/wintrust.rbuild	(working copy)
@@ -6,9 +6,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>crypt32</library>
 	<library>user32</library>
Index: dll/win32/wldap32/wldap32.rbuild
===================================================================
--- dll/win32/wldap32/wldap32.rbuild	(revision 29544)
+++ dll/win32/wldap32/wldap32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>kernel32</library>
Index: dll/win32/ws2_32/ws2_32.rbuild
===================================================================
--- dll/win32/ws2_32/ws2_32.rbuild	(revision 29544)
+++ dll/win32/ws2_32/ws2_32.rbuild	(working copy)
@@ -6,7 +6,6 @@
 	<define name="UNICODE" />
 	<define name="LE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
Index: dll/win32/wtsapi32/wtsapi32.rbuild
===================================================================
--- dll/win32/wtsapi32/wtsapi32.rbuild	(revision 29544)
+++ dll/win32/wtsapi32/wtsapi32.rbuild	(working copy)
@@ -5,9 +5,6 @@
 	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
Index: lib/sdk/crt/crt.rbuild
===================================================================
--- lib/sdk/crt/crt.rbuild	(revision 29544)
+++ lib/sdk/crt/crt.rbuild	(working copy)
@@ -6,8 +6,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__MINGW_IMPORT">extern</define>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MSVCRT_" />
Index: ReactOS-generic.rbuild
===================================================================
--- ReactOS-generic.rbuild	(revision 29544)
+++ ReactOS-generic.rbuild	(working copy)
@@ -17,6 +17,37 @@
 		<property name="DBG_OR_KDBG" value="true" />
 	</if>
 
+	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
+	<property name="VERSION_TARGET" value="NT51" />
+
+	<if property="VERSION_TARGET" value="NT4">
+		<define name="WINVER">0x400</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x400</define>
+		<define name="_WIN32_WINDOWS">0x400</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT5">
+		<define name="WINVER">0x500</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x500</define>
+		<define name="_WIN32_WINDOWS">0x500</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT51">
+		<define name="WINVER">0x501</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x501</define>
+		<define name="_WIN32_WINDOWS">0x501</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT6">
+		<define name="WINVER">0x600</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x600</define>
+		<define name="_WIN32_WINDOWS">0x600</define>
+	</if>
+
 	<include>.</include>
 	<include>include</include>
 	<include root="intermediate">include</include>
Index: subsystems/csr/csr.rbuild
===================================================================
--- subsystems/csr/csr.rbuild	(revision 29544)
+++ subsystems/csr/csr.rbuild	(working copy)
@@ -4,8 +4,6 @@
 <module name="csr" type="nativecui" installbase="system32" installname="csr.exe">
 	<include base="csr">.</include>
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0501</define>
 	<library>nt</library>
 	<library>ntdll</library>
 	<library>csrsrv</library>
Index: subsystems/win32/csrss/csrss.rbuild
===================================================================
--- subsystems/win32/csrss/csrss.rbuild	(revision 29544)
+++ subsystems/win32/csrss/csrss.rbuild	(working copy)
@@ -7,8 +7,6 @@
 		<include base="ReactOS">include/reactos/subsys</include>
 		<include base="ReactOS">include/reactos/drivers</include>
 		<define name="__USE_W32API" />
-		<define name="_WIN32_WINNT">0x0600</define>
-		<define name="WINVER">0x0501</define>
 		<library>nt</library>
 		<library>ntdll</library>
 		<library>smdll</library>
Index: subsystems/win32/csrss/win32csr/win32csr.rbuild
===================================================================
--- subsystems/win32/csrss/win32csr/win32csr.rbuild	(revision 29544)
+++ subsystems/win32/csrss/win32csr/win32csr.rbuild	(working copy)
@@ -9,7 +9,6 @@
 	<include base="console">.</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
Index: subsystems/win32/win32k/win32k.rbuild
===================================================================
--- subsystems/win32/win32k/win32k.rbuild	(revision 29544)
+++ subsystems/win32/win32k/win32k.rbuild	(working copy)
@@ -11,8 +11,6 @@
 	<include base="ReactOS">include/reactos/drivers</include>
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="WINVER">0x600</define>
 	<define name="LANGPACK" />
 	<define name="_WIN32K_" />
 	<pch>w32k.h</pch>