- Globalize ReactOS target version (there are a few overrides for our abuse of RegDeleteTree API).

*** .rbuild files MUST NOT contain version definitions now, please pay attention to this when doing Wine-syncs, adding new modules, or applying old patches! *** Same applies to source code files, header files, and other includables. Thanks to Marc Piulachs for doing the base work, which I continued, and which resulted in this commit. See issue #2745 for more details. svn path=/trunk/; revision=36939
2024-06-28 08:51:29 +00:00 · 2008-10-25 12:15:44 +00:00 · 2008-10-25 12:15:44 +00:00 · 64bd93d803
parent f39710c68c
commit 64bd93d803
304 changed files with 65 additions and 574 deletions
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@ -14,6 +14,49 @@
 		<property name="DBG_OR_KDBG" value="true" />
 	</if>

+	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
+	<property name="VERSION_TARGET" value="NT52" />
+
+	<if property="VERSION_TARGET" value="NT4">
+		<define name="WINVER" overridable="true">0x400</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT" overridable="true">0x400</define>
+		<define name="_WIN32_WINDOWS">0x400</define>
+		<define name="_SETUPAPI_VER">0x400</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT5">
+		<define name="WINVER" overridable="true">0x500</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT" overridable="true">0x500</define>
+		<define name="_WIN32_WINDOWS">0x500</define>
+		<define name="_SETUPAPI_VER">0x500</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT51">
+		<define name="WINVER" overridable="true">0x501</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT" overridable="true">0x501</define>
+		<define name="_WIN32_WINDOWS">0x501</define>
+		<define name="_SETUPAPI_VER">0x501</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT52">
+		<define name="WINVER" overridable="true">0x502</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT" overridable="true">0x502</define>
+		<define name="_WIN32_WINDOWS">0x502</define>
+		<define name="_SETUPAPI_VER">0x502</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT6">
+		<define name="WINVER" overridable="true">0x600</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT" overridable="true">0x600</define>
+		<define name="_WIN32_WINDOWS">0x600</define>
+		<define name="_SETUPAPI_VER">0x600</define>
+	</if>
+
 	<include>.</include>
 	<include>include</include>
 	<include root="intermediate">include</include>
--- a/reactos/base/applications/cacls/cacls.rbuild
+++ b/reactos/base/applications/cacls/cacls.rbuild
@ -2,9 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
 	<include base="cacls">.</include>
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
--- a/reactos/base/applications/calc/calc.rbuild
+++ b/reactos/base/applications/calc/calc.rbuild
@ -3,7 +3,6 @@
 <module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true" unicode="yes">
 	<include base="calc">.</include>
 	<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>kernel32</library>
--- a/reactos/base/applications/charmap/charmap.rbuild
+++ b/reactos/base/applications/charmap/charmap.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>gdi32</library>
 	<library>kernel32</library>
 	<library>user32</library>
--- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild
+++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild
@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<file>dbgprint.c</file>
 </module>
--- a/reactos/base/applications/cmdutils/doskey/doskey.rbuild
+++ b/reactos/base/applications/cmdutils/doskey/doskey.rbuild
@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<file>doskey.c</file>
 	<file>doskey.rc</file>
--- a/reactos/base/applications/cmdutils/find/find.rbuild
+++ b/reactos/base/applications/cmdutils/find/find.rbuild
@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="find" type="win32cui" installbase="system32" installname="find.exe">
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<file>find.c</file>
--- a/reactos/base/applications/cmdutils/more/more.rbuild
+++ b/reactos/base/applications/cmdutils/more/more.rbuild
@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="more" type="win32cui" installbase="system32" installname="more.exe">
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
--- a/reactos/base/applications/dxdiag/dxdiag.rbuild
+++ b/reactos/base/applications/dxdiag/dxdiag.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
 	<include base="dxdiag">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
--- a/reactos/base/applications/dxdiag/precomp.h
+++ b/reactos/base/applications/dxdiag/precomp.h
@ -4,7 +4,6 @@
 #define DIRECTINPUT_VERSION 0x0800
 #define DIRECTSOUND_VERSION 0x0800
 #define D3D_OVERLOADS
