From: Hervé Poussineau <hpoussin@reactos.org>
Date: Thu, 8 May 2008 16:01:30 +0000 (+0000)
Subject: Fix some .rbuild file problems
X-Git-Tag: backups/win32k-gdi-dx@36850~85
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=06094f3e4d4e21b19c8114ab3a628a00107a2103

Fix some .rbuild file problems
See issue #2710 for more details.

svn path=/trunk/; revision=33366
---

diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index f3ba08b0e86..93120b66fa1 100644
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="baseaddress.rbuild" />
 
-	<define name="__REACTOS__" overridable="true" />
+	<define name="__REACTOS__" />
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
diff --git a/reactos/base/applications/calc/calc.rbuild b/reactos/base/applications/calc/calc.rbuild
index 82dc8caa99e..31b4dd37af5 100644
--- a/reactos/base/applications/calc/calc.rbuild
+++ b/reactos/base/applications/calc/calc.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true">
+<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="yes">
 	<include base="calc">.</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
diff --git a/reactos/base/applications/cmdutils/doskey/doskey.rbuild b/reactos/base/applications/cmdutils/doskey/doskey.rbuild
index e645cfd6070..cfa67cade4c 100644
--- a/reactos/base/applications/cmdutils/doskey/doskey.rbuild
+++ b/reactos/base/applications/cmdutils/doskey/doskey.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe">
+<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<file>doskey.c</file>
 	<file>doskey.rc</file>
diff --git a/reactos/base/applications/dxdiag/dxdiag.rbuild b/reactos/base/applications/dxdiag/dxdiag.rbuild
index 3a1695ea26e..3d91fe4290f 100644
--- a/reactos/base/applications/dxdiag/dxdiag.rbuild
+++ b/reactos/base/applications/dxdiag/dxdiag.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe">
+<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
 	<include base="dxdiag">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
 	<library>kernel32</library>
diff --git a/reactos/base/applications/msconfig/msconfig.rbuild b/reactos/base/applications/msconfig/msconfig.rbuild
index 33c972dc681..7358fefbd10 100644
--- a/reactos/base/applications/msconfig/msconfig.rbuild
+++ b/reactos/base/applications/msconfig/msconfig.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe">
+<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
 	<include base="msconfig">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/base/applications/network/route/route.rbuild b/reactos/base/applications/network/route/route.rbuild
index cfc58a367ec..fbfc1eeeedf 100644
--- a/reactos/base/applications/network/route/route.rbuild
+++ b/reactos/base/applications/network/route/route.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="route" type="win32cui" installbase="system32" installname="route.exe">
+<module name="route" type="win32cui" installbase="system32" installname="route.exe" unicode="yes">
 	<include base="route">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
diff --git a/reactos/base/applications/regedit/clb/clb.rbuild b/reactos/base/applications/regedit/clb/clb.rbuild
index f3215c350bd..b3a0cf5c23c 100644
--- a/reactos/base/applications/regedit/clb/clb.rbuild
+++ b/reactos/base/applications/regedit/clb/clb.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll">
+<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes">
 	<importlibrary definition="clb.def" />
 	<include base="clb">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild
index fdd1bd78caa..da34681f04d 100644
--- a/reactos/base/applications/regedit/regedit.rbuild
+++ b/reactos/base/applications/regedit/regedit.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="regedit" type="win32gui" installname="regedit.exe">
+<module name="regedit" type="win32gui" installname="regedit.exe" unicode="yes">
 	<include base="regedit">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<library>uuid</library>
diff --git a/reactos/base/applications/sc/sc.rbuild b/reactos/base/applications/sc/sc.rbuild
index f928ccc8aae..ea0924c39ea 100644
--- a/reactos/base/applications/sc/sc.rbuild
+++ b/reactos/base/applications/sc/sc.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="sc" type="win32cui" installbase="system32" installname="sc.exe">
+<module name="sc" type="win32cui" installbase="system32" installname="sc.exe" unicode="yes">
 	<define name="DEFINE_GUID" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>control.c</file>
diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild
index 3fe58b71794..32085fbd859 100644
--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="true">
+<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
 	<importlibrary definition="logon.spec.def" />
 	<include base="logon">.</include>
 	<library>scrnsave</library>
