diff --git a/rostests/apitests/dciman32api/dciman32api.rbuild b/rostests/apitests/dciman32api/dciman32api.rbuild
index 29adf5e9bf0..c20ca207c62 100644
--- a/rostests/apitests/dciman32api/dciman32api.rbuild
+++ b/rostests/apitests/dciman32api/dciman32api.rbuild
@@ -1,5 +1,6 @@
 <module name="dciman32api" type="win32cui">
 	<include base="dciman32api">.</include>
+	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/apitests/directory.rbuild b/rostests/apitests/directory.rbuild
index fca322c9a1d..ff6014313b3 100644
--- a/rostests/apitests/directory.rbuild
+++ b/rostests/apitests/directory.rbuild
@@ -3,6 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="apitest" type="staticlibrary">
 		<include base="apitest">.</include>
+		<define name="__USE_W32API" />
 		<file>apitest.c</file>
 	</module>
 
@@ -25,7 +26,7 @@
 	<directory name="w32knapi">
 		<xi:include href="w32knapi/w32knapi.rbuild" />
 	</directory>
-
+	
 	<directory name="ws2_32">
 		<xi:include href="ws2_32/ws2_32.rbuild" />
 	</directory>
diff --git a/rostests/apitests/gdi32api/gdi32api.rbuild b/rostests/apitests/gdi32api/gdi32api.rbuild
index ec234cd64b8..61acef193e0 100644
--- a/rostests/apitests/gdi32api/gdi32api.rbuild
+++ b/rostests/apitests/gdi32api/gdi32api.rbuild
@@ -1,5 +1,6 @@
 <module name="gdi32api" type="win32cui">
 	<include base="gdi32api">.</include>
+	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/apitests/user32api/user32api.rbuild b/rostests/apitests/user32api/user32api.rbuild
index 778124044aa..ceb46070fb8 100644
--- a/rostests/apitests/user32api/user32api.rbuild
+++ b/rostests/apitests/user32api/user32api.rbuild
@@ -1,5 +1,6 @@
 <module name="user32api" type="win32cui">
 	<include base="user32api">.</include>
+	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild b/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild
index 5876d07b0e4..eac5ce36881 100644
--- a/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild
+++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild
@@ -1,5 +1,6 @@
 <module name="w32kdll_2k3sp2" type="win32dll" entrypoint="0" installname="w32kdll_2k3sp2.dll">
 	<importlibrary definition="w32kdll_2k3sp2.def" />
+	<define name="__USE_W32API" />
 	<file>w32kdll_2k3sp2.S</file>
 	<file>main.c</file>
 </module>
diff --git a/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild b/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild
index 2083f95151b..1434dacbe1e 100644
--- a/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild
+++ b/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild
@@ -1,5 +1,6 @@
 <module name="w32kdll_2ksp4" type="win32dll" entrypoint="0" installname="w32kdll_2ksp4.dll">
 	<importlibrary definition="w32kdll_2ksp4.def" />
+	<define name="__USE_W32API" />
 	<file>w32kdll_2ksp4.S</file>
 	<file>main.c</file>
 </module>
diff --git a/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild b/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild
index b81ecad236c..14575cc3f74 100644
--- a/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild
+++ b/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild
@@ -1,5 +1,6 @@
 <module name="w32kdll" type="win32dll" entrypoint="0" installname="w32kdll.dll">
 	<importlibrary definition="w32kdll_ros.def" />
+	<define name="__USE_W32API" />
 	<library>win32ksys</library>
 	<file>main.c</file>
 </module>
diff --git a/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild b/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild
index 68c9b18d23b..2856d9e7048 100644
--- a/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild
+++ b/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild
@@ -1,5 +1,6 @@
 <module name="w32kdll_vista" type="win32dll" entrypoint="0" installname="w32kdll_vista.dll">
 	<importlibrary definition="w32kdll_vista.def" />
+	<define name="__USE_W32API" />
 	<file>w32kdll_vista.S</file>
 	<file>main.c</file>
 </module>
diff --git a/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild b/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild
index d3467c48582..e1f324d0c95 100644
--- a/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild
+++ b/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild
@@ -1,5 +1,6 @@
 <module name="w32kdll_xpsp2" type="win32dll" entrypoint="0" installname="w32kdll_xpsp2.dll">
 	<importlibrary definition="w32kdll_xpsp2.def" />
+	<define name="__USE_W32API" />
 	<file>w32kdll_xpsp2.S</file>
 	<file>main.c</file>
 </module>
diff --git a/rostests/apitests/w32knapi/w32knapi.rbuild b/rostests/apitests/w32knapi/w32knapi.rbuild
index 3f662ed2263..197832cf04b 100644
--- a/rostests/apitests/w32knapi/w32knapi.rbuild
+++ b/rostests/apitests/w32knapi/w32knapi.rbuild
@@ -1,5 +1,6 @@
 <module name="w32knapi" type="win32cui">
 	<include base="w32knapi">.</include>
+	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/rostests/dibtests/alphablend/alphablend.rbuild b/rostests/dibtests/alphablend/alphablend.rbuild
index 93aa2f9f626..180b301b928 100644
--- a/rostests/dibtests/alphablend/alphablend.rbuild
+++ b/rostests/dibtests/alphablend/alphablend.rbuild
@@ -1,4 +1,5 @@
 <module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe">
+	<define name="__USE_W32API" />
 	<include base="alphablend">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/dibtests/bitblt/bitblt.rbuild b/rostests/dibtests/bitblt/bitblt.rbuild
index b1edc2681d7..b73af244acb 100644
--- a/rostests/dibtests/bitblt/bitblt.rbuild
+++ b/rostests/dibtests/bitblt/bitblt.rbuild
@@ -1,4 +1,5 @@
 <module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe">
+	<define name="__USE_W32API" />
 	<include base="bitblt">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/dibtests/bltrop/bltrop.rbuild b/rostests/dibtests/bltrop/bltrop.rbuild
index f90a27e67b6..9d1fd252be2 100644
--- a/rostests/dibtests/bltrop/bltrop.rbuild
+++ b/rostests/dibtests/bltrop/bltrop.rbuild
@@ -1,4 +1,5 @@
 <module name="bltrop" type="win32gui" installbase="bin" installname="bltrop.exe">
+	<define name="__USE_W32API" />
 	<include base="bltrop">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
diff --git a/rostests/dibtests/dibtest/dibtest.rbuild b/rostests/dibtests/dibtest/dibtest.rbuild
index 8fdd3d8e3eb..48653d8e47a 100644
--- a/rostests/dibtests/dibtest/dibtest.rbuild
+++ b/rostests/dibtests/dibtest/dibtest.rbuild
@@ -1,4 +1,5 @@
 <module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/dibtests/icontest/icontest.rbuild b/rostests/dibtests/icontest/icontest.rbuild
index 123afc227e5..37c01a5827b 100644
--- a/rostests/dibtests/icontest/icontest.rbuild
+++ b/rostests/dibtests/icontest/icontest.rbuild
@@ -1,4 +1,5 @@
 <module name="icontest" type="win32gui" installbase="bin" installname="icontest.exe">
+	<define name="__USE_W32API" />
 	<include base="icontest">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/dibtests/palbitblt/palbitblt.rbuild b/rostests/dibtests/palbitblt/palbitblt.rbuild
index cfbe6022715..badd99acf01 100644
--- a/rostests/dibtests/palbitblt/palbitblt.rbuild
+++ b/rostests/dibtests/palbitblt/palbitblt.rbuild
@@ -1,4 +1,5 @@
 <module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" stdlib="host">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/dibtests/patblt/patblt.rbuild b/rostests/dibtests/patblt/patblt.rbuild
index 3017fc94ff6..628d07f1bda 100644
--- a/rostests/dibtests/patblt/patblt.rbuild
+++ b/rostests/dibtests/patblt/patblt.rbuild
@@ -1,6 +1,8 @@
 <module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true" stdlib="host">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
+	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>patblt.cpp</file>
 </module>
diff --git a/rostests/dibtests/stretchblt/stretchblt.rbuild b/rostests/dibtests/stretchblt/stretchblt.rbuild
index 1fa762e5ab5..b2589c0bd48 100644
--- a/rostests/dibtests/stretchblt/stretchblt.rbuild
+++ b/rostests/dibtests/stretchblt/stretchblt.rbuild
@@ -1,6 +1,8 @@
 <module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.exe" stdlib="host">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
+	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>stretchblt.cpp</file>
 </module>
diff --git a/rostests/dibtests/vbltest/vbltest.rbuild b/rostests/dibtests/vbltest/vbltest.rbuild
index 75b26c96a48..5b8a0bb476d 100644
--- a/rostests/dibtests/vbltest/vbltest.rbuild
+++ b/rostests/dibtests/vbltest/vbltest.rbuild
@@ -1,4 +1,5 @@
 <module name="vbltest" type="win32gui" installbase="bin" installname="vbltest.exe">
+	<define name="__USE_W32API" />
 	<include base="vbltest">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/drivers/csqtest/csqtest.rbuild b/rostests/drivers/csqtest/csqtest.rbuild