-#define _SETUPAPI_VER _WIN32_WINNT

 #include <stdio.h>
 #include <windows.h>
--- a/reactos/base/applications/games/solitaire/solitaire.rbuild
+++ b/reactos/base/applications/games/solitaire/solitaire.rbuild
@ -3,8 +3,6 @@
 <module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="true">
 	<include base="sol">.</include>
 	<include base="sol">cardlib</include>
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>user32</library>
--- a/reactos/base/applications/games/winemine/winemine.rbuild
+++ b/reactos/base/applications/games/winemine/winemine.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="winemine" type="win32gui" installbase="system32" installname="winemine.exe" unicode="yes">
 	<include base="winemine">.</include>
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
--- a/reactos/base/applications/hh/hh.rbuild
+++ b/reactos/base/applications/hh/hh.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
 	<include base="hh">.</include>
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/iexplore/iexplore.rbuild
+++ b/reactos/base/applications/iexplore/iexplore.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="iexplore" type="win32gui" installbase="system32" installname="iexplore.exe" unicode="no">
 	<include base="iexplore">.</include>
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
+++ b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
@ -3,9 +3,6 @@
 <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
 	<importlibrary definition="kbsdll.spec" />
 	<include base="kbsdll">.</include>
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
--- a/reactos/base/applications/logoff/logoff.rbuild
+++ b/reactos/base/applications/logoff/logoff.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="logoff" type="win32cui" installbase="system32" installname="logoff.exe">
 	<include base="logoff">.</include>
-	<define name="WINVER">0x0501</define>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>kernel32</library>
--- a/reactos/base/applications/mmc/mmc.rbuild
+++ b/reactos/base/applications/mmc/mmc.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes">
 	<include base="mmcclient">.</include>
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/msconfig/msconfig.rbuild
+++ b/reactos/base/applications/msconfig/msconfig.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
 	<include base="msconfig">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
+++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe" unicode="yes">
 <include base="devmgmt">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>
 	<library>setupapi</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
+++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
@ -2,8 +2,6 @@
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true">
 	<include base="eventvwr">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
--- a/reactos/base/applications/mscutils/servman/servman.rbuild
+++ b/reactos/base/applications/mscutils/servman/servman.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes">
 	<include base="servman">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/mstsc/mstsc.rbuild
+++ b/reactos/base/applications/mstsc/mstsc.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes" allowwarnings="true">
 	<include base="mstsc">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/network/dwnl/dwnl.rbuild
+++ b/reactos/base/applications/network/dwnl/dwnl.rbuild
@ -6,7 +6,5 @@
 	<library>urlmon</library>
 	<library>wininet</library>
 	<library>uuid</library>
-	<define name="WINVER">0x0501</define>
-	<define name="_WIN32_IE">0x0600</define>
 	<file>dwnl.c</file>
 </module>
--- a/reactos/base/applications/network/net/net.rbuild
+++ b/reactos/base/applications/network/net/net.rbuild
@ -3,8 +3,6 @@
 <module name="net" type="win32cui" installbase="system32" installname="net.exe">
 	<include base="ping">.</include>
 	<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>
--- a/reactos/base/applications/network/netstat/netstat.rbuild
+++ b/reactos/base/applications/network/netstat/netstat.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true">
 	<include base="netstat">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>ws2_32</library>
--- a/reactos/base/applications/network/ping/ping.rbuild
+++ b/reactos/base/applications/network/ping/ping.rbuild
@ -3,8 +3,6 @@
 <module name="ping" type="win32cui" installbase="system32" installname="ping.exe">
 	<include base="ping">.</include>
 	<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>
--- a/reactos/base/applications/network/tracert/tracert.rbuild
+++ b/reactos/base/applications/network/tracert/tracert.rbuild
@ -3,8 +3,6 @@
 <module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe">
 	<include base="tracert">.</include>
 	<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>
