diff --git a/reactos/dll/3rdparty/freetype/freetype.rbuild b/reactos/dll/3rdparty/freetype/freetype.rbuild
index 6a99e274f24..733cd679fdf 100644
--- a/reactos/dll/3rdparty/freetype/freetype.rbuild
+++ b/reactos/dll/3rdparty/freetype/freetype.rbuild
@@ -6,7 +6,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__NTDRIVER__" />
 	<define name="__NO_CTYPE_INLINES" />
-	<define name="__USE_W32API" />
 	<define name="FT2_BUILD_LIBRARY"  />
 	<if property="NSWPAT" value="0">
 		<define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" />
diff --git a/reactos/dll/3rdparty/mesa32/mesa32.rbuild b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
index af8571af52d..d53d6b42985 100644
--- a/reactos/dll/3rdparty/mesa32/mesa32.rbuild
+++ b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
@@ -7,7 +7,6 @@
 	<library>kernel32</library>
 	<library>msvcrt</library>
 	<library>user32</library>
-	<define name="__USE_W32API" />
 	<define name="USE_EXTERNAL_DXTN_LIB" />
 	<!-- The following is autogenrated by Makefile.ReactOS -->
 	<library>gdi32</library>
diff --git a/reactos/dll/cpl/access/access.rbuild b/reactos/dll/cpl/access/access.rbuild
index 173532f966a..ee2cb9614aa 100644
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@@ -3,7 +3,6 @@
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
 	<importlibrary definition="access.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>
diff --git a/reactos/dll/cpl/appwiz/appwiz.rbuild b/reactos/dll/cpl/appwiz/appwiz.rbuild
index c8e488fc46f..87ba21a755b 100644
--- a/reactos/dll/cpl/appwiz/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz/appwiz.rbuild
@@ -3,7 +3,6 @@
 <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz.cpl" unicode="yes">
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/desk/desk.rbuild b/reactos/dll/cpl/desk/desk.rbuild
index 234f1ddffd5..af7f5d19e6b 100644
--- a/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@@ -3,7 +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="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
index 3fbc354046f..4b8f2efefd0 100644
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@@ -3,7 +3,6 @@
 <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes">
 	<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>
diff --git a/reactos/dll/cpl/input/input.rbuild b/reactos/dll/cpl/input/input.rbuild
index 55ad6917c8c..b16ee8efc2b 100644
--- a/reactos/dll/cpl/input/input.rbuild
+++ b/reactos/dll/cpl/input/input.rbuild
@@ -3,7 +3,6 @@
 <module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes">
 	<importlibrary definition="input.def" />
 	<include base="input">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/intl/intl.rbuild b/reactos/dll/cpl/intl/intl.rbuild
index 7267482b641..1e08a5d89a4 100644
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@@ -3,7 +3,6 @@
 <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes">
 	<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>
diff --git a/reactos/dll/cpl/main/main.rbuild b/reactos/dll/cpl/main/main.rbuild
index 5dd562cb9f9..bebfe3e8b0f 100644
--- a/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@@ -3,7 +3,6 @@
 <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
 	<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>
diff --git a/reactos/dll/cpl/mmsys/mmsys.rbuild b/reactos/dll/cpl/mmsys/mmsys.rbuild
index 67cc31a512b..0e4a3f43d4e 100644
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@@ -3,7 +3,6 @@
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes">
 	<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>
diff --git a/reactos/dll/cpl/ncpa/ncpa.rbuild b/reactos/dll/cpl/ncpa/ncpa.rbuild
index fdfb3527ba6..6306011c792 100644
--- a/reactos/dll/cpl/ncpa/ncpa.rbuild
+++ b/reactos/dll/cpl/ncpa/ncpa.rbuild
@@ -3,7 +3,6 @@
 <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="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/odbccp32/odbccp32.rbuild b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
index 8df1551f5cf..2bfd476a5c0 100644
--- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
@@ -3,7 +3,6 @@
 <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes">
 	<importlibrary definition="odbccp32.def" />
 	<include base="odbccp32">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/powercfg/powercfg.rbuild b/reactos/dll/cpl/powercfg/powercfg.rbuild
index 477822bf1f9..26d0b5aca63 100644
--- a/reactos/dll/cpl/powercfg/powercfg.rbuild
+++ b/reactos/dll/cpl/powercfg/powercfg.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="powercfg.def" />
 	<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>