diff --git a/reactos/base/applications/sndvol32/sndvol32.rbuild b/reactos/base/applications/sndvol32/sndvol32.rbuild
index cd1460c3453..5c53acb7d22 100644
--- a/reactos/base/applications/sndvol32/sndvol32.rbuild
+++ b/reactos/base/applications/sndvol32/sndvol32.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe">
+<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe" unicode="yes">
 	<include base="ReactOS">include/wine</include>
 	<include base="sndvol32">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/base/services/eventlog/eventlog.rbuild b/reactos/base/services/eventlog/eventlog.rbuild
index 9a08bd89bd7..ab81f2f3780 100644
--- a/reactos/base/services/eventlog/eventlog.rbuild
+++ b/reactos/base/services/eventlog/eventlog.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe">
+<module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe" unicode="yes">
 	<include base="eventlog">.</include>
 	<include base="eventlog_server">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.rbuild b/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
index 49279a50395..4c4d681e841 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.rbuild
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe">
+<module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe" unicode="yes">
 	<include base="umpnpmgr">.</include>
 	<include base="pnp_server">.</include>
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>pnp_server</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/base/setup/setup/setup.rbuild b/reactos/base/setup/setup/setup.rbuild
index aaa82489aa2..01d946f128b 100644
--- a/reactos/base/setup/setup/setup.rbuild
+++ b/reactos/base/setup/setup/setup.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="setup" type="win32gui" installbase="system32" installname="setup.exe">
+<module name="setup" type="win32gui" installbase="system32" installname="setup.exe" unicode="yes">
 	<include base="setup">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0400</define>
 	<library>kernel32</library>
 	<library>userenv</library>
diff --git a/reactos/base/setup/vmwinst/vmwinst.rbuild b/reactos/base/setup/vmwinst/vmwinst.rbuild
index 6f2606397e6..cd8fa4be4df 100644
--- a/reactos/base/setup/vmwinst/vmwinst.rbuild
+++ b/reactos/base/setup/vmwinst/vmwinst.rbuild
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe">
+<module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe" unicode="yes">
 	<include base="vmwinst">.</include>
-	<define name="UNICODE" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
diff --git a/reactos/base/setup/welcome/welcome.rbuild b/reactos/base/setup/welcome/welcome.rbuild
index c8aff15bc60..53691686a59 100644
--- a/reactos/base/setup/welcome/welcome.rbuild
+++ b/reactos/base/setup/welcome/welcome.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe">
+<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe" unicode="yes">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="welcome">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
diff --git a/reactos/base/shell/cmd/cmd.rbuild b/reactos/base/shell/cmd/cmd.rbuild
index 4b56be9d41d..29a61f2c679 100644
--- a/reactos/base/shell/cmd/cmd.rbuild
+++ b/reactos/base/shell/cmd/cmd.rbuild
@@ -1,14 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-	<module name="cmd_base" type="objectlibrary">
+	<module name="cmd_base" type="objectlibrary" unicode="yes">
 		<include base="ReactOS">include/reactos/wine</include>
 		<include base="cmd_base">.</include>
 		<define name="ANONYMOUSUNIONS" />
 		<define name="_WIN32_WINNT">0x0501</define>
 		<define name="_DEBUG_MEM" />
-		<define name="UNICODE" />
-		<define name="_UNICODE" />
 		<pch>precomp.h</pch>
 		<compilationunit name="unit.c">
 			<file>alias.c</file>
diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild
index 85b32587fcc..51116715b7e 100644
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true">
+<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes">
 	<linkerflag>-fexceptions</linkerflag>
 	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<include base="explorer">.</include>
-	<define name="UNICODE" />
 	<define name="WIN32" />
 	<define name="_ROS_" />
 	<define name="_WIN32_IE">0x0600</define>
diff --git a/reactos/base/system/lsass/lsass.rbuild b/reactos/base/system/lsass/lsass.rbuild
index 022361de95b..e13373ae3d1 100644
--- a/reactos/base/system/lsass/lsass.rbuild
+++ b/reactos/base/system/lsass/lsass.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe">
+<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe" unicode="yes">
 	<include base="lsass">.</include>
 	<include base="ReactOS">include/reactos/subsys</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>advapi32</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/base/system/regsvr32/regsvr32.rbuild b/reactos/base/system/regsvr32/regsvr32.rbuild
index 1eac949c672..db73790c0cd 100644
--- a/reactos/base/system/regsvr32/regsvr32.rbuild
+++ b/reactos/base/system/regsvr32/regsvr32.rbuild
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe">
+<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe" unicode="yes">
 	<include base="regsvr32">.</include>