--- a/reactos/base/applications/notepad/notepad.rbuild
+++ b/reactos/base/applications/notepad/notepad.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="notepad" type="win32gui" installbase="system32" installname="notepad.exe" unicode="yes">
 	<include base="notepad">.</include>
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/base/applications/regedit/clb/clb.rbuild
+++ b/reactos/base/applications/regedit/clb/clb.rbuild
@ -3,9 +3,6 @@
 <module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes">
 	<importlibrary definition="clb.spec" />
 	<include base="clb">.</include>
-	<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>
--- a/reactos/base/applications/regedit/regedit.rbuild
+++ b/reactos/base/applications/regedit/regedit.rbuild
@ -5,8 +5,6 @@
 	<include base="regedit">.</include>
 	<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>
--- a/reactos/base/applications/shutdown/shutdown.rbuild
+++ b/reactos/base/applications/shutdown/shutdown.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe">
 	<include base="shutdown">.</include>
-	<define name="WINVER">0x0501</define>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>kernel32</library>
--- a/reactos/base/applications/sndvol32/sndvol32.rbuild
+++ b/reactos/base/applications/sndvol32/sndvol32.rbuild
@ -3,9 +3,6 @@
 <module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe" unicode="yes">
 	<include base="ReactOS">include/wine</include>
 	<include base="sndvol32">.</include>
-	<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>
--- a/reactos/base/applications/taskmgr/taskmgr.rbuild
+++ b/reactos/base/applications/taskmgr/taskmgr.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes">
 	<include base="taskmgr">.</include>
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>msvcrt</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
--- a/reactos/base/applications/winhlp32/winhlp32.rbuild
+++ b/reactos/base/applications/winhlp32/winhlp32.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no" allowwarnings="true">
 	<include base="winhlp32">.</include>
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>
 	<library>comdlg32</library>
 	<library>comctl32</library>
--- a/reactos/base/applications/wordpad/wordpad.rbuild
+++ b/reactos/base/applications/wordpad/wordpad.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true">
 	<include base="wordpad">.</include>
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>comdlg32</library>
 	<library>shell32</library>
 	<library>user32</library>
--- a/reactos/base/services/audiosrv/audiosrv.rbuild
+++ b/reactos/base/services/audiosrv/audiosrv.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true">
 	<include base="audiosrv">.</include>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="WINVER">0x0501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/base/services/dhcp/dhcp.rbuild
+++ b/reactos/base/services/dhcp/dhcp.rbuild
@ -3,7 +3,6 @@
 <module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe" allowwarnings="true">
 	<include base="dhcp">.</include>
 	<include base="dhcp">include</include>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>ws2_32</library>
--- a/reactos/base/services/spoolsv/spoolsv.rbuild
+++ b/reactos/base/services/spoolsv/spoolsv.rbuild
@ -2,9 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="spoolsv" type="win32cui" installbase="system32" installname="spoolsv.exe" unicode="yes">
 	<include base="spoolsv">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
--- a/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
@ -3,9 +3,7 @@
 <module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe" unicode="yes">
 	<include base="umpnpmgr">.</include>
 	<include base="pnp_server">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
+	<define name="_WIN32_WINNT">0x600</define>
 	<library>pnp_server</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
--- a/reactos/base/setup/reactos/reactos.rbuild
+++ b/reactos/base/setup/reactos/reactos.rbuild
@ -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>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
--- a/reactos/base/setup/setup/setup.rbuild
+++ b/reactos/base/setup/setup/setup.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="setup" type="win32gui" installbase="system32" installname="setup.exe" unicode="yes">
 	<include base="setup">.</include>
-	<define name="_WIN32_IE">0x0400</define>
 	<library>kernel32</library>
 	<library>userenv</library>
 	<file>setup.c</file>
--- a/reactos/base/setup/usetup/usetup.rbuild
+++ b/reactos/base/setup/usetup/usetup.rbuild
@ -7,7 +7,6 @@
 	<include base="inflib">.</include>
 	<include base="ReactOS">include/reactos/drivers</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0502</define>
 	<define name="__NO_CTYPE_INLINES" />
 	<library>zlib</library>
 	<library>inflib</library>