diff --git a/reactos/dll/cpl/sysdm/sysdm.rbuild b/reactos/dll/cpl/sysdm/sysdm.rbuild
index 0e6b0542341..3794645b895 100644
--- a/reactos/dll/cpl/sysdm/sysdm.rbuild
+++ b/reactos/dll/cpl/sysdm/sysdm.rbuild
@@ -3,7 +3,6 @@
 <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes">
 	<importlibrary definition="sysdm.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>
diff --git a/reactos/dll/cpl/timedate/timedate.rbuild b/reactos/dll/cpl/timedate/timedate.rbuild
index 344b18d4f09..e703d77a0ac 100644
--- a/reactos/dll/cpl/timedate/timedate.rbuild
+++ b/reactos/dll/cpl/timedate/timedate.rbuild
@@ -3,7 +3,6 @@
 <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes">
 	<importlibrary definition="timedate.def" />
 	<include base="timedate">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rbuild b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
index 76359a992f0..764a542deb4 100644
--- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@@ -3,7 +3,6 @@
 <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes">
 	<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>
diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild
index 90bd4258f57..04a440a4f12 100644
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 
diff --git a/reactos/dll/directx/devenum/devenum.rbuild b/reactos/dll/directx/devenum/devenum.rbuild
index a02236193f6..7096c13fe27 100644
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index 5a0c968599f..ab85a5f28a0 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/dinput8/dinput8.rbuild b/reactos/dll/directx/dinput8/dinput8.rbuild
index 94ec9b046ce..ac6d59d6762 100644
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 396d05e32af..169567f8236 100644
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index dd97e71165f..d77633ba4a2 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 492d92b35a4..3053ec1308c 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -5,7 +5,6 @@
 	<importlibrary definition="dsound.spec.def" />
 	<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>
diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
index 0b1b4d87da0..52c14a678cb 100644
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index 0956d98660e..5015c467f71 100644
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/directx/wine/wined3d/wined3d.rbuild b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
index 7fadc051a2f..55cd9b401e1 100644
--- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild
+++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="wined3d.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
index 7e906514ca6..51a70d5348b 100644
--- a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdbe.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
index 27aaf8eeb7a..86600c96644 100644
--- a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdbur.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
index 7cd750a1bc8..cad0a4f02ea 100644
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="kbdcz1.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcz1.c</file>
 	<file>kbdcz1.rc</file>
diff --git a/reactos/dll/keyboard/kbdda/kbdda.rbuild b/reactos/dll/keyboard/kbdda/kbdda.rbuild
index 6f1ddc494c4..41e12e8cfe6 100644
--- a/reactos/dll/keyboard/kbdda/kbdda.rbuild
+++ b/reactos/dll/keyboard/kbdda/kbdda.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdda.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbddv/kbddv.rbuild b/reactos/dll/keyboard/kbddv/kbddv.rbuild
index 03ddca8d80d..f27bbcc9690 100644
--- a/reactos/dll/keyboard/kbddv/kbddv.rbuild
+++ b/reactos/dll/keyboard/kbddv/kbddv.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbddv.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdes/kbdes.rbuild b/reactos/dll/keyboard/kbdes/kbdes.rbuild
index 956f782577c..2dbfabed3c4 100644
--- a/reactos/dll/keyboard/kbdes/kbdes.rbuild
+++ b/reactos/dll/keyboard/kbdes/kbdes.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdes.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
index 3bd7d499f75..662d92abc68 100644
--- a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdfi.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
index 9b878fa7554..659098fca83 100644
--- a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdfr.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
index 9a0902465f0..8314cebe057 100644
--- a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
+++ b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdgr.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
index 0271d66d0ad..e74221ddca0 100644
--- a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdhe.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
index 8e8c2e3caea..1a2e079e0b7 100644
--- a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdheb.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
index 3f06305e503..a6ff1c9eca9 100644
--- a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdhu.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdit/kbdit.rbuild b/reactos/dll/keyboard/kbdit/kbdit.rbuild
index 3acf8c258de..0899db6d95b 100644
--- a/reactos/dll/keyboard/kbdit/kbdit.rbuild
+++ b/reactos/dll/keyboard/kbdit/kbdit.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdit.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdja/kbdja.rbuild b/reactos/dll/keyboard/kbdja/kbdja.rbuild
index 3f16a08265c..8612fc13b79 100644
--- a/reactos/dll/keyboard/kbdja/kbdja.rbuild
+++ b/reactos/dll/keyboard/kbdja/kbdja.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdja.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
index 3a23d2441ed..6b24e655a0c 100644
--- a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="kbdlt.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdno/kbdno.rbuild b/reactos/dll/keyboard/kbdno/kbdno.rbuild
index 2d1ce88b250..aa5abbdaec2 100644
--- a/reactos/dll/keyboard/kbdno/kbdno.rbuild
+++ b/reactos/dll/keyboard/kbdno/kbdno.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdno.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
index 20f5870aa1e..f1bcaf066af 100644
--- a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
+++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdpl1.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
index 7b6060aab83..669cb4962b3 100644
--- a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdpo.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdru/kbdru.rbuild b/reactos/dll/keyboard/kbdru/kbdru.rbuild
index dfcddb1205d..ee924089856 100644
--- a/reactos/dll/keyboard/kbdru/kbdru.rbuild
+++ b/reactos/dll/keyboard/kbdru/kbdru.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdru.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
index 394a3b6c07f..f99f65b3c40 100644
--- a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
+++ b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdsg.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
index 3d03d5e19b2..d2273eef33c 100644
--- a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdsk.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
index 7d1bce95764..dab6503f2d1 100644
--- a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdsw.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdth/kbdth.rbuild b/reactos/dll/keyboard/kbdth/kbdth.rbuild
index cb31f717a2f..7518bc17515 100644
--- a/reactos/dll/keyboard/kbdth/kbdth.rbuild
+++ b/reactos/dll/keyboard/kbdth/kbdth.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdth.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbduk/kbduk.rbuild b/reactos/dll/keyboard/kbduk/kbduk.rbuild
index 60582eaff9f..0a668d73325 100644
--- a/reactos/dll/keyboard/kbduk/kbduk.rbuild
+++ b/reactos/dll/keyboard/kbduk/kbduk.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbduk.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdur/kbdur.rbuild b/reactos/dll/keyboard/kbdur/kbdur.rbuild
index 9a7c99eabb0..c867a639764 100644
--- a/reactos/dll/keyboard/kbdur/kbdur.rbuild
+++ b/reactos/dll/keyboard/kbdur/kbdur.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdur.def" />
 	<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>