index 222924a0ab0..4dd069c942c 100644
--- a/rostests/drivers/csqtest/csqtest.rbuild
+++ b/rostests/drivers/csqtest/csqtest.rbuild
@@ -1,5 +1,6 @@
 <module name="csqtest" type="kernelmodedriver" installbase="system32/drivers" installname="csqtest.sys">
 	<bootstrap base="$(CDOUTPUT)" />
+	<define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/rostests/drivers/kmtest/kmtest.rbuild b/rostests/drivers/kmtest/kmtest.rbuild
index 4b9a03692a3..23a65549f62 100644
--- a/rostests/drivers/kmtest/kmtest.rbuild
+++ b/rostests/drivers/kmtest/kmtest.rbuild
@@ -1,5 +1,6 @@
 <module name="kmtest" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest.sys">
 	<bootstrap base="$(CDOUTPUT)" />
+	<define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/rostests/drivers/memtest/memtest.rbuild b/rostests/drivers/memtest/memtest.rbuild
index 61cb6fec55d..e2f9bef5347 100644
--- a/rostests/drivers/memtest/memtest.rbuild
+++ b/rostests/drivers/memtest/memtest.rbuild
@@ -1,5 +1,6 @@
 <module name="memtest" type="kernelmodedriver" installbase="system32/drivers" installname="memtest.sys">
 	<bootstrap base="reactos" />
+        <define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/rostests/dxtest/ddraw/ddraw.rbuild b/rostests/dxtest/ddraw/ddraw.rbuild
index ba4507efc0b..dcc87186f24 100644
--- a/rostests/dxtest/ddraw/ddraw.rbuild
+++ b/rostests/dxtest/ddraw/ddraw.rbuild
@@ -1,5 +1,6 @@
-<module name="ddraw_test" type="win32cui" allowwarnings="false">
+<module name="ddraw_test" type="win32cui" allowwarnings="true">
 	<include base="ddraw_test">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
index 36d83106000..633b3566d53 100644
--- a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
+++ b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
@@ -1,4 +1,5 @@
 <module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ddraw</library>
diff --git a/rostests/tests/DxHalTest/DxHalTest.rbuild b/rostests/tests/DxHalTest/DxHalTest.rbuild
index e3465fd1bdb..6241a30e627 100644
--- a/rostests/tests/DxHalTest/DxHalTest.rbuild
+++ b/rostests/tests/DxHalTest/DxHalTest.rbuild
@@ -1,4 +1,5 @@
 <module name="dxhaltest" type="win32cui" installbase="bin" installname="dxhaltest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/Imagelistviewer/imagelistviewer.rbuild b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
index 8dc10735fa0..7abf5feafd1 100644
--- a/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
+++ b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
@@ -1,4 +1,5 @@
 <module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe">
+	<define name="__USE_W32API" />
 	<include base="Imagelistviewer">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/tests/accelerator/accelerator.rbuild b/rostests/tests/accelerator/accelerator.rbuild
index 245b6772ab8..370a2576d72 100644
--- a/rostests/tests/accelerator/accelerator.rbuild
+++ b/rostests/tests/accelerator/accelerator.rbuild
@@ -1,4 +1,5 @@
 <module name="accelerator" type="win32gui" installbase="bin" installname="accelerator.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/alive/alive.rbuild b/rostests/tests/alive/alive.rbuild
index 0888f4a0e75..8a7c2a3020c 100644
--- a/rostests/tests/alive/alive.rbuild
+++ b/rostests/tests/alive/alive.rbuild
@@ -1,4 +1,5 @@
 <module name="alive" type="win32cui" installbase="bin" installname="alive.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/apc/apc.rbuild b/rostests/tests/apc/apc.rbuild
index 8e31f903cc1..084fb179292 100644
--- a/rostests/tests/apc/apc.rbuild
+++ b/rostests/tests/apc/apc.rbuild
@@ -1,4 +1,5 @@
 <module name="apc" type="win32cui" installbase="bin" installname="apc.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>apc.c</file>
diff --git a/rostests/tests/apc2/apc2.rbuild b/rostests/tests/apc2/apc2.rbuild
index 25d8a343fc4..8f7b7652e02 100644
--- a/rostests/tests/apc2/apc2.rbuild
+++ b/rostests/tests/apc2/apc2.rbuild
@@ -1,4 +1,5 @@
 <module name="apc2" type="win32cui" installbase="bin" installname="apc2.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>apc2.c</file>
 </module>
diff --git a/rostests/tests/args/args.rbuild b/rostests/tests/args/args.rbuild
index 9fc67e12f1c..9f5d22d4072 100644
--- a/rostests/tests/args/args.rbuild
+++ b/rostests/tests/args/args.rbuild
@@ -1,4 +1,5 @@
 <module name="args" type="win32cui" installbase="bin" installname="args.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>args.c</file>
 </module>
diff --git a/rostests/tests/atomtest/atomtest.rbuild b/rostests/tests/atomtest/atomtest.rbuild
index a08c5e232d0..21c9de6bd4c 100644
--- a/rostests/tests/atomtest/atomtest.rbuild
+++ b/rostests/tests/atomtest/atomtest.rbuild
@@ -1,4 +1,5 @@
 <module name="atomtest" type="win32cui" installbase="bin" installname="atomtest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>atomtest.c</file>
diff --git a/rostests/tests/bench/bench.rbuild b/rostests/tests/bench/bench.rbuild
index 0ea1dbd8e12..8468e042107 100644
--- a/rostests/tests/bench/bench.rbuild
+++ b/rostests/tests/bench/bench.rbuild
@@ -1,4 +1,5 @@
 <module name="bench-thread" type="win32cui" installbase="bin" installname="bench-thread.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>bench-thread.c</file>
diff --git a/rostests/tests/button/button.rbuild b/rostests/tests/button/button.rbuild
index 10a30e7af49..a86fb193d6a 100644
--- a/rostests/tests/button/button.rbuild
+++ b/rostests/tests/button/button.rbuild
@@ -1,4 +1,5 @@
 <module name="button" type="win32gui" installbase="bin" installname="button.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/button2/button2.rbuild b/rostests/tests/button2/button2.rbuild
index 8b2915ea908..01c0b917f46 100644
--- a/rostests/tests/button2/button2.rbuild
+++ b/rostests/tests/button2/button2.rbuild
@@ -1,4 +1,5 @@
 <module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/capclock/capclock.rbuild b/rostests/tests/capclock/capclock.rbuild
index 5b1e6ced109..afe112f8809 100644
--- a/rostests/tests/capclock/capclock.rbuild
+++ b/rostests/tests/capclock/capclock.rbuild
@@ -1,4 +1,5 @@
 <module name="capclock" type="win32gui" installbase="bin" installname="capclock.exe">
+	<define name="__USE_W32API" />
 	<include base="capclock">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/tests/carets/carets.rbuild b/rostests/tests/carets/carets.rbuild
index a4efacaad4c..064735cd71b 100644
--- a/rostests/tests/carets/carets.rbuild
+++ b/rostests/tests/carets/carets.rbuild
@@ -1,4 +1,5 @@
 <module name="carets" type="win32gui" installbase="bin" installname="carets.exe">
+	<define name="__USE_W32API" />
 	<include base="carets">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/tests/combotst/combotst.rbuild b/rostests/tests/combotst/combotst.rbuild
index e22dd0aff18..1daa2728c1b 100644
--- a/rostests/tests/combotst/combotst.rbuild
+++ b/rostests/tests/combotst/combotst.rbuild
@@ -1,4 +1,5 @@
 <module name="combotst" type="win32gui" installbase="bin" installname="combotst.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/consume/consume.rbuild b/rostests/tests/consume/consume.rbuild
index a37f6934496..b515f419f2e 100644
--- a/rostests/tests/consume/consume.rbuild
+++ b/rostests/tests/consume/consume.rbuild
@@ -1,4 +1,5 @@
 <module name="consume" type="win32cui" installbase="bin" installname="consume.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>consume.c</file>
diff --git a/rostests/tests/copymove/copymove.rbuild b/rostests/tests/copymove/copymove.rbuild
index 9644f80590b..9613bd182ca 100644
--- a/rostests/tests/copymove/copymove.rbuild
+++ b/rostests/tests/copymove/copymove.rbuild
@@ -1,4 +1,5 @@
 <module name="copymove" type="win32cui" installbase="bin" installname="copymove.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>copymove.c</file>
diff --git a/rostests/tests/count/count.rbuild b/rostests/tests/count/count.rbuild
index 5551dc0a11d..a85863971b5 100644
--- a/rostests/tests/count/count.rbuild
+++ b/rostests/tests/count/count.rbuild
@@ -1,4 +1,5 @@
 <module name="count" type="win32cui" installbase="bin" installname="count.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>count.c</file>
diff --git a/rostests/tests/create-links/create-links.rbuild b/rostests/tests/create-links/create-links.rbuild
index a6c901c621d..6e9ba0d5a3a 100644
--- a/rostests/tests/create-links/create-links.rbuild
+++ b/rostests/tests/create-links/create-links.rbuild
@@ -1,4 +1,5 @@
 <module name="create-links" type="win32cui" installbase="bin" installname="create-links.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ole32</library>
diff --git a/rostests/tests/dirdlg/dirdlg.rbuild b/rostests/tests/dirdlg/dirdlg.rbuild
index fd90b46d498..e80909ba03c 100644
--- a/rostests/tests/dirdlg/dirdlg.rbuild
+++ b/rostests/tests/dirdlg/dirdlg.rbuild
@@ -1,4 +1,5 @@
 <module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe">