--- a/reactos/base/setup/vmwinst/vmwinst.rbuild
+++ b/reactos/base/setup/vmwinst/vmwinst.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe" unicode="yes">
 	<include base="vmwinst">.</include>
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>comctl32</library>
--- a/reactos/base/setup/welcome/welcome.rbuild
+++ b/reactos/base/setup/welcome/welcome.rbuild
@ -3,8 +3,6 @@
 <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe" unicode="yes">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="welcome">.</include>
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
--- a/reactos/base/shell/cmd/cmd.rbuild
+++ b/reactos/base/shell/cmd/cmd.rbuild
@ -5,7 +5,6 @@
 		<include base="ReactOS">include/reactos/wine</include>
 		<include base="cmd_base">.</include>
 		<define name="ANONYMOUSUNIONS" />
-		<define name="_WIN32_WINNT">0x0501</define>
 		<define name="_DEBUG_MEM" />
 		<pch>precomp.h</pch>
 		<compilationunit name="unit.c">
@ -72,7 +71,6 @@
 		<include base="ReactOS">include/reactos/wine</include>
 		<include base="cmd">.</include>
 		<define name="ANONYMOUSUNIONS" />
-		<define name="_WIN32_WINNT">0x0501</define>
 		<library>cmd_base</library>
 		<library>wine</library>
 		<library>kernel32</library>
--- a/reactos/base/shell/explorer-new/explorer.rbuild
+++ b/reactos/base/shell/explorer-new/explorer.rbuild
@ -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">0x0601</define>
-	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="WINVER">0x0600</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>gdi32</library>
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@ -5,9 +5,6 @@
 	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<include base="explorer">.</include>
 	<define name="WIN32" />
-	<define name="_WIN32_IE">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="WINVER">0x0500</define>
 	<define name="__WINDRES__" />
 	<library>advapi32</library>
 	<library>kernel32</library>
--- a/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
+++ b/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild
@ -3,7 +3,6 @@
 <module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}" installbase="system32" installname="notifyhook.dll">
 	<importlibrary definition="notifyhook.def" />
 	<include base="notifyhook">.</include>
-	<define name="_WIN32_IE">0x0600</define>
 	<define name="_NOTIFYHOOK_IMPL" />
 	<library>kernel32</library>
 	<library>user32</library>
--- a/reactos/base/system/bootok/bootok.rbuild
+++ b/reactos/base/system/bootok/bootok.rbuild
@ -2,9 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootok" type="win32cui" installbase="system32" installname="bootok.exe" unicode="yes">
 	<include base="bootok">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0600</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>bootok.c</file>
--- a/reactos/base/system/expand/expand.rbuild
+++ b/reactos/base/system/expand/expand.rbuild
@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="expand">.</include>
 	<define name="ANONYMOUSUNIONS" />
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>lz32</library>
 	<library>user32</library>
 	<library>kernel32</library>
--- a/reactos/base/system/msiexec/msiexec.rbuild
+++ b/reactos/base/system/msiexec/msiexec.rbuild
@ -3,9 +3,6 @@
 <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true">
 	<include base="msiexec">.</include>
 	<include base="ReactOS">include/wine</include>
-	<define name="_WIN32_IE">0x501</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>uuid</library>
 	<library>wine</library>
 	<library>ntdll</library>
--- a/reactos/base/system/winlogon/winlogon.rbuild
+++ b/reactos/base/system/winlogon/winlogon.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winlogon" type="win32gui" installbase="system32" installname="winlogon.exe">
 	<include base="winlogon">.</include>
-	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
--- a/reactos/boot/freeldr/fdebug/fdebug.rbuild
+++ b/reactos/boot/freeldr/fdebug/fdebug.rbuild
@ -2,8 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" unicode="yes">
 	<include base="freeldr_fdebug">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comdlg32</library>
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@ -3,9 +3,6 @@
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
 	<importlibrary definition="access.spec" />
 	<include base="access">.</include>
-	<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>
--- a/reactos/dll/cpl/appwiz-new/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz-new/appwiz.rbuild
@ -3,10 +3,6 @@
 <module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz-new.cpl" unicode="yes" allowwarnings="true">
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz-new">.</include>
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x0501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/dll/cpl/appwiz/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz/appwiz.rbuild
@ -3,8 +3,6 @@
 <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz.cpl" unicode="yes">
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/dll/cpl/console/console.rbuild
+++ b/reactos/dll/cpl/console/console.rbuild
@ -1,8 +1,6 @@
 <module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
 	<importlibrary definition="console.spec" />
 	<include base="console">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