diff --git a/reactos/dll/keyboard/kbdus/kbdus.rbuild b/reactos/dll/keyboard/kbdus/kbdus.rbuild
index 1754a6a6118..4cc46508a7e 100644
--- a/reactos/dll/keyboard/kbdus/kbdus.rbuild
+++ b/reactos/dll/keyboard/kbdus/kbdus.rbuild
@@ -4,7 +4,6 @@
 	<importlibrary definition="kbdus.def" />
 	<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>
diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index 6729e54deb7..0da32298580 100644
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<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" />
diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index 6b84fac6776..a2883030f60 100644
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -3,7 +3,6 @@
 	<include base="acledit">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 
 	<metadata description = "Access Control List Editor" />
 
diff --git a/reactos/dll/win32/aclui/aclui.rbuild b/reactos/dll/win32/aclui/aclui.rbuild
index 2a7803dfef2..f465b246913 100644
--- a/reactos/dll/win32/aclui/aclui.rbuild
+++ b/reactos/dll/win32/aclui/aclui.rbuild
@@ -3,7 +3,6 @@
 	<include base="aclui">.</include>
 	<define name="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>
diff --git a/reactos/dll/win32/advapi32/advapi32.rbuild b/reactos/dll/win32/advapi32/advapi32.rbuild
index 59d4f51cd23..7b6d87aa953 100644
--- a/reactos/dll/win32/advapi32/advapi32.rbuild
+++ b/reactos/dll/win32/advapi32/advapi32.rbuild
@@ -5,7 +5,6 @@
 	<include base="scm_client">.</include>
 	<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>
diff --git a/reactos/dll/win32/authz/authz.rbuild b/reactos/dll/win32/authz/authz.rbuild
index 4ce1b5a95d3..7dfa3fcd947 100644
--- a/reactos/dll/win32/authz/authz.rbuild
+++ b/reactos/dll/win32/authz/authz.rbuild
@@ -3,7 +3,6 @@
 	<include base="authz">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/dll/win32/beepmidi/beepmidi.rbuild b/reactos/dll/win32/beepmidi/beepmidi.rbuild
index 29b4c9e95b8..98c2d3cbd4e 100644
--- a/reactos/dll/win32/beepmidi/beepmidi.rbuild
+++ b/reactos/dll/win32/beepmidi/beepmidi.rbuild
@@ -1,7 +1,6 @@
 <module name="beepmidi" type="win32dll" installbase="system32" installname="beepmidi.dll">
 	<importlibrary definition="beepmidi.def" />
 	<include base="beepmidi">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild
index 1a7411a9c81..94a8bdc0dbe 100644
--- a/reactos/dll/win32/cards/cards.rbuild
+++ b/reactos/dll/win32/cards/cards.rbuild
@@ -3,7 +3,6 @@
 	<include base="cards">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 
 	<!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
 	<define name="CARDSTYLE_DEFAULT" />
diff --git a/reactos/dll/win32/console/console.rbuild b/reactos/dll/win32/console/console.rbuild
index 676bcc5cbb9..7d8d7598d69 100644
--- a/reactos/dll/win32/console/console.rbuild
+++ b/reactos/dll/win32/console/console.rbuild
@@ -3,7 +3,6 @@
 	<include base="console">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/crtdll/crtdll.rbuild b/reactos/dll/win32/crtdll/crtdll.rbuild
index f292e5fa309..17e9b22ecc4 100644
--- a/reactos/dll/win32/crtdll/crtdll.rbuild
+++ b/reactos/dll/win32/crtdll/crtdll.rbuild
@@ -5,7 +5,6 @@
 	<include base="crtdll">.</include>
 	<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" />
diff --git a/reactos/dll/win32/cryptui/cryptui.rbuild b/reactos/dll/win32/cryptui/cryptui.rbuild
index b49b2e0ea37..710427814ed 100644
--- a/reactos/dll/win32/cryptui/cryptui.rbuild
+++ b/reactos/dll/win32/cryptui/cryptui.rbuild
@@ -1,7 +1,6 @@
 <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
 	<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>
diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild
index 9446251864c..025b972e66f 100644
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="dbghelp.spec.def" />
 	<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>
diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild
index 5f36d7237b7..cf29ec2c155 100644
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="devmgr.spec.def" />
 	<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>
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
index 3f38f7837ae..6964d56c0a9 100644
--- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
+++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="dhcpcsvc.spec.def" />
 	<include base="dhcpcsvc">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT=0x0500" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/dnsapi/dnsapi.rbuild b/reactos/dll/win32/dnsapi/dnsapi.rbuild
index 567611f6501..a1fbb53ffdf 100644
--- a/reactos/dll/win32/dnsapi/dnsapi.rbuild
+++ b/reactos/dll/win32/dnsapi/dnsapi.rbuild
@@ -5,7 +5,6 @@
 	<include base="adns">adns_win32</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="ADNS_JGAA_WIN32" />
-	<define name="__USE_W32API" />
 	<library>adns</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/fmifs/fmifs.rbuild b/reactos/dll/win32/fmifs/fmifs.rbuild
index 6934bd39175..f18924e0158 100644
--- a/reactos/dll/win32/fmifs/fmifs.rbuild
+++ b/reactos/dll/win32/fmifs/fmifs.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="fmifs.def" />
 	<include base="fmifs">.</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/gdi32/gdi32.rbuild b/reactos/dll/win32/gdi32/gdi32.rbuild
index 38acd8b6094..c99914e6153 100644
--- a/reactos/dll/win32/gdi32/gdi32.rbuild
+++ b/reactos/dll/win32/gdi32/gdi32.rbuild
@@ -3,7 +3,6 @@
 	<include base="gdi32">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index ee81c0f71d7..633da24f465 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -6,7 +6,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<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>
diff --git a/reactos/dll/win32/glu32/glu32.rbuild b/reactos/dll/win32/glu32/glu32.rbuild
index b455318a32b..605cc6cf588 100644
--- a/reactos/dll/win32/glu32/glu32.rbuild
+++ b/reactos/dll/win32/glu32/glu32.rbuild
@@ -6,7 +6,6 @@
 	<include base="glu32">libnurbs/nurbtess</include>
 	<include base="glu32">libtess</include>
 	<include base="glu32">libutil</include>
-	<define name="__USE_W32API" />
 	<define name="RESOLVE_3D_TEXTURE_SUPPORT" />
 	<define name="BUILD_GL32" />
 	<define name="LIBRARYBUILD" />
diff --git a/reactos/dll/win32/hid/hid.rbuild b/reactos/dll/win32/hid/hid.rbuild
index f628647b1b2..b16c6c2baec 100644
--- a/reactos/dll/win32/hid/hid.rbuild
+++ b/reactos/dll/win32/hid/hid.rbuild
@@ -3,7 +3,6 @@
 	<include base="hid">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild
index 7fa35a6d9ba..295a5653728 100644
--- a/reactos/dll/win32/icmp/icmp.rbuild
+++ b/reactos/dll/win32/icmp/icmp.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="icmp.spec.def" />
 	<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>
diff --git a/reactos/dll/win32/imagehlp/imagehlp.rbuild b/reactos/dll/win32/imagehlp/imagehlp.rbuild
index 911905ecc44..c7a9d3ad40c 100644
--- a/reactos/dll/win32/imagehlp/imagehlp.rbuild
+++ b/reactos/dll/win32/imagehlp/imagehlp.rbuild
@@ -1,7 +1,6 @@
 <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true">
 	<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>
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index 4ceb8118021..9af67947804 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild
index 5c0a36d697f..189517d7add 100644
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@ -6,7 +6,6 @@
 	<include base="kernel32_base">include</include>
 	<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>
@@ -125,7 +124,6 @@
 	<include base="kernel32" root="intermediate">.</include>
 	<include base="kernel32">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x0500</define>
 	<library>kernel32_base</library>
 	<library>pseh</library>
diff --git a/reactos/dll/win32/lsasrv/lsasrv.rbuild b/reactos/dll/win32/lsasrv/lsasrv.rbuild
index 33746c46dfd..9f3db5f6b0f 100644
--- a/reactos/dll/win32/lsasrv/lsasrv.rbuild
+++ b/reactos/dll/win32/lsasrv/lsasrv.rbuild
@@ -4,7 +4,6 @@
 	<include base="lsa_server">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<linkerflag>-nostartfiles</linkerflag>
diff --git a/reactos/dll/win32/mmdrv/mmdrv.rbuild b/reactos/dll/win32/mmdrv/mmdrv.rbuild
index 794aacb7c0c..88ef90dfd2c 100644
--- a/reactos/dll/win32/mmdrv/mmdrv.rbuild
+++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild
@@ -1,7 +1,6 @@
 <module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll">
 	<importlibrary definition="mmdrv.def" />
 	<include base="mmdrv">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="NDEBUG" />
diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index cae1946ce7a..5dae9acc128 100644
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -5,7 +5,6 @@
 	<define name="UNICODE" />
 	<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>
diff --git a/reactos/dll/win32/msafd/msafd.rbuild b/reactos/dll/win32/msafd/msafd.rbuild
index e097c8fc0c7..cbc4c59c93f 100644
--- a/reactos/dll/win32/msafd/msafd.rbuild
+++ b/reactos/dll/win32/msafd/msafd.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/drivers</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<pch>msafd.h</pch>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild
index f9ed7f198b3..cd0fb03b0ef 100644
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="msgina.def" />
 	<include base="msgina">.</include>
 	<include base="msgina">include</include>
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>wine</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/msvcrt/msvcrt.rbuild b/reactos/dll/win32/msvcrt/msvcrt.rbuild
index 493192477d7..d74a8d78d6b 100644
--- a/reactos/dll/win32/msvcrt/msvcrt.rbuild
+++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild
@@ -7,7 +7,6 @@
 	<include base="msvcrt">.</include>
 	<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" />
diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
index 1ceba64e3a7..5657554b2d1 100644
--- a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
+++ b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="msvcrt20.def" />
 	<include base="msvcrt20">.</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="__REACTOS__" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
diff --git a/reactos/dll/win32/mswsock/mswsock.rbuild b/reactos/dll/win32/mswsock/mswsock.rbuild
index a661f240637..b0a18c5df30 100644
--- a/reactos/dll/win32/mswsock/mswsock.rbuild
+++ b/reactos/dll/win32/mswsock/mswsock.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="mswsock.def" />
 	<define name="UNICODE" />
 	<define name="LE" />
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>extensions.c</file>
diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild
index 0555a2cf0e2..0bab404e897 100644
--- a/reactos/dll/win32/netid/netid.rbuild
+++ b/reactos/dll/win32/netid/netid.rbuild
@@ -1,7 +1,6 @@
 <module name="netid" type="win32dll" baseaddress="${BASEADDRESS_NETID}" installbase="system32" installname="netid.dll" unicode="true">
 	<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>
diff --git a/reactos/dll/win32/ntmarta/ntmarta.rbuild b/reactos/dll/win32/ntmarta/ntmarta.rbuild
index a46dddce5dd..ac3b0ac01ff 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.rbuild
+++ b/reactos/dll/win32/ntmarta/ntmarta.rbuild
@@ -3,7 +3,6 @@
 	<include base="ntmarta">.</include>
 	<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>