+	<define name="__USE_W32API" />
 	<include base="dirdlg">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/tests/diskspeed/diskspeed.rbuild b/rostests/tests/diskspeed/diskspeed.rbuild
index 0f24bc62c47..b119d6699fc 100644
--- a/rostests/tests/diskspeed/diskspeed.rbuild
+++ b/rostests/tests/diskspeed/diskspeed.rbuild
@@ -1,4 +1,5 @@
 <module name="diskspeed" type="win32cui" installbase="bin" installname="diskspeed.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>diskspeed.c</file>
diff --git a/rostests/tests/dnsapi/dnsapi.rbuild b/rostests/tests/dnsapi/dnsapi.rbuild
index 3dead460817..ddc3e90eb01 100644
--- a/rostests/tests/dnsapi/dnsapi.rbuild
+++ b/rostests/tests/dnsapi/dnsapi.rbuild
@@ -1,4 +1,5 @@
 <module name="dnsapitst" type="win32cui" installbase="bin" installname="dnsapitst.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>dnsapi</library>
 	<library>ws2_32</library>
diff --git a/rostests/tests/dnsquery/dnsquery.rbuild b/rostests/tests/dnsquery/dnsquery.rbuild
index 9883d97e65f..506e29d2d73 100644
--- a/rostests/tests/dnsquery/dnsquery.rbuild
+++ b/rostests/tests/dnsquery/dnsquery.rbuild
@@ -1,4 +1,5 @@
 <module name="dnsquery" type="win32gui" installbase="bin" installname="dnsquery.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>dnsapi</library>
 	<library>ws2_32</library>
diff --git a/rostests/tests/edit/edit.rbuild b/rostests/tests/edit/edit.rbuild
index fbb833be9c5..62b0d26dfb1 100644
--- a/rostests/tests/edit/edit.rbuild
+++ b/rostests/tests/edit/edit.rbuild
@@ -1,4 +1,5 @@
 <module name="edit" type="win32gui" installbase="bin" installname="edit.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/enhmetafile/enhmetafile.rbuild b/rostests/tests/enhmetafile/enhmetafile.rbuild
index 92f4f4d1a48..ef26fa7f107 100644
--- a/rostests/tests/enhmetafile/enhmetafile.rbuild
+++ b/rostests/tests/enhmetafile/enhmetafile.rbuild
@@ -1,4 +1,5 @@
 <module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/enumfonts/enumfonts.rbuild b/rostests/tests/enumfonts/enumfonts.rbuild
index c6773b4540c..a49fa60eebd 100644
--- a/rostests/tests/enumfonts/enumfonts.rbuild
+++ b/rostests/tests/enumfonts/enumfonts.rbuild
@@ -1,6 +1,8 @@
 <module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe" stdlib="host">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
+	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>enumfonts.cpp</file>
 </module>
diff --git a/rostests/tests/enumwnd/enumwnd.rbuild b/rostests/tests/enumwnd/enumwnd.rbuild
index c44ff096744..6e2613f3a6f 100644
--- a/rostests/tests/enumwnd/enumwnd.rbuild
+++ b/rostests/tests/enumwnd/enumwnd.rbuild
@@ -1,4 +1,5 @@
 <module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/enumws/enumws.rbuild b/rostests/tests/enumws/enumws.rbuild
index f58aeffd65b..f36710ad0d3 100644
--- a/rostests/tests/enumws/enumws.rbuild
+++ b/rostests/tests/enumws/enumws.rbuild
@@ -1,4 +1,5 @@
 <module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/event/event.rbuild b/rostests/tests/event/event.rbuild
index 53c6eea4d96..f1d9211b71b 100644
--- a/rostests/tests/event/event.rbuild
+++ b/rostests/tests/event/event.rbuild
@@ -1,4 +1,5 @@
 <module name="event" type="win32gui" installbase="bin" installname="event.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>event.c</file>
diff --git a/rostests/tests/fiber/fiber.rbuild b/rostests/tests/fiber/fiber.rbuild
index 02e52ea088c..e63868204e3 100644
--- a/rostests/tests/fiber/fiber.rbuild
+++ b/rostests/tests/fiber/fiber.rbuild
@@ -1,4 +1,5 @@
 <module name="fiber" type="win32cui" installbase="bin" installname="fiber.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>fiber.c</file>
diff --git a/rostests/tests/gethostbyname/gethostbyname.rbuild b/rostests/tests/gethostbyname/gethostbyname.rbuild
index e3caab96c5e..252d4eb8eaa 100644
--- a/rostests/tests/gethostbyname/gethostbyname.rbuild
+++ b/rostests/tests/gethostbyname/gethostbyname.rbuild
@@ -1,4 +1,5 @@
 <module name="gethostbyname" type="win32gui" installbase="bin" installname="gethostbyname.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>gethostbyname.c</file>
diff --git a/rostests/tests/global_mem/global_mem.rbuild b/rostests/tests/global_mem/global_mem.rbuild
index 6fbddd92e07..7dda70dfc7e 100644
--- a/rostests/tests/global_mem/global_mem.rbuild
+++ b/rostests/tests/global_mem/global_mem.rbuild
@@ -1,4 +1,5 @@
 <module name="global_mem" type="win32gui" installbase="bin" installname="global_mem.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>global_mem.c</file>
diff --git a/rostests/tests/gradient/gradient.rbuild b/rostests/tests/gradient/gradient.rbuild
index b15629cd935..e89f12414df 100644
--- a/rostests/tests/gradient/gradient.rbuild
+++ b/rostests/tests/gradient/gradient.rbuild
@@ -1,4 +1,5 @@
 <module name="gradient" type="win32gui" installbase="bin" installname="gradient.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/guithreadinfo/guithreadinfo.rbuild b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
index 72397795b47..ee7ed42f310 100644
--- a/rostests/tests/guithreadinfo/guithreadinfo.rbuild
+++ b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
@@ -1,4 +1,5 @@
 <module name="guithreadinfo" type="win32gui" installbase="bin" installname="guithreadinfo.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>guithreadinfo.c</file>
diff --git a/rostests/tests/hello/hello.rbuild b/rostests/tests/hello/hello.rbuild
index 8b126e1a394..918d5901844 100644
--- a/rostests/tests/hello/hello.rbuild
+++ b/rostests/tests/hello/hello.rbuild
@@ -1,4 +1,5 @@
 <module name="hello" type="win32cui" installbase="bin" installname="hello.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/hivetest/hivetest.rbuild b/rostests/tests/hivetest/hivetest.rbuild
index 34ad447bfc9..acc8a74152f 100644
--- a/rostests/tests/hivetest/hivetest.rbuild
+++ b/rostests/tests/hivetest/hivetest.rbuild
@@ -1,4 +1,5 @@
 <module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>
diff --git a/rostests/tests/iptest/iptest.rbuild b/rostests/tests/iptest/iptest.rbuild
index 3baa33d2399..bbf7bd433de 100644
--- a/rostests/tests/iptest/iptest.rbuild
+++ b/rostests/tests/iptest/iptest.rbuild
@@ -1,4 +1,5 @@
 <module name="iptest" type="win32gui" installbase="bin" installname="iptest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>iptest.cpp</file>
diff --git a/rostests/tests/isotest/isotest.rbuild b/rostests/tests/isotest/isotest.rbuild
index a3f5921285e..5b4cbb82832 100644
--- a/rostests/tests/isotest/isotest.rbuild
+++ b/rostests/tests/isotest/isotest.rbuild
@@ -1,4 +1,5 @@
 <module name="isotest" type="win32cui" installbase="bin" installname="isotest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>isotest.c</file>
diff --git a/rostests/tests/lantst/lantest.rbuild b/rostests/tests/lantst/lantest.rbuild
index a1cfc272032..919afc885d8 100644
--- a/rostests/tests/lantst/lantest.rbuild
+++ b/rostests/tests/lantst/lantest.rbuild
@@ -1,4 +1,5 @@
 <module name="lantest" type="win32gui" installbase="bin" installname="lantest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>lantest.cpp</file>
diff --git a/rostests/tests/lineclip/lineclip.rbuild b/rostests/tests/lineclip/lineclip.rbuild
index c631a8a94a7..c1824d10239 100644
--- a/rostests/tests/lineclip/lineclip.rbuild
+++ b/rostests/tests/lineclip/lineclip.rbuild
@@ -1,4 +1,5 @@
 <module name="lineclip" type="win32gui" installbase="bin" installname="lineclip.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/linetest/linetest.rbuild b/rostests/tests/linetest/linetest.rbuild
index 9efb94a00e6..bbe598b1533 100644
--- a/rostests/tests/linetest/linetest.rbuild
+++ b/rostests/tests/linetest/linetest.rbuild
@@ -1,4 +1,5 @@
 <module name="linetest" type="win32gui" installbase="bin" installname="linetest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/lpctst/lpctst.rbuild b/rostests/tests/lpctst/lpctst.rbuild
index b2936689a76..c6ccf3c9956 100644
--- a/rostests/tests/lpctst/lpctst.rbuild
+++ b/rostests/tests/lpctst/lpctst.rbuild
@@ -1,4 +1,5 @@
 <module name="lpctst" type="win32gui" installbase="bin" installname="lpctst.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>lpctst.c</file>