--- a/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@ -3,9 +3,6 @@
 <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes">
 	<importlibrary definition="desk.def" />
 	<include base="desk">.</include>
-	<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>
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@ -3,8 +3,6 @@
 <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes">
 	<importlibrary definition="hdwwiz.spec" />
 	<include base="hdwwiz">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>setupapi</library>
 	<library>kernel32</library>
 	<file>hdwwiz.c</file>
--- a/reactos/dll/cpl/input/input.rbuild
+++ b/reactos/dll/cpl/input/input.rbuild
@ -3,8 +3,6 @@
 <module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes">
 	<importlibrary definition="input.def" />
 	<include base="input">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@ -3,9 +3,6 @@
 <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes">
    <importlibrary definition="intl.def" />
    <include base="intl">.</include>
-    <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>
--- a/reactos/dll/cpl/joy/joy.rbuild
+++ b/reactos/dll/cpl/joy/joy.rbuild
@ -3,9 +3,6 @@
 <module name="joy" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_JOY}"  installbase="system32" installname="joy.cpl" unicode="yes">
 	<importlibrary definition="joy.def" />
 	<include base="joy">.</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>
--- a/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@ -3,8 +3,6 @@
 <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
 	<importlibrary definition="main.def" />
 	<include base="main">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@ -28,8 +28,6 @@
 //TODO:
 //  add missing icons

-#define WINVER 0x0501
-
 #include <windows.h>
 #include <winuser.h>
 #include <devguid.h>
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@ -3,8 +3,6 @@
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes">
 	<importlibrary definition="mmsys.spec" />
 	<include base="mmsys">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
--- a/reactos/dll/cpl/ncpa/ncpa.rbuild
+++ b/reactos/dll/cpl/ncpa/ncpa.rbuild
@ -3,8 +3,9 @@
 <module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes">
 	<importlibrary definition="ncpa.def" />
 	<include base="ncpa">.</include>
-	<define name="_WIN32_IE">0x600</define>
+
 	<define name="_WIN32_WINNT">0x600</define>
+
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>shell32</library>
--- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
@ -3,8 +3,6 @@
 <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes">
 	<importlibrary definition="odbccp32.def" />
 	<include base="odbccp32">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
--- a/reactos/dll/cpl/powercfg/powercfg.rbuild
+++ b/reactos/dll/cpl/powercfg/powercfg.rbuild
@ -4,8 +4,6 @@
 	<importlibrary definition="powercfg.def" />
 	<include base="powercfg">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>powrprof</library>
--- a/reactos/dll/cpl/sysdm/sysdm.rbuild
+++ b/reactos/dll/cpl/sysdm/sysdm.rbuild
@ -3,9 +3,6 @@
 <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes">
 	<importlibrary definition="sysdm.def" />
 	<include base="sysdm">.</include>
-	<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>
--- a/reactos/dll/cpl/telephon/telephon.rbuild
+++ b/reactos/dll/cpl/telephon/telephon.rbuild
@ -3,9 +3,6 @@
 <module name="telephon" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TELEPHON}"  installbase="system32" installname="telephon.cpl" unicode="yes">
 	<importlibrary definition="telephon.def" />
 	<include base="telephon">.</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>
--- a/reactos/dll/cpl/timedate/timedate.rbuild
+++ b/reactos/dll/cpl/timedate/timedate.rbuild
@ -3,8 +3,6 @@
 <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes">
 	<importlibrary definition="timedate.def" />
 	<include base="timedate">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@ -3,9 +3,6 @@
 <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes">
 	<importlibrary definition="usrmgr.def" />
 	<include base="usrmgr">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x609</define>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@ -3,9 +3,6 @@
 <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes">
 	<importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>