diff --git a/reactos/dll/win32/opengl32/opengl32.rbuild b/reactos/dll/win32/opengl32/opengl32.rbuild
index a57b332a2e3..02e3b75fce1 100644
--- a/reactos/dll/win32/opengl32/opengl32.rbuild
+++ b/reactos/dll/win32/opengl32/opengl32.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="opengl32.def" />
 	<include base="wsock32">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/psapi/psapi.rbuild b/reactos/dll/win32/psapi/psapi.rbuild
index 4a739e787e6..c3fbb23d818 100644
--- a/reactos/dll/win32/psapi/psapi.rbuild
+++ b/reactos/dll/win32/psapi/psapi.rbuild
@@ -3,7 +3,6 @@
 	<include base="psapi">.</include>
 	<include base="psapi">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<library>epsapi</library>
 	<library>pseh</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/samlib/samlib.rbuild b/reactos/dll/win32/samlib/samlib.rbuild
index 3735d4ef571..f4e8a3cd977 100644
--- a/reactos/dll/win32/samlib/samlib.rbuild
+++ b/reactos/dll/win32/samlib/samlib.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="samlib.def" />
 	<include base="samlib">.</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/samsrv/samsrv.rbuild b/reactos/dll/win32/samsrv/samsrv.rbuild
index ec8452ce1fe..009c3219af4 100644
--- a/reactos/dll/win32/samsrv/samsrv.rbuild
+++ b/reactos/dll/win32/samsrv/samsrv.rbuild
@@ -5,7 +5,6 @@
 	<include base="samsrv">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<linkerflag>-nostartfiles</linkerflag>
 	<linkerflag>-nostdlib</linkerflag>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/secur32/secur32.rbuild b/reactos/dll/win32/secur32/secur32.rbuild
index d9555fdbf08..a1f0d8298dc 100644
--- a/reactos/dll/win32/secur32/secur32.rbuild
+++ b/reactos/dll/win32/secur32/secur32.rbuild
@@ -3,7 +3,6 @@
 	<include base="secur32">.</include>
 	<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>
diff --git a/reactos/dll/win32/security/security.rbuild b/reactos/dll/win32/security/security.rbuild
index 43c1bdd0c09..a787cc68554 100644
--- a/reactos/dll/win32/security/security.rbuild
+++ b/reactos/dll/win32/security/security.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="security.def" />
 	<include base="security">.</include>
 	<define name="__SECURITY__" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/serialui/serialui.rbuild b/reactos/dll/win32/serialui/serialui.rbuild
index 904c5311dc5..ac7ee59afad 100644
--- a/reactos/dll/win32/serialui/serialui.rbuild
+++ b/reactos/dll/win32/serialui/serialui.rbuild
@@ -1,7 +1,6 @@
 <module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll">
 	<importlibrary definition="serialui.def" />
 	<include base="serialui">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild
index c82ae6a5f8b..a606813a217 100644
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@@ -7,7 +7,6 @@
 	<include base="pnp_client">.</include>
 	<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>
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index c2e8b3a637b..e86de9ec86f 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -4,7 +4,6 @@
 	<include base="shdocvw">.</include>
 	<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>
@@ -29,7 +28,7 @@
 	<file>persist.c</file>
 	<file>regsvr.c</file>
 	<file>shdocvw_main.c</file>
-        <file>shlinstobj.c</file>
+	<file>shlinstobj.c</file>
 	<file>view.c</file>
 	<file>webbrowser.c</file>
 	<file>shdocvw.rc</file>
diff --git a/reactos/dll/win32/shellext/deskadp/deskadp.rbuild b/reactos/dll/win32/shellext/deskadp/deskadp.rbuild
index 16db27f4b9f..7a3d3c23c30 100644
--- a/reactos/dll/win32/shellext/deskadp/deskadp.rbuild
+++ b/reactos/dll/win32/shellext/deskadp/deskadp.rbuild
@@ -1,7 +1,6 @@
 <module name="deskadp" type="win32dll" baseaddress="${BASEADDRESS_DESKADP}" installbase="system32" installname="deskadp.dll" unicode="yes">
 	<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>