diff --git a/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
index 9429d5ebf81..7f0ec15dbfc 100644
--- a/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
+++ b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
@@ -1,4 +1,5 @@
 <module name="map_dup_inherit" type="win32cui" installbase="bin" installname="map_dup_inherit.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>map_dup_inherit.c</file>
diff --git a/rostests/tests/mdi/mdi.rbuild b/rostests/tests/mdi/mdi.rbuild
index 98ed290fbae..f1ef0757623 100644
--- a/rostests/tests/mdi/mdi.rbuild
+++ b/rostests/tests/mdi/mdi.rbuild
@@ -1,4 +1,6 @@
 <module name="mdi" type="win32gui" installbase="bin" installname="mdi.exe">
+	<define name="__USE_W32API" />
+	<include base="mdi">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/miditest/miditest.rbuild b/rostests/tests/miditest/miditest.rbuild
index 9103c3b8c8f..18bdd93f29b 100644
--- a/rostests/tests/miditest/miditest.rbuild
+++ b/rostests/tests/miditest/miditest.rbuild
@@ -1,4 +1,6 @@
 <module name="miditest" type="win32gui" installbase="bin" installname="miditest.exe">
+	<define name="__USE_W32API" />
+	<include base="miditest">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>
diff --git a/rostests/tests/mktime/mktime.rbuild b/rostests/tests/mktime/mktime.rbuild
index 4a5fee25242..c257236950d 100644
--- a/rostests/tests/mktime/mktime.rbuild
+++ b/rostests/tests/mktime/mktime.rbuild
@@ -1,4 +1,5 @@
 <module name="mktime" type="win32gui" installbase="bin" installname="mktime.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mktime.c</file>
diff --git a/rostests/tests/moztest/moztest.rbuild b/rostests/tests/moztest/moztest.rbuild
index facd6f53a2f..1c8fee634ba 100644
--- a/rostests/tests/moztest/moztest.rbuild
+++ b/rostests/tests/moztest/moztest.rbuild
@@ -1,4 +1,5 @@
 <module name="moztest" type="win32cui" installbase="bin" installname="moztest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>ws2_32</library>
diff --git a/rostests/tests/mstest/mstest.rbuild b/rostests/tests/mstest/mstest.rbuild
index 62e7b39c78f..1c27f59ed8b 100644
--- a/rostests/tests/mstest/mstest.rbuild
+++ b/rostests/tests/mstest/mstest.rbuild
@@ -1,4 +1,5 @@
 <module name="mstest" type="win32gui" installbase="bin" installname="mstest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mstest.c</file>
diff --git a/rostests/tests/multithrdwin/multithrdwin.rbuild b/rostests/tests/multithrdwin/multithrdwin.rbuild
index 86a6b7363b9..2f6bcfa9173 100644
--- a/rostests/tests/multithrdwin/multithrdwin.rbuild
+++ b/rostests/tests/multithrdwin/multithrdwin.rbuild
@@ -1,4 +1,5 @@
 <module name="multithrdwin" type="win32gui" installbase="bin" installname="multithrdwin.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/multiwin/multiwin.rbuild b/rostests/tests/multiwin/multiwin.rbuild
index d585e37eb78..355f8860180 100644
--- a/rostests/tests/multiwin/multiwin.rbuild
+++ b/rostests/tests/multiwin/multiwin.rbuild
@@ -1,4 +1,5 @@
 <module name="multiwin" type="win32gui" installbase="bin" installname="multiwin.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/mutex/mutex.rbuild b/rostests/tests/mutex/mutex.rbuild
index 8c6cb6e8072..1000ad3dce8 100644
--- a/rostests/tests/mutex/mutex.rbuild
+++ b/rostests/tests/mutex/mutex.rbuild
@@ -1,4 +1,5 @@
 <module name="mutex" type="win32gui" installbase="bin" installname="mutex.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mutex.c</file>
diff --git a/rostests/tests/nameserverlist/nameserverlist.rbuild b/rostests/tests/nameserverlist/nameserverlist.rbuild
index 8c2294502e3..49323bd46a1 100644
--- a/rostests/tests/nameserverlist/nameserverlist.rbuild
+++ b/rostests/tests/nameserverlist/nameserverlist.rbuild
@@ -1,4 +1,5 @@
 <module name="nameserverlist" type="win32cui" installbase="bin" installname="nameserverlist.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<file>nameserverlist.c</file>
diff --git a/rostests/tests/noexecute/noexecute.rbuild b/rostests/tests/noexecute/noexecute.rbuild
index e543938efea..1cdee3b21f5 100644
--- a/rostests/tests/noexecute/noexecute.rbuild
+++ b/rostests/tests/noexecute/noexecute.rbuild
@@ -1,4 +1,5 @@
 <module name="noexecute" type="win32cui" installbase="bin" installname="noexecute.exe">
+	<define name="__USE_W32API" />
 	<library>pseh</library>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/tests/nptest/nptest.rbuild b/rostests/tests/nptest/nptest.rbuild
index 88d772da864..84d3318fd65 100644
--- a/rostests/tests/nptest/nptest.rbuild
+++ b/rostests/tests/nptest/nptest.rbuild
@@ -1,4 +1,5 @@
 <module name="nptest" type="win32gui" installbase="bin" installname="nptest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>nptest.c</file>
diff --git a/rostests/tests/oskittcp/oskittcp.rbuild b/rostests/tests/oskittcp/oskittcp.rbuild
index 21e7ef0116d..8ec4cd64970 100644
--- a/rostests/tests/oskittcp/oskittcp.rbuild
+++ b/rostests/tests/oskittcp/oskittcp.rbuild
@@ -1,4 +1,5 @@
 <module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tcptest.cpp</file>
diff --git a/rostests/tests/p_dup_handle/p_dup_handle.rbuild b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
index 5bcead2aa0a..ba5d384e699 100644
--- a/rostests/tests/p_dup_handle/p_dup_handle.rbuild
+++ b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
@@ -1,4 +1,5 @@
 <module name="p_dup_handle" type="win32cui" installbase="bin" installname="p_dup_handle.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>p_dup_handle.c</file>
diff --git a/rostests/tests/polytest/polytest.rbuild b/rostests/tests/polytest/polytest.rbuild
index e94ad02e659..03fb4728def 100644
--- a/rostests/tests/polytest/polytest.rbuild
+++ b/rostests/tests/polytest/polytest.rbuild
@@ -1,4 +1,5 @@
 <module name="polytest" type="win32gui" installbase="bin" installname="polytest.exe" allowwarnings="true">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>polytest.cpp</file>
diff --git a/rostests/tests/popupmenu/popupmenu.rbuild b/rostests/tests/popupmenu/popupmenu.rbuild
index 1b8e6aca0b4..0373de58978 100644
--- a/rostests/tests/popupmenu/popupmenu.rbuild
+++ b/rostests/tests/popupmenu/popupmenu.rbuild
@@ -1,4 +1,5 @@
 <module name="popupmenu" type="win32gui" installbase="bin" installname="popupmenu.exe">
+	<define name="__USE_W32API" />
 	<include base="popupmenu">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/tests/primitives/primitives.rbuild b/rostests/tests/primitives/primitives.rbuild
index f9310e81098..bcb14c0f831 100644
--- a/rostests/tests/primitives/primitives.rbuild
+++ b/rostests/tests/primitives/primitives.rbuild
@@ -1,7 +1,9 @@
 <module name="primitives" type="win32gui" installbase="bin" installname="primitives.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
+	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>primitives.cpp</file>
 	<file>mk_font.cpp</file>
 </module>
diff --git a/rostests/tests/pteb/pteb.rbuild b/rostests/tests/pteb/pteb.rbuild
index bf01de681e1..fd303843aea 100644
--- a/rostests/tests/pteb/pteb.rbuild
+++ b/rostests/tests/pteb/pteb.rbuild
@@ -1,4 +1,5 @@
 <module name="pteb" type="win32gui" installbase="bin" installname="pteb.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>pteb.c</file>
diff --git a/rostests/tests/readconsole/readconsole.rbuild b/rostests/tests/readconsole/readconsole.rbuild
index 31cdbc2309c..2a1512e5e37 100644
--- a/rostests/tests/readconsole/readconsole.rbuild
+++ b/rostests/tests/readconsole/readconsole.rbuild
@@ -1,4 +1,7 @@
 <module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe">
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>main.c</file>
 </module>
diff --git a/rostests/tests/regdump/regdump.rbuild b/rostests/tests/regdump/regdump.rbuild
index e475c049a71..9778749b99f 100644
--- a/rostests/tests/regdump/regdump.rbuild
+++ b/rostests/tests/regdump/regdump.rbuild
@@ -1,4 +1,5 @@
 <module name="regdump" type="win32cui" installbase="bin" installname="regdump.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/regqueryvalue/regqueryvalue.rbuild b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
index 482ada835b4..3b493cf13b9 100644
--- a/rostests/tests/regqueryvalue/regqueryvalue.rbuild
+++ b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
@@ -1,4 +1,5 @@
 <module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