-	<define name="UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>shell32</library>
diff --git a/reactos/base/system/rundll32/rundll32.rbuild b/reactos/base/system/rundll32/rundll32.rbuild
index e159a8a687b..b5bc53e71ed 100644
--- a/reactos/base/system/rundll32/rundll32.rbuild
+++ b/reactos/base/system/rundll32/rundll32.rbuild
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe">
+<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe" unicode="yes">
 	<include base="rundll32">.</include>
-	<define name="UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<file>rundll32.c</file>
diff --git a/reactos/base/system/services/services.rbuild b/reactos/base/system/services/services.rbuild
index a5bd8acde8e..79471907de7 100644
--- a/reactos/base/system/services/services.rbuild
+++ b/reactos/base/system/services/services.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="services" type="win32cui" installbase="system32" installname="services.exe">
+<module name="services" type="win32cui" installbase="system32" installname="services.exe" unicode="yes">
 	<include base="services">.</include>
 	<include base="scm_server">.</include>
 	<include base="ReactOS">include/reactos/subsys</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>scm_server</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/boot/freeldr/fdebug/fdebug.rbuild b/reactos/boot/freeldr/fdebug/fdebug.rbuild
index e611be28d0f..0321c4c0466 100644
--- a/reactos/boot/freeldr/fdebug/fdebug.rbuild
+++ b/reactos/boot/freeldr/fdebug/fdebug.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe">
+<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" unicode="yes">
 	<include base="freeldr_fdebug">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/console/console.rbuild b/reactos/dll/cpl/console/console.rbuild
index 7d8d7598d69..a905d98e3f1 100644
--- a/reactos/dll/cpl/console/console.rbuild
+++ b/reactos/dll/cpl/console/console.rbuild
@@ -1,8 +1,6 @@
-<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll">
+<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
 	<importlibrary definition="console.def" />
 	<include base="console">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/cpl/input/input.rbuild b/reactos/dll/cpl/input/input.rbuild
index 0e50f32aad4..ef0224928d0 100644
--- a/reactos/dll/cpl/input/input.rbuild
+++ b/reactos/dll/cpl/input/input.rbuild
@@ -10,7 +10,7 @@
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>msvcrt</library>
-    <library>gdi32</library>
+	<library>gdi32</library>
 	<file>input.c</file>
 	<file>settings.c</file>
 	<file>keysettings.c</file>
diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild
index 0e674d094d3..d91a0f0d608 100644
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true">
+<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes">
 	<importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>
-	<define name="UNICODE" />
 	<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 7096c13fe27..316c3f53e2f 100644
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true">
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true" unicode="yes">
 	<!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
 	<importlibrary definition="devenum.spec.def" />
 	<include base="devenum">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 ab85a5f28a0..9ec004c3048 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true">
+<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dinput.spec.def" />
 	<include base="dinput">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 ac6d59d6762..539b9273ccc 100644
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll">
+<module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dinput8.spec.def" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/directx/directx.rbuild b/reactos/dll/directx/directx.rbuild
index 9bfc041aab6..4cee3b3737e 100644
--- a/reactos/dll/directx/directx.rbuild
+++ b/reactos/dll/directx/directx.rbuild
@@ -4,12 +4,12 @@
 	<directory name="d3d8thk">
 		<xi:include href="d3d8thk/d3d8thk.rbuild" />
 	</directory>
-	<directory name="devenum">
-		<xi:include href="devenum/devenum.rbuild" />
-	</directory>
 	<directory name="ddraw">
 		<xi:include href="ddraw/ddraw.rbuild" />
 	</directory>
+	<directory name="devenum">
+		<xi:include href="devenum/devenum.rbuild" />
+	</directory>
 	<directory name="dinput">
 		<xi:include href="dinput/dinput.rbuild" />
 	</directory>
diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 169567f8236..81144bac274 100644
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll">
+<module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll" unicode="yes">
 	<importlibrary definition="dplay.spec.def" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 d77633ba4a2..fb4bde9eff9 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true">
+<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true" unicode="yes">
 	<!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
 	<importlibrary definition="dplayx.spec.def" />
 	<include base="dplayx">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 52c14a678cb..df69d270643 100644
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true">
+<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true" unicode="yes">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dxdiagn.spec.def" />
 	<include base="dxdiagn">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 653fce10dc6..65c823288c0 100644
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true">  
+<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true" unicode="yes">
 	<importlibrary definition="d3d8.spec.def" />
 	<include base="d3d8">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/directx/wine/d3d9/d3d9.rbuild b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