diff --git a/reactos/dll/win32/shellext/deskmon/deskmon.rbuild b/reactos/dll/win32/shellext/deskmon/deskmon.rbuild
index c84dedfc775..443df5546fa 100644
--- a/reactos/dll/win32/shellext/deskmon/deskmon.rbuild
+++ b/reactos/dll/win32/shellext/deskmon/deskmon.rbuild
@@ -1,7 +1,6 @@
 <module name="deskmon" type="win32dll" baseaddress="${BASEADDRESS_DESKMON}" installbase="system32" installname="deskmon.dll" unicode="yes">
 	<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>
diff --git a/reactos/dll/win32/shellext/devcpux/devcpux.rbuild b/reactos/dll/win32/shellext/devcpux/devcpux.rbuild
index 6c255597b7e..c4a5ea4a42d 100644
--- a/reactos/dll/win32/shellext/devcpux/devcpux.rbuild
+++ b/reactos/dll/win32/shellext/devcpux/devcpux.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/win32/shellext/slayer/slayer.rbuild b/reactos/dll/win32/shellext/slayer/slayer.rbuild
index de6e26c3d31..7b99bc37c32 100644
--- a/reactos/dll/win32/shellext/slayer/slayer.rbuild
+++ b/reactos/dll/win32/shellext/slayer/slayer.rbuild
@@ -3,7 +3,6 @@
 	<include base="slayer">.</include>
 	<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>
diff --git a/reactos/dll/win32/smdll/smdll.rbuild b/reactos/dll/win32/smdll/smdll.rbuild
index 0b3dd9df7ce..770a1ddceb9 100644
--- a/reactos/dll/win32/smdll/smdll.rbuild
+++ b/reactos/dll/win32/smdll/smdll.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="smdll.def" />
 	<include base="smdll">.</include>
 	<include base="ReactOS">include/reactos/subsys</include>
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>smlib</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild
index 5b12433e9d5..41a8f7ae865 100644
--- a/reactos/dll/win32/snmpapi/snmpapi.rbuild
+++ b/reactos/dll/win32/snmpapi/snmpapi.rbuild
@@ -1,7 +1,6 @@
 <module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll">
 	<importlibrary definition="snmpapi.def" />
 	<include base="snmpapi">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
index eac000dc10a..85ff394d945 100644
--- a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
+++ b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
@@ -3,7 +3,6 @@
 	<include base="std_ole_v2">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
@@ -15,7 +14,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<dependency>std_ole_v2</dependency>
 	<define name="__WINESRC__" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/win32/syssetup/syssetup.rbuild b/reactos/dll/win32/syssetup/syssetup.rbuild
index 69a8132887b..742e21b47e3 100644
--- a/reactos/dll/win32/syssetup/syssetup.rbuild
+++ b/reactos/dll/win32/syssetup/syssetup.rbuild
@@ -1,7 +1,6 @@
 <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true">
 	<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>
diff --git a/reactos/dll/win32/twain_32/twain_32.rbuild b/reactos/dll/win32/twain_32/twain_32.rbuild
index 552570884c7..716e87a05d6 100644
--- a/reactos/dll/win32/twain_32/twain_32.rbuild
+++ b/reactos/dll/win32/twain_32/twain_32.rbuild
@@ -1,7 +1,6 @@
 <module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" allowwarnings="true">
 	<importlibrary definition="twain_32.def" />
 	<include base="twain_32">.</include>
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>wine</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/ufat/ufat.rbuild b/reactos/dll/win32/ufat/ufat.rbuild
index 033f7e92541..6ecbaab768d 100644
--- a/reactos/dll/win32/ufat/ufat.rbuild
+++ b/reactos/dll/win32/ufat/ufat.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="ufat.def" />
 	<include base="ufat">.</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0600</define>
 	<library>vfatlib</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/ufatx/ufatx.rbuild b/reactos/dll/win32/ufatx/ufatx.rbuild
index 6ff779110e9..eb73266d1ad 100644
--- a/reactos/dll/win32/ufatx/ufatx.rbuild
+++ b/reactos/dll/win32/ufatx/ufatx.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="ufatx.def" />
 	<include base="ufatx">.</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0600</define>
 	<library>vfatxlib</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild
index bbed17a6345..11fa1e0ecfa 100644
--- a/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<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>
diff --git a/reactos/dll/win32/userenv/userenv.rbuild b/reactos/dll/win32/userenv/userenv.rbuild
index 804c809286e..4fde1650648 100644
--- a/reactos/dll/win32/userenv/userenv.rbuild
+++ b/reactos/dll/win32/userenv/userenv.rbuild
@@ -1,7 +1,6 @@
 <module name="userenv" type="win32dll" baseaddress="${BASEADDRESS_USERENV}" installbase="system32" installname="userenv.dll">
 	<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>