diff --git a/rostests/tests/regtest/regtest.rbuild b/rostests/tests/regtest/regtest.rbuild
index be8c2d61351..1751d12cf8d 100644
--- a/rostests/tests/regtest/regtest.rbuild
+++ b/rostests/tests/regtest/regtest.rbuild
@@ -1,4 +1,5 @@
 <module name="regtest" type="win32gui" installbase="bin" installname="regtest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>regtest.c</file>
diff --git a/rostests/tests/sectest/sectest.rbuild b/rostests/tests/sectest/sectest.rbuild
index f26b607dd5d..8013b9cebed 100644
--- a/rostests/tests/sectest/sectest.rbuild
+++ b/rostests/tests/sectest/sectest.rbuild
@@ -1,4 +1,5 @@
 <module name="sectest" type="win32gui" installbase="bin" installname="sectest.exe" allowwarnings="true">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>sectest.c</file>
diff --git a/rostests/tests/sertest/sertest.rbuild b/rostests/tests/sertest/sertest.rbuild
index eb50480c0b7..63d92bb5691 100644
--- a/rostests/tests/sertest/sertest.rbuild
+++ b/rostests/tests/sertest/sertest.rbuild
@@ -1,4 +1,5 @@
 <module name="sertest" type="win32gui" installbase="bin" installname="sertest.exe" allowwarnings="true">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>sertest.c</file>
diff --git a/rostests/tests/shaptest/shaptest.rbuild b/rostests/tests/shaptest/shaptest.rbuild
index bca071b401f..a06bf5c3882 100644
--- a/rostests/tests/shaptest/shaptest.rbuild
+++ b/rostests/tests/shaptest/shaptest.rbuild
@@ -1,4 +1,5 @@
 <module name="shaptest" type="win32gui" installbase="bin" installname="shaptest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/shm/shm.rbuild b/rostests/tests/shm/shm.rbuild
index 6e2bcbcfe02..0f4efd937f6 100644
--- a/rostests/tests/shm/shm.rbuild
+++ b/rostests/tests/shm/shm.rbuild
@@ -1,4 +1,5 @@
 <module name="shm" type="win32gui" installbase="bin" installname="shm.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>shm.c</file>
diff --git a/rostests/tests/statst/statst.rbuild b/rostests/tests/statst/statst.rbuild
index 90f6315b61d..07da4d0541d 100644
--- a/rostests/tests/statst/statst.rbuild
+++ b/rostests/tests/statst/statst.rbuild
@@ -1,4 +1,5 @@
 <module name="statst" type="win32gui" installbase="bin" installname="statst.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/statst2/statst2.rbuild b/rostests/tests/statst2/statst2.rbuild
index 898ec415a30..55abda20797 100644
--- a/rostests/tests/statst2/statst2.rbuild
+++ b/rostests/tests/statst2/statst2.rbuild
@@ -1,4 +1,5 @@
 <module name="statst2" type="win32gui" installbase="bin" installname="statst2.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/subclass/subclass.rbuild b/rostests/tests/subclass/subclass.rbuild
index fc3d9fa90a9..84d1b71676b 100644
--- a/rostests/tests/subclass/subclass.rbuild
+++ b/rostests/tests/subclass/subclass.rbuild
@@ -1,4 +1,5 @@
 <module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/suspend/suspend.rbuild b/rostests/tests/suspend/suspend.rbuild
index 0d532e8e368..185f63a8350 100644
--- a/rostests/tests/suspend/suspend.rbuild
+++ b/rostests/tests/suspend/suspend.rbuild
@@ -1,4 +1,5 @@
 <module name="suspend" type="win32gui" installbase="bin" installname="suspend.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>suspend.c</file>
diff --git a/rostests/tests/tcpsvr/tcpsvr.rbuild b/rostests/tests/tcpsvr/tcpsvr.rbuild
index fe8ab81f9a2..58bf684d29a 100644
--- a/rostests/tests/tcpsvr/tcpsvr.rbuild
+++ b/rostests/tests/tcpsvr/tcpsvr.rbuild
@@ -1,4 +1,5 @@
 <module name="tcpsvr" type="win32cui" installbase="bin" installname="tcpsvr.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>tcpsvr.c</file>
diff --git a/rostests/tests/terminate/terminate.rbuild b/rostests/tests/terminate/terminate.rbuild
index 750ac884cc3..cde579a053c 100644
--- a/rostests/tests/terminate/terminate.rbuild
+++ b/rostests/tests/terminate/terminate.rbuild
@@ -1,4 +1,5 @@
 <module name="terminate" type="win32cui" installbase="bin" installname="terminate.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>terminate.c</file>
diff --git a/rostests/tests/thread/thread.rbuild b/rostests/tests/thread/thread.rbuild
index 3d3efdda624..8580ac6f3e2 100644
--- a/rostests/tests/thread/thread.rbuild
+++ b/rostests/tests/thread/thread.rbuild
@@ -1,4 +1,5 @@
 <module name="thread" type="win32gui" installbase="bin" installname="thread.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>thread.c</file>
diff --git a/rostests/tests/thread_msg/thread_msg.rbuild b/rostests/tests/thread_msg/thread_msg.rbuild
index ed655fbcbce..44ff078ae6f 100644
--- a/rostests/tests/thread_msg/thread_msg.rbuild
+++ b/rostests/tests/thread_msg/thread_msg.rbuild
@@ -1,4 +1,5 @@
 <module name="thread_msg" type="win32gui" installbase="bin" installname="thread_msg.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/threadwait/threadwait.rbuild b/rostests/tests/threadwait/threadwait.rbuild
index ee9722722a6..ed50113bc3c 100644
--- a/rostests/tests/threadwait/threadwait.rbuild
+++ b/rostests/tests/threadwait/threadwait.rbuild
@@ -1,4 +1,5 @@
 <module name="threadwait" type="win32gui" installbase="bin" installname="threadwait.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>threadwait.c</file>
diff --git a/rostests/tests/tmrqueue/tmrqueue.rbuild b/rostests/tests/tmrqueue/tmrqueue.rbuild
index 9d7e67a5e9f..ea448810aa1 100644
--- a/rostests/tests/tmrqueue/tmrqueue.rbuild
+++ b/rostests/tests/tmrqueue/tmrqueue.rbuild
@@ -1,4 +1,5 @@
 <module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tmrqueue.c</file>
diff --git a/rostests/tests/tokentest/tokentest.rbuild b/rostests/tests/tokentest/tokentest.rbuild
index ecab4815597..8674629f706 100644
--- a/rostests/tests/tokentest/tokentest.rbuild
+++ b/rostests/tests/tokentest/tokentest.rbuild
@@ -1,4 +1,5 @@
 <module name="tokentest" type="win32gui" installbase="bin" installname="tokentest.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tokentest.c</file>
diff --git a/rostests/tests/txtscale/txtscale.rbuild b/rostests/tests/txtscale/txtscale.rbuild
index 3be68892d01..400b9ebea6a 100644
--- a/rostests/tests/txtscale/txtscale.rbuild
+++ b/rostests/tests/txtscale/txtscale.rbuild
@@ -1,8 +1,10 @@
 <module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe" allowwarnings ="true" stdlib="host">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
+	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>txtscale.cpp</file>
 	<file>mk_font.cpp</file>
 </module>
diff --git a/rostests/tests/vmtest/vmtest.rbuild b/rostests/tests/vmtest/vmtest.rbuild
index 22440409426..7993de4ab71 100644
--- a/rostests/tests/vmtest/vmtest.rbuild
+++ b/rostests/tests/vmtest/vmtest.rbuild
@@ -1,4 +1,5 @@
 <module name="vmtest" type="win32cui" installbase="bin" installname="vmtest.exe" allowwarnings="true">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>vmtest.c</file>
diff --git a/rostests/tests/wclickat/wclickat.rbuild b/rostests/tests/wclickat/wclickat.rbuild
index 0c08d47fa22..0aeb7fe20cf 100644
--- a/rostests/tests/wclickat/wclickat.rbuild
+++ b/rostests/tests/wclickat/wclickat.rbuild
@@ -1,4 +1,5 @@
 <module name="wclickat" type="win32gui" installbase="bin" installname="wclickat.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/winhello/winhello.rbuild b/rostests/tests/winhello/winhello.rbuild
index d18991f744e..a18c739e0f4 100644
--- a/rostests/tests/winhello/winhello.rbuild
+++ b/rostests/tests/winhello/winhello.rbuild
@@ -1,4 +1,5 @@
 <module name="winhello" type="win32gui" installbase="bin" installname="winhello.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
index 4a3ab103065..a509a11d5b1 100644
--- a/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
+++ b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
@@ -1,6 +1,8 @@
 <module name="wm_erasebkgnd" type="win32gui" installbase="bin" installname="wm_erasebkgnd.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
+	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>wm_erasebkgnd.cpp</file>
 </module>
diff --git a/rostests/tests/wm_paint/wm_paint.rbuild b/rostests/tests/wm_paint/wm_paint.rbuild
index e9cf18170f7..66e9e590f51 100644
--- a/rostests/tests/wm_paint/wm_paint.rbuild
+++ b/rostests/tests/wm_paint/wm_paint.rbuild
@@ -1,4 +1,5 @@
 <module name="wm_paint" type="win32gui" installbase="bin" installname="wm_paint.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/wpickclick/wpickclick.rbuild b/rostests/tests/wpickclick/wpickclick.rbuild