-	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@ -5,9 +5,6 @@
 	<importlibrary definition="devenum.spec" />
 	<include base="devenum">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@ -5,9 +5,6 @@
 	<importlibrary definition="dinput.spec" />
 	<include base="dinput">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@ -5,9 +5,6 @@
 	<importlibrary definition="dinput8.spec" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@ -4,9 +4,6 @@
 	<importlibrary definition="dplay.spec" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@ -5,9 +5,6 @@
 	<importlibrary definition="dplayx.spec" />
 	<include base="dplayx">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@ -5,9 +5,6 @@
 	<importlibrary definition="dsound.spec" />
 	<include base="dsound">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@ -5,9 +5,6 @@
 	<importlibrary definition="dxdiagn.spec" />
 	<include base="dxdiagn">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
--- a/reactos/dll/directx/ksproxy/ksproxy.rbuild
+++ b/reactos/dll/directx/ksproxy/ksproxy.rbuild
@ -4,8 +4,6 @@
 <module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true">
 	<importlibrary definition="ksproxy.spec" />
 	<include base="ksproxy">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
--- a/reactos/dll/directx/ksuser/ksuser.rbuild
+++ b/reactos/dll/directx/ksuser/ksuser.rbuild
@ -3,8 +3,6 @@
 <module name="ksuser" type="win32dll" baseaddress="${BASEADDRESS_KSUSER}" installbase="system32" installname="ksuser.dll" allowwarnings="true">
 	<importlibrary definition="ksuser.def" />
 	<include base="ksuser">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
 	<library>advapi32</library>	
 	<library>kernel32</library>
 	<library>ntdll</library>
--- a/reactos/dll/directx/msdmo/msdmo.rbuild
+++ b/reactos/dll/directx/msdmo/msdmo.rbuild
@ -4,8 +4,6 @@
 <module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true">
 	<importlibrary definition="msdmo.spec" />
 	<include base="msdmo">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
--- a/reactos/dll/directx/qedit/qedit.rbuild
+++ b/reactos/dll/directx/qedit/qedit.rbuild
@ -4,8 +4,6 @@
 <module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true">
 	<importlibrary definition="qedit.spec" />
 	<include base="qedit">.</include>
-	<define name="WINVER">0x600</define>
-	<define name="_WIN32_WINNT">0x600</define>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@ -5,7 +5,6 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="quartz.spec" />
 	<include base="quartz">.</include>
-	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
 	<library>wine</library>
 	<library>uuid</library>
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@ -4,9 +4,6 @@
 	<importlibrary definition="d3d8.spec" />
 	<include base="d3d8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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" />

--- a/reactos/dll/directx/wine/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
@ -4,9 +4,6 @@
 	<importlibrary definition="d3d9.spec" />
 	<include base="d3d9">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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" />

--- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild
+++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
@ -4,9 +4,6 @@
 	<importlibrary definition="wined3d.def" />
 	<include base="wined3d">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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" />

--- a/reactos/dll/keyboard/kbda1/kbda1.rbuild
+++ b/reactos/dll/keyboard/kbda1/kbda1.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbda1.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda1.c</file>
 	<file>kbda1.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbda2/kbda2.rbuild
+++ b/reactos/dll/keyboard/kbda2/kbda2.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbda2.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda2.c</file>
 	<file>kbda2.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbda3/kbda3.rbuild
+++ b/reactos/dll/keyboard/kbda3/kbda3.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbda3.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda3.c</file>
 	<file>kbda3.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdal/kbdal.rbuild
+++ b/reactos/dll/keyboard/kbdal/kbdal.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdal.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdal.c</file>
 	<file>kbdal.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdarme.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdarme.c</file>
 	<file>kbdarme.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdarmw.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdarmw.c</file>
 	<file>kbdarmw.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
+++ b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdaze.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdaze.c</file>
 	<file>kbdaze.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
+++ b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdazel.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdazel.c</file>
 	<file>kbdazel.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdbe.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbe.c</file>
 	<file>kbdbe.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdbga.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbga.c</file>
 	<file>kbdbga.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdbgm.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbgm.c</file>
 	<file>kbdbgm.rc</file>
 </module>
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="kbdbgt.spec" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbgt.c</file>
 	<file>kbdbgt.rc</file>
 </module>
--- a/Show more
+++ b/Show more