index 60325e3a5ff..e6a43e34ea7 100644
--- a/reactos/dll/directx/wine/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true">  
+<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true" unicode="yes">
 	<importlibrary definition="d3d9.spec.def" />
 	<include base="d3d9">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/shellext/devcpux/devcpux.rbuild b/reactos/dll/shellext/devcpux/devcpux.rbuild
index c4a5ea4a42d..83ff1c1a37a 100644
--- a/reactos/dll/shellext/devcpux/devcpux.rbuild
+++ b/reactos/dll/shellext/devcpux/devcpux.rbuild
@@ -1,9 +1,7 @@
-<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll">
+<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll" unicode="yes">
 	<importlibrary definition="devcpux.def" />
 	<include base="devcpux">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/shellext/shellext.rbuild b/reactos/dll/shellext/shellext.rbuild
index a8ec380e434..ccdab8f581d 100644
--- a/reactos/dll/shellext/shellext.rbuild
+++ b/reactos/dll/shellext/shellext.rbuild
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="slayer">
-		<xi:include href="slayer/slayer.rbuild" />
-	</directory>
 	<directory name="deskadp">
 		<xi:include href="deskadp/deskadp.rbuild" />
 	</directory>
@@ -13,4 +10,7 @@
 	<directory name="devcpux">
 		<xi:include href="devcpux/devcpux.rbuild" />
 	</directory>
+	<directory name="slayer">
+		<xi:include href="slayer/slayer.rbuild" />
+	</directory>
 </group>
diff --git a/reactos/dll/shellext/slayer/slayer.rbuild b/reactos/dll/shellext/slayer/slayer.rbuild
index 7b99bc37c32..2bc627ef9ca 100644
--- a/reactos/dll/shellext/slayer/slayer.rbuild
+++ b/reactos/dll/shellext/slayer/slayer.rbuild
@@ -1,8 +1,6 @@
-<module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll">
+<module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes">
 	<importlibrary definition="slayer.def" />
 	<include base="slayer">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x601</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index a2883030f60..e71a8ee9ccc 100644
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -1,8 +1,6 @@
-<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll">
+<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll" unicode="yes">
 	<importlibrary definition="acledit.def" />
 	<include base="acledit">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 
 	<metadata description = "Access Control List Editor" />
 
diff --git a/reactos/dll/win32/aclui/aclui.rbuild b/reactos/dll/win32/aclui/aclui.rbuild
index f465b246913..5dd969b4fe3 100644
--- a/reactos/dll/win32/aclui/aclui.rbuild
+++ b/reactos/dll/win32/aclui/aclui.rbuild
@@ -1,8 +1,6 @@
-<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll">
+<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" unicode="yes">
 	<importlibrary definition="aclui.spec.def" />
 	<include base="aclui">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 8ca94fed28c..32a861522fc 100644
--- a/reactos/dll/win32/advapi32/advapi32.rbuild
+++ b/reactos/dll/win32/advapi32/advapi32.rbuild
@@ -1,4 +1,4 @@
-<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll">
+<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" unicode="yes">
 
 	<importlibrary definition="advapi32.def" />
 	<include base="advapi32">.</include>
@@ -8,8 +8,6 @@
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
-	<define name="UNICODE"></define>
-	<define name="_UNICODE"></define>
 	<library>scm_client</library>
 	<library>lsa_client</library>
 	<library>eventlog_client</library>
diff --git a/reactos/dll/win32/authz/authz.rbuild b/reactos/dll/win32/authz/authz.rbuild
index 7dfa3fcd947..454c949bb66 100644
--- a/reactos/dll/win32/authz/authz.rbuild
+++ b/reactos/dll/win32/authz/authz.rbuild
@@ -1,8 +1,6 @@
-<module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll">
+<module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll" unicode="yes">
 	<importlibrary definition="authz.def" />
 	<include base="authz">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 a53b6949993..156d95cba4f 100644