index 380964d4262..a7e15426d1d 100644
--- a/rostests/tests/wpickclick/wpickclick.rbuild
+++ b/rostests/tests/wpickclick/wpickclick.rbuild
@@ -1,4 +1,5 @@
 <module name="wpickclick" type="win32gui" installbase="bin" installname="wpickclick.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>wpickclick.c</file>
diff --git a/rostests/tests/zwcontinue/zwcontinue.rbuild b/rostests/tests/zwcontinue/zwcontinue.rbuild
index 8eda36b9fa4..fb58880840c 100644
--- a/rostests/tests/zwcontinue/zwcontinue.rbuild
+++ b/rostests/tests/zwcontinue/zwcontinue.rbuild
@@ -1,4 +1,5 @@
 <module name="zwcontinue" type="win32gui" installbase="bin" installname="zwcontinue.exe">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>zwcontinue.c</file>
diff --git a/rostests/win32/cmd/cmd_test.rbuild b/rostests/win32/cmd/cmd_test.rbuild
index 954f9292a98..57cdf55bdec 100644
--- a/rostests/win32/cmd/cmd_test.rbuild
+++ b/rostests/win32/cmd/cmd_test.rbuild
@@ -2,8 +2,9 @@
 	<include base="rtshared">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd">.</include>
+	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
-	<redefine name="_WIN32_WINNT">0x501</redefine>
+	<define name="_WIN32_WINNT">0x0501</define>
 	<library>rtshared</library>
 	<library>regtests</library>
 	<library>cmd_base</library>
diff --git a/rostests/win32/kernel32/queuetest/queuetest.rbuild b/rostests/win32/kernel32/queuetest/queuetest.rbuild
index 483e5d83fc3..4b11aed27ea 100644
--- a/rostests/win32/kernel32/queuetest/queuetest.rbuild
+++ b/rostests/win32/kernel32/queuetest/queuetest.rbuild
@@ -1,4 +1,5 @@
 <module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe">
+        <define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>queuetest.c</file>
 </module>
diff --git a/rostests/win32/kmtloader/kmtloader.rbuild b/rostests/win32/kmtloader/kmtloader.rbuild
index fa40a2d6449..56afda216c8 100644
--- a/rostests/win32/kmtloader/kmtloader.rbuild
+++ b/rostests/win32/kmtloader/kmtloader.rbuild
@@ -1,4 +1,5 @@
 <module name="kmtloader" type="win32cui" installbase="system32" installname="kmtloader.exe">
+        <define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>kmtloader.c</file>
diff --git a/rostests/win32/smss/movefile/movefile.rbuild b/rostests/win32/smss/movefile/movefile.rbuild
index f3c763ea721..306005c7a6e 100644
--- a/rostests/win32/smss/movefile/movefile.rbuild
+++ b/rostests/win32/smss/movefile/movefile.rbuild
@@ -1,5 +1,6 @@
 <module name="movefile" type="win32cui" installbase="system32" installname="movefiletest.exe">
 	<include base="movefile">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
diff --git a/rostests/win32/user32/drawcaption/capicon.c b/rostests/win32/user32/drawcaption/capicon.c
index c113b4dbdf8..cef5ca22f3c 100644
--- a/rostests/win32/user32/drawcaption/capicon.c
+++ b/rostests/win32/user32/drawcaption/capicon.c
@@ -63,7 +63,7 @@ LRESULT CALLBACK WndProc(HWND hWnd,
 }
 
 
-int wmain(int argc, wchar_t**argv)
+INT main(INT argc, CHAR **argv)
 {
 	HWND hWnd;
 	MSG msg;
@@ -83,7 +83,7 @@ int wmain(int argc, wchar_t**argv)
 		return 0;
 	}
 