diff --git a/reactos/dll/win32/usp10/usp10.rbuild b/reactos/dll/win32/usp10/usp10.rbuild
index 95686fefbea..f97bb047080 100644
--- a/reactos/dll/win32/usp10/usp10.rbuild
+++ b/reactos/dll/win32/usp10/usp10.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
index dc2e8ae0bb1..6c094e90cfb 100644
--- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
+++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
@@ -3,7 +3,6 @@
 	<include base="vdmdbg">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<file>vdmdbg.c</file>
diff --git a/reactos/dll/win32/wininet/wininet.rbuild b/reactos/dll/win32/wininet/wininet.rbuild
index a7e72fd37e4..889b323d3b9 100644
--- a/reactos/dll/win32/wininet/wininet.rbuild
+++ b/reactos/dll/win32/wininet/wininet.rbuild
@@ -4,7 +4,6 @@
 	<include base="wininet">.</include>
 	<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>
diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild
index bd650b8f56e..81b6cdd640e 100644
--- a/reactos/dll/win32/winmm/midimap/midimap.rbuild
+++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild
@@ -5,7 +5,6 @@
 	<define name="UNICODE" />
 	<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>
diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
index e9215e49589..ce75ad3b393 100644
--- a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
@@ -5,12 +5,11 @@
 	<define name="UNICODE" />
 	<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>msacm32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild
index 1e4bbf94bf1..e4cc4b9a6e7 100644
--- a/reactos/dll/win32/winmm/winmm.rbuild
+++ b/reactos/dll/win32/winmm/winmm.rbuild
@@ -12,7 +12,6 @@
 	<include base="winmm">.</include>
 	<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>
diff --git a/reactos/dll/win32/winspool/winspool.rbuild b/reactos/dll/win32/winspool/winspool.rbuild
index e34032a1d8d..59cade347c4 100644
--- a/reactos/dll/win32/winspool/winspool.rbuild
+++ b/reactos/dll/win32/winspool/winspool.rbuild
@@ -1,7 +1,6 @@
 <module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true">
 	<importlibrary definition="winspool.def" />
 	<include base="winspool">.</include>
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
diff --git a/reactos/dll/win32/winsta/winsta.rbuild b/reactos/dll/win32/winsta/winsta.rbuild
index 6fe4a79c3c1..a9afda98601 100644
--- a/reactos/dll/win32/winsta/winsta.rbuild
+++ b/reactos/dll/win32/winsta/winsta.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="winsta.def" />
 	<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>
diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild
index 5e88b79307c..13239b21b5e 100644
--- a/reactos/dll/win32/wintrust/wintrust.rbuild
+++ b/reactos/dll/win32/wintrust/wintrust.rbuild
@@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/win32/wldap32/wldap32.rbuild b/reactos/dll/win32/wldap32/wldap32.rbuild
index 45a63cb96bd..2e8cd039f7c 100644
--- a/reactos/dll/win32/wldap32/wldap32.rbuild
+++ b/reactos/dll/win32/wldap32/wldap32.rbuild
@@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<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>
diff --git a/reactos/dll/win32/ws2_32/ws2_32.rbuild b/reactos/dll/win32/ws2_32/ws2_32.rbuild
index 6812e202779..c35e0a933c4 100644
--- a/reactos/dll/win32/ws2_32/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild
@@ -5,7 +5,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="UNICODE" />
 	<define name="LE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<library>wine</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild
index 6b2b68a4c35..7c5d2e92cf2 100644
--- a/reactos/dll/win32/ws2help/ws2help.rbuild
+++ b/reactos/dll/win32/ws2help/ws2help.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="ws2help.def" />
 	<include base="ws2help">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/wshirda/wshirda.rbuild b/reactos/dll/win32/wshirda/wshirda.rbuild
index 116dd16751e..f4c74083eff 100644
--- a/reactos/dll/win32/wshirda/wshirda.rbuild
+++ b/reactos/dll/win32/wshirda/wshirda.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="wshirda.def" />
 	<include base="wshirda">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/wsock32/wsock32.rbuild b/reactos/dll/win32/wsock32/wsock32.rbuild
index 32d5015adb0..0c4470db437 100644
--- a/reactos/dll/win32/wsock32/wsock32.rbuild
+++ b/reactos/dll/win32/wsock32/wsock32.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="wsock32.def" />
 	<include base="wsock32">.</include>
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>ws2_32</library>