--- a/reactos/dll/win32/beepmidi/beepmidi.rbuild
+++ b/reactos/dll/win32/beepmidi/beepmidi.rbuild
@@ -1,8 +1,6 @@
-<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll">
+<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes">
 	<importlibrary definition="beepmidi.def" />
 	<include base="beepmidi">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/browseui/browseui.rbuild b/reactos/dll/win32/browseui/browseui.rbuild
index 63df635ad56..671f9ccfa33 100644
--- a/reactos/dll/win32/browseui/browseui.rbuild
+++ b/reactos/dll/win32/browseui/browseui.rbuild
@@ -6,7 +6,6 @@
 	<include base="browseui">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="explorer_new">.</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild
index 94a8bdc0dbe..cab5fdb975d 100644
--- a/reactos/dll/win32/cards/cards.rbuild
+++ b/reactos/dll/win32/cards/cards.rbuild
@@ -1,8 +1,6 @@
-<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll">
+<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll" unicode="yes">
 	<importlibrary definition="cards.def" />
 	<include base="cards">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 
 	<!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
 	<define name="CARDSTYLE_DEFAULT" />
diff --git a/reactos/dll/win32/compstui/compstui.rbuild b/reactos/dll/win32/compstui/compstui.rbuild
index d7562f26069..3805c862138 100644
--- a/reactos/dll/win32/compstui/compstui.rbuild
+++ b/reactos/dll/win32/compstui/compstui.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="compstui.spec.def" />
         <include base="compstui">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/crypt32/crypt32.rbuild b/reactos/dll/win32/crypt32/crypt32.rbuild
index d8bbbaded56..c641672fad2 100644
--- a/reactos/dll/win32/crypt32/crypt32.rbuild
+++ b/reactos/dll/win32/crypt32/crypt32.rbuild
@@ -2,7 +2,6 @@
 	<importlibrary definition="crypt32.spec.def" />
 	<include base="crypt32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild
index cf29ec2c155..226979ae493 100644
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@@ -1,8 +1,6 @@
-<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true">
+<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true" unicode="yes">
 	<include base="devmgr">.</include>
 	<importlibrary definition="devmgr.spec.def" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/win32/gdi32/gdi32.rbuild b/reactos/dll/win32/gdi32/gdi32.rbuild
index 590fb083901..fe27eb3ed5f 100644
--- a/reactos/dll/win32/gdi32/gdi32.rbuild
+++ b/reactos/dll/win32/gdi32/gdi32.rbuild
@@ -1,8 +1,7 @@
-<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll">
+<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes">
 	<importlibrary definition="gdi32.def" />
 	<include base="gdi32">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="UNICODE" />
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="LANGPACK" />
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index dd0b0ca94e6..07a5edbbeb9 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="gdiplus.spec.def" />
         <include base="gdiplus">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/hid/hid.rbuild b/reactos/dll/win32/hid/hid.rbuild
index b16c6c2baec..b37a2d963ce 100644
--- a/reactos/dll/win32/hid/hid.rbuild
+++ b/reactos/dll/win32/hid/hid.rbuild
@@ -1,8 +1,6 @@
-<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll">
+<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll" unicode="yes">
 	<importlibrary definition="hid.def" />
 	<include base="hid">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild
index e40100f13f4..a01db12b7e1 100644
--- a/reactos/dll/win32/inetcomm/inetcomm.rbuild
+++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="inetcomm.spec.def" />
         <include base="inetcomm">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index 9af67947804..b93ab591916 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -1,9 +1,7 @@
-<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true">
+<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes">
 	<importlibrary definition="iphlpapi.spec.def" />
 	<include base="iphlpapi">include</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/lsasrv/lsasrv.rbuild b/reactos/dll/win32/lsasrv/lsasrv.rbuild
index 9f3db5f6b0f..fc09c4fea16 100644
--- a/reactos/dll/win32/lsasrv/lsasrv.rbuild
+++ b/reactos/dll/win32/lsasrv/lsasrv.rbuild
@@ -1,9 +1,7 @@
-<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll">
+<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes">
 	<importlibrary definition="lsasrv.def" />
 	<include base="lsasrv">.</include>
 	<include base="lsa_server">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 88ef90dfd2c..4cf783ba64b 100644
--- a/reactos/dll/win32/mmdrv/mmdrv.rbuild
+++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild
@@ -1,8 +1,6 @@
-<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll">
+<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes">
 	<importlibrary definition="mmdrv.def" />
 	<include base="mmdrv">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="NDEBUG" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 5dae9acc128..9d83ecfa107 100644
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -1,10 +1,7 @@
-<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll">
+<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
 	<importlibrary definition="msacm32.spec.def" />
 	<include base="msacm32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<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 cbc4c59c93f..6e8b186d8b5 100644