-	testnum = _wtoi(argv[1]);
+	testnum = atoi(argv[1]);
 	if(testnum < 1 || testnum > 5)
 	{
 		printf("Unknown test %d\n", testnum);
diff --git a/rostests/win32/user32/drawcaption/drawcap.c b/rostests/win32/user32/drawcaption/drawcap.c
index 2e31ee4e748..601d49f1520 100644
--- a/rostests/win32/user32/drawcaption/drawcap.c
+++ b/rostests/win32/user32/drawcaption/drawcap.c
@@ -180,7 +180,7 @@ LRESULT CALLBACK CaptWndProc(HWND hWnd,
 }
 
 
-int wmain(int argc, wchar_t**argv)
+INT main(INT argc, CHAR **argv)
 {
 	HWND hWnd;
 	MSG msg;
@@ -205,7 +205,7 @@ int wmain(int argc, wchar_t**argv)
 		return 0;
 	}
 
-	testnum = _wtoi(argv[1]);
+	testnum = atoi(argv[1]);
 	if(testnum < 1 || testnum > 8)
 	{
 		printf("Unknown test %d\n", testnum);
diff --git a/rostests/win32/user32/drawcaption/drawcaption.rbuild b/rostests/win32/user32/drawcaption/drawcaption.rbuild
index 7316fcecff2..6a7a720fb2e 100644
--- a/rostests/win32/user32/drawcaption/drawcaption.rbuild
+++ b/rostests/win32/user32/drawcaption/drawcaption.rbuild
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <group>
-<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe" unicode="true">
+<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe">
 	<include base="drawcap">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
@@ -10,8 +13,11 @@
 	<file>drawcap.rc</file>
 </module>
 
-<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe" unicode="true">
+<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe">
 	<include base="capicon">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/win32/user32/kbdlayout/kbdlayout.rbuild b/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
index d2d1b58a459..fe7706ef401 100644
--- a/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
+++ b/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
@@ -1,5 +1,7 @@
 <module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe">
 	<include base="kbdlayout">.</include>
+	<define name="__USE_W32API" />
+	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/win32/user32/sysicon/sysicon.c b/rostests/win32/user32/sysicon/sysicon.c
index 0e74fbbcbd5..84802a1dfb8 100644
--- a/rostests/win32/user32/sysicon/sysicon.c
+++ b/rostests/win32/user32/sysicon/sysicon.c
@@ -66,9 +66,9 @@ LRESULT CALLBACK WndProc(HWND hWnd,
 	return DefWindowProc(hWnd, msg, wParam, lParam);
 }
 
-int APIENTRY wWinMain(HINSTANCE hInst,
+int APIENTRY WinMain(HINSTANCE hInst,
     HINSTANCE hPrevInstance,
-    LPWSTR lpCmdLine,
+    LPSTR lpCmdLine,
     int nCmdShow)
 {
 	HWND hWnd1, hWnd2, hWnd3;
diff --git a/rostests/win32/user32/sysicon/sysicon.rbuild b/rostests/win32/user32/sysicon/sysicon.rbuild
index f71133422b8..d3d088a8ef2 100644
--- a/rostests/win32/user32/sysicon/sysicon.rbuild
+++ b/rostests/win32/user32/sysicon/sysicon.rbuild
@@ -1,5 +1,8 @@
-<module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe" unicode="true">
+<module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe">
 	<include base="capicon">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/win32/win32k/win32k.rbuild b/rostests/win32/win32k/win32k.rbuild
index 24a410216a7..41660f11879 100644
--- a/rostests/win32/win32k/win32k.rbuild
+++ b/rostests/win32/win32k/win32k.rbuild
@@ -4,6 +4,11 @@
 	<include base="win32k">include</include>
 	<include base="ntoskrnl">include</include>
 	<include base="freetype">include</include>
+	<define name="UNICODE" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="WINVER">0x600</define>
+	<define name="_SEH_NO_NATIVE_NLG" />
 	<define name="_WIN32K_" />
 	<library>rtshared</library>
 	<library>regtests</library>
diff --git a/rostests/winetests/GUI/GUI.rbuild b/rostests/winetests/GUI/GUI.rbuild
index 2e3722df945..f73c7cbc46a 100644
--- a/rostests/winetests/GUI/GUI.rbuild
+++ b/rostests/winetests/GUI/GUI.rbuild
@@ -3,7 +3,7 @@
 <module name="GUI" type="win32gui" installbase="system32" installname="testGUI.exe" allowwarnings="true" unicode="yes">
 	<include base="GUI">.</include>
 	<define name="_WIN32_IE">0x600</define>
-	<redefine name="_WIN32_WINNT">0x501</redefine>
+	<define name="_WIN32_WINNT">0x501</define>
     <define name="__ROS_LONG64__" />
 	<library>gdi32</library>
 	<library>kernel32</library>
diff --git a/rostests/winetests/advapi32/advapi32.rbuild b/rostests/winetests/advapi32/advapi32.rbuild
index d78d2bcd005..651e745cd35 100644
--- a/rostests/winetests/advapi32/advapi32.rbuild
+++ b/rostests/winetests/advapi32/advapi32.rbuild
@@ -2,7 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="advapi32_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>advapi32</library>
     <library>kernel32</library>
diff --git a/rostests/winetests/advpack/advpack.rbuild b/rostests/winetests/advpack/advpack.rbuild
index c6b9566aa0b..5518c3898d8 100644
--- a/rostests/winetests/advpack/advpack.rbuild
+++ b/rostests/winetests/advpack/advpack.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advpack_winetest" type="win32cui" installbase="bin" installname="advpack_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="advpack_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>advpack.c</file>
diff --git a/rostests/winetests/browseui/browseui.rbuild b/rostests/winetests/browseui/browseui.rbuild
index d6b5e3768b7..6cb96deae17 100644
--- a/rostests/winetests/browseui/browseui.rbuild
+++ b/rostests/winetests/browseui/browseui.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="browseui_winetest" type="win32cui" installbase="bin" installname="browseui_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="browseui_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
diff --git a/rostests/winetests/cabinet/cabinet.rbuild b/rostests/winetests/cabinet/cabinet.rbuild
index 5ce09e639d9..50b2e276c9d 100644
--- a/rostests/winetests/cabinet/cabinet.rbuild
+++ b/rostests/winetests/cabinet/cabinet.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="cabinet_winetest" type="win32cui" installbase="bin" installname="cabinet_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="cabinet_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>extract.c</file>
diff --git a/rostests/winetests/comcat/comcat.rbuild b/rostests/winetests/comcat/comcat.rbuild
index ecf216d68b8..56fad49b60c 100644
--- a/rostests/winetests/comcat/comcat.rbuild
+++ b/rostests/winetests/comcat/comcat.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comcat_winetest" type="win32cui" installbase="bin" installname="comcat_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comcat_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>comcat.c</file>
diff --git a/rostests/winetests/comdlg32/comdlg32.rbuild b/rostests/winetests/comdlg32/comdlg32.rbuild
index c2e5d0daf66..1462064b750 100644
--- a/rostests/winetests/comdlg32/comdlg32.rbuild
+++ b/rostests/winetests/comdlg32/comdlg32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comdlg32_winetest" type="win32cui" installbase="bin" installname="comdlg32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comdlg32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>filedlg.c</file>
diff --git a/rostests/winetests/crypt32/crypt32.rbuild b/rostests/winetests/crypt32/crypt32.rbuild
index 3870f336383..c92aa41e46a 100644
--- a/rostests/winetests/crypt32/crypt32.rbuild
+++ b/rostests/winetests/crypt32/crypt32.rbuild
@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="crypt32_winetest" type="win32cui" installbase="bin" installname="crypt32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="crypt32_winetest">.</include>
-    <define name="__ROS_LONG64__" />
 	<file>base64.c</file>
 	<file>cert.c</file>
 	<file>chain.c</file>
diff --git a/rostests/winetests/gdi32/gdi32.rbuild b/rostests/winetests/gdi32/gdi32.rbuild
index c865e35d06f..cc55487c431 100644
--- a/rostests/winetests/gdi32/gdi32.rbuild
+++ b/rostests/winetests/gdi32/gdi32.rbuild
@@ -2,9 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="gdi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
+    <define name="__USE_W32API" />
     <library>ntdll</library>
     <library>gdi32</library>
     <library>kernel32</library>
diff --git a/rostests/winetests/gdiplus/gdiplus.rbuild b/rostests/winetests/gdiplus/gdiplus.rbuild
index 531e90b48a6..02cbcfd9413 100644
--- a/rostests/winetests/gdiplus/gdiplus.rbuild
+++ b/rostests/winetests/gdiplus/gdiplus.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdiplus_winetest" type="win32cui" installbase="bin" installname="gdiplus_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="gdiplus_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>brush.c</file>
diff --git a/rostests/winetests/hlink/hlink.rbuild b/rostests/winetests/hlink/hlink.rbuild
index 7f77113d0a6..f4bf710e094 100644
--- a/rostests/winetests/hlink/hlink.rbuild
+++ b/rostests/winetests/hlink/hlink.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="hlink_winetest" type="win32cui" installbase="bin" installname="hlink_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="hlink_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>hlink.c</file>
diff --git a/rostests/winetests/icmp/icmp.rbuild b/rostests/winetests/icmp/icmp.rbuild
index 827d44ded66..7363a2fb488 100644
--- a/rostests/winetests/icmp/icmp.rbuild
+++ b/rostests/winetests/icmp/icmp.rbuild
@@ -2,7 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="icmp_winetest" type="win32cui" installbase="bin" installname="icmp_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="icmp_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>kernel32</library>
     <library>ntdll</library>
diff --git a/rostests/winetests/imm32/imm32.rbuild b/rostests/winetests/imm32/imm32.rbuild
index efd37b6d02d..6b1434b0c37 100644
--- a/rostests/winetests/imm32/imm32.rbuild
+++ b/rostests/winetests/imm32/imm32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="imm32_winetest" type="win32cui" installbase="bin" installname="imm32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="imm32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>imm32.c</file>
diff --git a/rostests/winetests/iphlpapi/iphlpapi.rbuild b/rostests/winetests/iphlpapi/iphlpapi.rbuild
index 644c9c0efc0..3e0ce485864 100644
--- a/rostests/winetests/iphlpapi/iphlpapi.rbuild
+++ b/rostests/winetests/iphlpapi/iphlpapi.rbuild
@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="iphlpapi_winetest" type="win32cui" installbase="bin" installname="iphlpapi_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="iphlpapi_winetest">.</include>
-    <define name="__ROS_LONG64__" />
 	<file>iphlpapi.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/jscript/jscript.rbuild b/rostests/winetests/jscript/jscript.rbuild
index b37bb04bcd0..2e1a1a59319 100644
--- a/rostests/winetests/jscript/jscript.rbuild
+++ b/rostests/winetests/jscript/jscript.rbuild
@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="jscript_winetest" type="win32cui" installbase="bin" installname="jscript_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="jscript_winetest">.</include>
-    <define name="__ROS_LONG64__" />
 	<file>jscript.c</file>
 	<file>run.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/kernel32/kernel32.rbuild b/rostests/winetests/kernel32/kernel32.rbuild
index 8ea74c843da..ccadc03667d 100644
--- a/rostests/winetests/kernel32/kernel32.rbuild
+++ b/rostests/winetests/kernel32/kernel32.rbuild
@@ -4,6 +4,7 @@
 <module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true">
     <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="kernel32_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>kernel32</library>
@@ -42,5 +43,6 @@
     <file>virtual.c</file>
     <file>volume.c</file>
     <file>testlist.c</file>
+    <file>resource.rc</file>
 </module>
 </group>
diff --git a/rostests/winetests/lz32/lz32.rbuild b/rostests/winetests/lz32/lz32.rbuild
index f189ae9366d..d46524bcdda 100644
--- a/rostests/winetests/lz32/lz32.rbuild
+++ b/rostests/winetests/lz32/lz32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="lz32_winetest" type="win32cui" installbase="bin" installname="lz32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="lz32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>lzexpand_main.c</file>
diff --git a/rostests/winetests/mapi32/mapi32.rbuild b/rostests/winetests/mapi32/mapi32.rbuild
index bf91266d0a7..1debf2ee6a0 100644
--- a/rostests/winetests/mapi32/mapi32.rbuild
+++ b/rostests/winetests/mapi32/mapi32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mapi32_winetest" type="win32cui" installbase="bin" installname="mapi32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mapi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>imalloc.c</file>
diff --git a/rostests/winetests/mlang/mlang.rbuild b/rostests/winetests/mlang/mlang.rbuild
index 37b3b2ab3de..0cd4a4eef58 100644
--- a/rostests/winetests/mlang/mlang.rbuild
+++ b/rostests/winetests/mlang/mlang.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mlang_winetest" type="win32cui" installbase="bin" installname="mlang_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mlang_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>mlang.c</file>
diff --git a/rostests/winetests/msacm32/msacm32.rbuild b/rostests/winetests/msacm32/msacm32.rbuild
index 8dc00928dc7..c2fe5162306 100644
--- a/rostests/winetests/msacm32/msacm32.rbuild
+++ b/rostests/winetests/msacm32/msacm32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msacm32_winetest" type="win32cui" installbase="bin" installname="msacm32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="msacm32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
diff --git a/rostests/winetests/mshtml/mshtml.rbuild b/rostests/winetests/mshtml/mshtml.rbuild
index 99f208b4c8c..118c843b96c 100644
--- a/rostests/winetests/mshtml/mshtml.rbuild
+++ b/rostests/winetests/mshtml/mshtml.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mshtml_winetest" type="win32cui" installbase="bin" installname="mshtml_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mshtml_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>dom.c</file>
diff --git a/rostests/winetests/msi/msi.rbuild b/rostests/winetests/msi/msi.rbuild
index 72de4ebbb37..45524def2d2 100644
--- a/rostests/winetests/msi/msi.rbuild
+++ b/rostests/winetests/msi/msi.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msi_winetest" type="win32cui" installbase="bin" installname="msi_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="msi_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>automation.c</file>
diff --git a/rostests/winetests/mstask/mstask.rbuild b/rostests/winetests/mstask/mstask.rbuild
index 3b1976937f7..8a4a1e798f2 100644
--- a/rostests/winetests/mstask/mstask.rbuild
+++ b/rostests/winetests/mstask/mstask.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mstask_winetest" type="win32cui" installbase="bin" installname="mstask_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mstask_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>task.c</file>
diff --git a/rostests/winetests/msvcrt/msvcrt.rbuild b/rostests/winetests/msvcrt/msvcrt.rbuild
index 0601d9809b9..8f8512a9390 100644
--- a/rostests/winetests/msvcrt/msvcrt.rbuild
+++ b/rostests/winetests/msvcrt/msvcrt.rbuild
@@ -5,6 +5,7 @@
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="msvcrt_winetest">.</include>
 	<include base="msvcrt">include/reactos/wine/msvcrt</include>
+	<define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
 	<define name="_CRT_NONSTDC_NO_DEPRECATE" />
 	<library>kernel32</library>
diff --git a/rostests/winetests/netapi32/netapi32.rbuild b/rostests/winetests/netapi32/netapi32.rbuild
index 7bf6e3a764d..a0c35b05cdd 100644
--- a/rostests/winetests/netapi32/netapi32.rbuild
+++ b/rostests/winetests/netapi32/netapi32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="netapi32_winetest" type="win32cui" installbase="bin" installname="netapi32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="netapi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>access.c</file>
diff --git a/rostests/winetests/ntdll/ntdll.rbuild b/rostests/winetests/ntdll/ntdll.rbuild
index dd9dc574e61..9be19d047c8 100644
--- a/rostests/winetests/ntdll/ntdll.rbuild
+++ b/rostests/winetests/ntdll/ntdll.rbuild
@@ -2,7 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="ntdll_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>kernel32</library>
     <library>ntdll</library>
diff --git a/rostests/winetests/odbccp32/odbccp32.rbuild b/rostests/winetests/odbccp32/odbccp32.rbuild
index 6e57a47079d..7851118ef32 100644
--- a/rostests/winetests/odbccp32/odbccp32.rbuild
+++ b/rostests/winetests/odbccp32/odbccp32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="odbccp32_winetest" type="win32cui" installbase="bin" installname="odbccp32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="odbccp32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>misc.c</file>
diff --git a/rostests/winetests/ole32/ole32.rbuild b/rostests/winetests/ole32/ole32.rbuild
index edd6406b76a..8817952ba8a 100644
--- a/rostests/winetests/ole32/ole32.rbuild
+++ b/rostests/winetests/ole32/ole32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ole32_winetest" type="win32cui" installbase="bin" installname="ole32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="ole32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>clipboard.c</file>
diff --git a/rostests/winetests/powrprof/powrprof.rbuild b/rostests/winetests/powrprof/powrprof.rbuild
index 9100ba8406c..6d21cec1197 100644
--- a/rostests/winetests/powrprof/powrprof.rbuild
+++ b/rostests/winetests/powrprof/powrprof.rbuild
@@ -1,8 +1,10 @@
 <module name="powrprof_winetest" type="win32cui" installbase="bin" installname="powrprof_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="powrprof_winetest">.</include>
     <define name="__ROS_LONG64__" />
-    <define name="UNICODE" />
-    <define name="_UNICODE" />
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<library>powrprof</library>
 	<library>ntdll</library>
 	<library>advapi32</library>
diff --git a/rostests/winetests/psapi/psapi.rbuild b/rostests/winetests/psapi/psapi.rbuild
index a9034f75549..3e7df36f9ba 100644
--- a/rostests/winetests/psapi/psapi.rbuild
+++ b/rostests/winetests/psapi/psapi.rbuild
@@ -2,8 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="psapi_winetest">.</include>
     <define name="__ROS_LONG64__" />
+    <define name="__USE_W32API" />
     <library>kernel32</library>
     <library>ntdll</library>
     <library>psapi</library>
diff --git a/rostests/winetests/rpcrt4/rpcrt4.rbuild b/rostests/winetests/rpcrt4/rpcrt4.rbuild
index a793ccd0f26..efb526898fc 100644
--- a/rostests/winetests/rpcrt4/rpcrt4.rbuild
+++ b/rostests/winetests/rpcrt4/rpcrt4.rbuild
@@ -11,6 +11,7 @@
 		<compilerflag compiler="cc">-Wno-format</compilerflag>
 		<include base="rpcrt4_winetest">.</include>
 		<include root="intermediate" base="rpcrt4_winetest">.</include>
+		<define name="__USE_W32API" />
 		<define name="__ROS_LONG64__" />
 		<library>wine</library>
 		<library>pseh</library>
@@ -29,4 +30,4 @@
 		<file>server.c</file>
 		<file>testlist.c</file>
 	</module>
-</group>
+</group>
\ No newline at end of file
diff --git a/rostests/winetests/rsabase/rsabase.rbuild b/rostests/winetests/rsabase/rsabase.rbuild
index c4af042b20b..2decf107c64 100644
--- a/rostests/winetests/rsabase/rsabase.rbuild
+++ b/rostests/winetests/rsabase/rsabase.rbuild
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="rsabase_winetest" type="win32cui" installbase="bin" installname="rsabase_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="rsabase_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
diff --git a/rostests/winetests/rsaenh/rsaenh.rbuild b/rostests/winetests/rsaenh/rsaenh.rbuild
index 469db2970ce..2142dedefa7 100644
--- a/rostests/winetests/rsaenh/rsaenh.rbuild
+++ b/rostests/winetests/rsaenh/rsaenh.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rsaenh_winetest" type="win32cui" installbase="bin" installname="rsaenh_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="rsaenh_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>rsaenh.c</file>
diff --git a/rostests/winetests/schannel/schannel.rbuild b/rostests/winetests/schannel/schannel.rbuild
index 4eea0f86408..82cce22c9ca 100644
--- a/rostests/winetests/schannel/schannel.rbuild
+++ b/rostests/winetests/schannel/schannel.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="schannel_winetest" type="win32cui" installbase="bin" installname="schannel_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="schannel_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
diff --git a/rostests/winetests/setupapi/setupapi.rbuild b/rostests/winetests/setupapi/setupapi.rbuild
index 290739270d6..4da0549e039 100644
--- a/rostests/winetests/setupapi/setupapi.rbuild
+++ b/rostests/winetests/setupapi/setupapi.rbuild
@@ -2,8 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="setupapi_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>kernel32</library>
diff --git a/rostests/winetests/shell32/shell32.rbuild b/rostests/winetests/shell32/shell32.rbuild
index 6d29d7917d7..c1dd598bc46 100644
--- a/rostests/winetests/shell32/shell32.rbuild
+++ b/rostests/winetests/shell32/shell32.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shell32_winetest" type="win32cui" installbase="bin" installname="shell32_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="shell32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>
diff --git a/rostests/winetests/shlwapi/shlwapi.rbuild b/rostests/winetests/shlwapi/shlwapi.rbuild
index f17bcd6e8ea..b93c8907889 100644
--- a/rostests/winetests/shlwapi/shlwapi.rbuild
+++ b/rostests/winetests/shlwapi/shlwapi.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="shlwapi_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>assoc.c</file>
diff --git a/rostests/winetests/urlmon/urlmon.rbuild b/rostests/winetests/urlmon/urlmon.rbuild
index 96ecca71529..54635ebbaca 100644
--- a/rostests/winetests/urlmon/urlmon.rbuild
+++ b/rostests/winetests/urlmon/urlmon.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="urlmon_winetest" type="win32cui" installbase="bin" installname="urlmon_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="urlmon_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>generated.c</file>
diff --git a/rostests/winetests/user32/user32.rbuild b/rostests/winetests/user32/user32.rbuild
index cd56c6201f0..c2d46991abf 100644
--- a/rostests/winetests/user32/user32.rbuild
+++ b/rostests/winetests/user32/user32.rbuild
@@ -2,9 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="user32_winetest">.</include>
     <include base="ReactOS">include/reactos/wine</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>user32</library>
diff --git a/rostests/winetests/usp10/usp10.rbuild b/rostests/winetests/usp10/usp10.rbuild
index d376e4845c8..8708c2c1ecd 100644
--- a/rostests/winetests/usp10/usp10.rbuild
+++ b/rostests/winetests/usp10/usp10.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="usp10_winetest" type="win32cui" installbase="bin" installname="usp10_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="usp10_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>usp10.c</file>
diff --git a/rostests/winetests/uxtheme/uxtheme.rbuild b/rostests/winetests/uxtheme/uxtheme.rbuild
index 917aad8b8c0..805c38e4a44 100644
--- a/rostests/winetests/uxtheme/uxtheme.rbuild
+++ b/rostests/winetests/uxtheme/uxtheme.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="uxtheme_winetest" type="win32cui" installbase="bin" installname="uxtheme_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="uxtheme_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>system.c</file>
diff --git a/rostests/winetests/version/version.rbuild b/rostests/winetests/version/version.rbuild
index 7f88072fd2f..b6bd1191269 100644
--- a/rostests/winetests/version/version.rbuild
+++ b/rostests/winetests/version/version.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="version_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>info.c</file>
diff --git a/rostests/winetests/winhttp/winhttp.rbuild b/rostests/winetests/winhttp/winhttp.rbuild
index b12b9d31e02..a08973191e2 100644
--- a/rostests/winetests/winhttp/winhttp.rbuild
+++ b/rostests/winetests/winhttp/winhttp.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="winhttp_winetest" type="win32cui" installbase="bin" installname="winhttp_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="winhttp_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>notification.c</file>
diff --git a/rostests/winetests/wininet/wininet.rbuild b/rostests/winetests/wininet/wininet.rbuild
index 32abbc60f1f..2ff720f4dfa 100644
--- a/rostests/winetests/wininet/wininet.rbuild
+++ b/rostests/winetests/wininet/wininet.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wininet_winetest" type="win32cui" installbase="bin" installname="wininet_winetest.exe" allowwarnings="true">
+	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="wininet_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>