--- a/reactos/dll/win32/msafd/msafd.rbuild
+++ b/reactos/dll/win32/msafd/msafd.rbuild
@@ -1,10 +1,8 @@
-<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll">
+<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes">
 	<importlibrary definition="msafd.def" />
 	<include base="msafd">.</include>
 	<include base="msafd">include</include>
 	<include base="ReactOS">include/reactos/drivers</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<pch>msafd.h</pch>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/mswsock/mswsock.rbuild b/reactos/dll/win32/mswsock/mswsock.rbuild
index b0a18c5df30..36e576b5c66 100644
--- a/reactos/dll/win32/mswsock/mswsock.rbuild
+++ b/reactos/dll/win32/mswsock/mswsock.rbuild
@@ -1,6 +1,5 @@
-<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll">
+<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll" unicode="yes">
 	<importlibrary definition="mswsock.def" />
-	<define name="UNICODE" />
 	<define name="LE" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index 7bae3c8f68c..bad16c86556 100644
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="msxml3.spec.def" />
 	<include base="msxml3">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/nddeapi/nddeapi.rbuild b/reactos/dll/win32/nddeapi/nddeapi.rbuild
index 3fce9337a26..8700ed6b8ff 100644
--- a/reactos/dll/win32/nddeapi/nddeapi.rbuild
+++ b/reactos/dll/win32/nddeapi/nddeapi.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="nddeapi.spec.def" />
         <include base="nddeapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
index baad5040a65..ea1a3ac2b07 100644
--- a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
+++ b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="ntdsapi.spec.def" />
         <include base="ntdsapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/ntmarta/ntmarta.rbuild b/reactos/dll/win32/ntmarta/ntmarta.rbuild
index ac3b0ac01ff..b1a2e7d96f3 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.rbuild
+++ b/reactos/dll/win32/ntmarta/ntmarta.rbuild
@@ -1,8 +1,6 @@
-<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll">
+<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll" unicode="yes">
 	<importlibrary definition="ntmarta.def" />
 	<include base="ntmarta">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 02e3b75fce1..bdd58c619d7 100644
--- a/reactos/dll/win32/opengl32/opengl32.rbuild
+++ b/reactos/dll/win32/opengl32/opengl32.rbuild
@@ -1,7 +1,5 @@
-<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll">
+<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes">
 	<importlibrary definition="opengl32.def" />
-	<include base="wsock32">.</include>
-	<define name="UNICODE" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/pdh/pdh.rbuild b/reactos/dll/win32/pdh/pdh.rbuild
index 5b93ae11877..1a3e081e3d3 100644
--- a/reactos/dll/win32/pdh/pdh.rbuild
+++ b/reactos/dll/win32/pdh/pdh.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="pdh.spec.def" />
         <include base="pdh">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/printui/printui.rbuild b/reactos/dll/win32/printui/printui.rbuild
index 9ed6ce21ca1..de3560df3ac 100644
--- a/reactos/dll/win32/printui/printui.rbuild
+++ b/reactos/dll/win32/printui/printui.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="printui.spec.def" />
         <include base="printui">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
index 792f471df9c..66a771e0768 100644
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="rpcrt4.spec.def" />
 	<include base="rpcrt4">.</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>
diff --git a/reactos/dll/win32/samsrv/samsrv.rbuild b/reactos/dll/win32/samsrv/samsrv.rbuild
index 009c3219af4..342a0dbd6ee 100644
--- a/reactos/dll/win32/samsrv/samsrv.rbuild
+++ b/reactos/dll/win32/samsrv/samsrv.rbuild
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll">
+<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes">
 	<importlibrary definition="samsrv.def" />
 	<include base="samsrv">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<linkerflag>-nostartfiles</linkerflag>
 	<linkerflag>-nostdlib</linkerflag>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/serialui/serialui.rbuild b/reactos/dll/win32/serialui/serialui.rbuild
index ac7ee59afad..9099b0a2a6a 100644
--- a/reactos/dll/win32/serialui/serialui.rbuild
+++ b/reactos/dll/win32/serialui/serialui.rbuild
@@ -1,8 +1,6 @@
-<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll">
+<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll" unicode="yes">
 	<importlibrary definition="serialui.def" />
 	<include base="serialui">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>shlwapi</library>
diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild
index a606813a217..0a0301a917d 100644
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true">
+<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes">
 	<importlibrary definition="setupapi.spec.def" />
 	<include base="setupapi">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="pnp_client">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<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 e86de9ec86f..0e8a337d0a7 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="shdocvw.spec.def" />
 	<include base="shdocvw">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild
index 41a8f7ae865..93e2a1bd839 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">
+<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll" unicode="yes">
 	<importlibrary definition="snmpapi.def" />
 	<include base="snmpapi">.</include>
-	<define name="UNICODE" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/tapi32/tapi32.rbuild b/reactos/dll/win32/tapi32/tapi32.rbuild
index c3130178889..e6be1a541da 100644
--- a/reactos/dll/win32/tapi32/tapi32.rbuild
+++ b/reactos/dll/win32/tapi32/tapi32.rbuild
@@ -2,7 +2,6 @@
         <importlibrary definition="tapi32.spec.def" />
         <include base="tapi32">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="TAPI_CURRENT_VERSION">0x00020000</define>
diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild
index c77d3a08fa8..0ef21aba2a7 100644
--- a/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@@ -1,10 +1,9 @@
-<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true">
+<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true" unicode="yes">
 	<importlibrary definition="user32.def" />
 	<include base="user32">.</include>
 	<include base="user32">include</include>
 	<include base="ReactOS">include/reactos/subsys</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="UNICODE" />
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>
diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
index 6c094e90cfb..7edd52d038a 100644
--- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
+++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
@@ -1,8 +1,6 @@
-<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll">
+<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll" unicode="yes">
 	<importlibrary definition="vdmdbg.def" />
 	<include base="vdmdbg">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<file>vdmdbg.c</file>
diff --git a/reactos/dll/win32/winfax/winfax.rbuild b/reactos/dll/win32/winfax/winfax.rbuild
index 3e42903c169..1ff4dcd50ba 100644
--- a/reactos/dll/win32/winfax/winfax.rbuild
+++ b/reactos/dll/win32/winfax/winfax.rbuild
@@ -1,7 +1,6 @@
 <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0">
         <importlibrary definition="winfax.def" />
         <include base="winfax">.</include>
-        <define name="__REACTOS__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
         <define name="_WIN32_WINNT">0x501</define>
diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild
index 81b6cdd640e..901479650ef 100644
--- a/reactos/dll/win32/winmm/midimap/midimap.rbuild
+++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild
@@ -1,10 +1,7 @@
-<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true">
+<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes">
 	<importlibrary definition="midimap.spec.def" />
 	<include base="midimap">.</include>
 	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<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 ce75ad3b393..c493f035482 100644
--- a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
@@ -1,10 +1,7 @@
-<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true">
+<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes">
 	<importlibrary definition="msacm.spec.def" />
 	<include base="wavemap">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild
index e4cc4b9a6e7..59205881b1e 100644
--- a/reactos/dll/win32/winmm/winmm.rbuild
+++ b/reactos/dll/win32/winmm/winmm.rbuild
@@ -11,7 +11,6 @@
 	<importlibrary definition="winmm.spec.def" />
 	<include base="winmm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<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 59cade347c4..107f26b134b 100644
--- a/reactos/dll/win32/winspool/winspool.rbuild
+++ b/reactos/dll/win32/winspool/winspool.rbuild
@@ -1,10 +1,7 @@
-<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true">
+<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true" unicode="yes">
 	<importlibrary definition="winspool.def" />
 	<include base="winspool">.</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<file>info.c</file>
diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild
index 13239b21b5e..b0bcdf85d04 100644
--- a/reactos/dll/win32/wintrust/wintrust.rbuild
+++ b/reactos/dll/win32/wintrust/wintrust.rbuild
@@ -3,7 +3,6 @@
 	<importlibrary definition="wintrust.spec.def" />
 	<include base="wintrust">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
diff --git a/reactos/dll/win32/ws2_32/ws2_32.rbuild b/reactos/dll/win32/ws2_32/ws2_32.rbuild
index c35e0a933c4..1fa4a54bd0c 100644
--- a/reactos/dll/win32/ws2_32/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild
@@ -1,9 +1,8 @@
-<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll">
+<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes">
 	<importlibrary definition="ws2_32.def" />
 	<include base="ws2_32">include</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="UNICODE" />
 	<define name="LE" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<library>wine</library>
diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild
index 7c5d2e92cf2..6f3a0a69dc1 100644
--- a/reactos/dll/win32/ws2help/ws2help.rbuild
+++ b/reactos/dll/win32/ws2help/ws2help.rbuild
@@ -1,7 +1,6 @@
-<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll">
+<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll" unicode="yes">
 	<importlibrary definition="ws2help.def" />
 	<include base="ws2help">.</include>
-	<define name="UNICODE" />
 	<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 f4c74083eff..5704b4bbb0f 100644
--- a/reactos/dll/win32/wshirda/wshirda.rbuild
+++ b/reactos/dll/win32/wshirda/wshirda.rbuild
@@ -1,7 +1,6 @@
-<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}" installbase="system32" installname="wshirda.dll">
+<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}" installbase="system32" installname="wshirda.dll" unicode="yes">
 	<importlibrary definition="wshirda.def" />
 	<include base="wshirda">.</include>
-	<define name="UNICODE" />
 	<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 0c4470db437..757702b4547 100644
--- a/reactos/dll/win32/wsock32/wsock32.rbuild
+++ b/reactos/dll/win32/wsock32/wsock32.rbuild
@@ -1,7 +1,6 @@
-<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll">
+<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll" unicode="yes">
 	<importlibrary definition="wsock32.def" />
 	<include base="wsock32">.</include>
-	<define name="UNICODE" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>ws2_32</library>
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.rbuild b/reactos/drivers/network/wshtcpip/wshtcpip.rbuild
index 2e1644858dc..0fd9a7d9eb6 100644
--- a/reactos/drivers/network/wshtcpip/wshtcpip.rbuild
+++ b/reactos/drivers/network/wshtcpip/wshtcpip.rbuild
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll">
+<module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes">
 	<importlibrary definition="wshtcpip.def"></importlibrary>
 	<include base="wshtcpip">.</include>
-	<define name="UNICODE" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>ws2_32</library>
diff --git a/reactos/lib/3rdparty/mingw/mingw.rbuild b/reactos/lib/3rdparty/mingw/mingw.rbuild
index 3f6e2c75b7d..c1dbef73be1 100644
--- a/reactos/lib/3rdparty/mingw/mingw.rbuild
+++ b/reactos/lib/3rdparty/mingw/mingw.rbuild
@@ -3,7 +3,6 @@
 <group>
 <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true">
 	<importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
-	<include base="ReactOS">include/crt</include>
 	<include base="mingw_common">include</include>
 	<file>cpu_features.c</file>
 	<file>CRTfmode.c</file>
@@ -24,21 +23,18 @@
 	</if>
 </module>
 <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true">
-	<include base="ReactOS">include/crt</include>
 	<include base="mingw_common">include</include>
 	<file>binmode.c</file>
 	<file>crt1.c</file>
 	<file>main.c</file>
 </module>
 <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true">
-	<include base="ReactOS">include/crt</include>
 	<include base="mingw_common">include</include>
 	<file>wbinmode.c</file>
 	<file>wcrt1.c</file>
 	<file>wmain.c</file>
 </module>
 <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true">
-	<include base="ReactOS">include/crt</include>
 	<include base="mingw_common">include</include>
 	<file>dllcrt1.c</file>
 </module>
diff --git a/reactos/lib/drivers/chew/chew.rbuild b/reactos/lib/drivers/chew/chew.rbuild
index 50ca9269679..3c1f355cf60 100644
--- a/reactos/lib/drivers/chew/chew.rbuild
+++ b/reactos/lib/drivers/chew/chew.rbuild
@@ -3,6 +3,5 @@
 <module name="chew" type="staticlibrary">
 	<define name="_NTOSKRNL_" />
 	<include base="chew">include</include>
-	<include base="ReactOS">include/ddk</include>
 	<file>workqueue.c</file>
 </module>
\ No newline at end of file
diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index b4b5c6572ef..89c43acfcdb 100644
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -9,7 +9,6 @@
 	<include base="freetype">include</include>
 	<include base="ReactOS">include/reactos/subsys</include>
 	<include base="ReactOS">include/reactos/drivers</include>
-	<define name="UNICODE" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="WINVER">0x600</define>
 	<define name="LANGPACK" />