From 19208f00eb8296f03b1631a54fec27a70f22cd49 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Fri, 17 Feb 2006 22:59:15 +0000
Subject: [PATCH] Rbuild changes for include structure change.

svn path=/trunk/; revision=21124
---
 reactos/ReactOS-ppc.rbuild                   | 6 +++---
 reactos/ReactOS.rbuild                       | 6 +++---
 reactos/base/shell/cmd/cmd.rbuild            | 4 ++--
 reactos/base/shell/cmd/tests/cmd_test.rbuild | 2 +-
 reactos/base/system/expand/expand.rbuild     | 2 +-
 reactos/dll/directx/dinput/dinput.rbuild     | 2 +-
 reactos/dll/directx/dinput8/dinput8.rbuild   | 2 +-
 reactos/dll/directx/dplay/dplay.rbuild       | 2 +-
 reactos/dll/directx/dplayx/dplayx.rbuild     | 2 +-
 reactos/dll/directx/dsound/dsound.rbuild     | 2 +-
 reactos/dll/directx/dxdiagn/dxdiagn.rbuild   | 2 +-
 reactos/dll/win32/avifil32/avifil32.rbuild   | 2 +-
 reactos/dll/win32/cabinet/cabinet.rbuild     | 2 +-
 reactos/dll/win32/comctl32/comctl32.rbuild   | 2 +-
 reactos/dll/win32/comdlg32/comdlg32.rbuild   | 2 +-
 reactos/dll/win32/crypt32/crypt32.rbuild     | 2 +-
 reactos/dll/win32/dbghelp/dbghelp.rbuild     | 2 +-
 reactos/dll/win32/devenum/devenum.rbuild     | 2 +-
 reactos/dll/win32/icmp/icmp.rbuild           | 2 +-
 reactos/dll/win32/iphlpapi/iphlpapi.rbuild   | 2 +-
 reactos/dll/win32/mapi32/mapi32.rbuild       | 2 +-
 reactos/dll/win32/mpr/mpr.rbuild             | 2 +-
 reactos/dll/win32/msacm/msacm32.rbuild       | 2 +-
 reactos/dll/win32/msi/msi.rbuild             | 2 +-
 reactos/dll/win32/msvideo/msvfw32.rbuild     | 2 +-
 reactos/dll/win32/netapi32/netapi32.rbuild   | 2 +-
 reactos/dll/win32/objsel/objsel.rbuild       | 2 +-
 reactos/dll/win32/ole32/ole32.rbuild         | 2 +-
 reactos/dll/win32/oleacc/oleacc.rbuild       | 2 +-
 reactos/dll/win32/oleaut32/oleaut32.rbuild   | 2 +-
 reactos/dll/win32/oledlg/oledlg.rbuild       | 2 +-
 reactos/dll/win32/olepro32/olepro32.rbuild   | 2 +-
 reactos/dll/win32/riched20/riched20.rbuild   | 2 +-
 reactos/dll/win32/richedit/riched32.rbuild   | 2 +-
 reactos/dll/win32/rpcrt4/rpcrt4.rbuild       | 2 +-
 reactos/dll/win32/setupapi/setupapi.rbuild   | 2 +-
 reactos/dll/win32/shdocvw/shdocvw.rbuild     | 2 +-
 reactos/dll/win32/shell32/shell32.rbuild     | 2 +-
 reactos/dll/win32/shlwapi/shlwapi.rbuild     | 2 +-
 reactos/dll/win32/urlmon/urlmon.rbuild       | 2 +-
 reactos/dll/win32/uxtheme/uxtheme.rbuild     | 2 +-
 reactos/dll/win32/version/version.rbuild     | 2 +-
 reactos/dll/win32/wininet/wininet.rbuild     | 2 +-
 reactos/dll/win32/wintrust/wintrust.rbuild   | 2 +-
 reactos/drivers/lib/chew/chew.xml            | 2 +-
 reactos/subsys/subsys.rbuild                 | 2 ++
 reactos/tools/bin2res/bin2res.mak            | 2 +-
 reactos/tools/wmc/wmc.mak                    | 2 +-
 48 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/reactos/ReactOS-ppc.rbuild b/reactos/ReactOS-ppc.rbuild
index 497ae75ba8c..6c535ad06cb 100644
--- a/reactos/ReactOS-ppc.rbuild
+++ b/reactos/ReactOS-ppc.rbuild
@@ -45,9 +45,9 @@
   <include>include/drivers</include>
   <include>include/subsys</include>
   <include>include/ndk</include>
-  <include>w32api/include</include>
-  <include>w32api/include/crt</include>
-  <include>w32api/include/ddk</include>
+  <include>include</include>
+  <include>include/crt</include>
+  <include>include/ddk</include>
 
   <directory name="apps">
     <xi:include href="apps/directory.rbuild" />
diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index 6f5e37d7a7b..881de7a28c5 100644
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -38,9 +38,9 @@
   <include>include/drivers</include>
   <include>include/subsys</include>
   <include>include/ndk</include>
-  <include>w32api/include</include>
-  <include>w32api/include/crt</include>
-  <include>w32api/include/ddk</include>
+  <include>include</include>
+  <include>include/crt</include>
+  <include>include/ddk</include>
 
   <directory name="boot">
     <xi:include href="boot/boot.rbuild" />
diff --git a/reactos/base/shell/cmd/cmd.rbuild b/reactos/base/shell/cmd/cmd.rbuild
index 229c796a9f7..6b1d7de4e4f 100644
--- a/reactos/base/shell/cmd/cmd.rbuild
+++ b/reactos/base/shell/cmd/cmd.rbuild
@@ -1,5 +1,5 @@
 <module name="cmd_base" type="objectlibrary">
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd_base">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
@@ -62,7 +62,7 @@
 	</compilationunit>
 </module>
 <module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" usewrc="false">
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
diff --git a/reactos/base/shell/cmd/tests/cmd_test.rbuild b/reactos/base/shell/cmd/tests/cmd_test.rbuild
index 43f0d9fb0c8..f4a6ed7b090 100644
--- a/reactos/base/shell/cmd/tests/cmd_test.rbuild
+++ b/reactos/base/shell/cmd/tests/cmd_test.rbuild
@@ -1,6 +1,6 @@
 <module name="cmd_test" type="test">
 	<include base="rtshared">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
diff --git a/reactos/base/system/expand/expand.rbuild b/reactos/base/system/expand/expand.rbuild
index a66145f4764..c2aeebb66e3 100644
--- a/reactos/base/system/expand/expand.rbuild
+++ b/reactos/base/system/expand/expand.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false">
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index 3f1c1f98d2b..2db41b9bd77 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dinput.spec.def" />
 	<include base="dinput">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/directx/dinput8/dinput8.rbuild b/reactos/dll/directx/dinput8/dinput8.rbuild
index da1bcbc07f2..7e32a23977c 100644
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dinput8.spec.def" />
 	<include base="dinput8">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 77d0a94daea..2e356af13ca 100644
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -1,7 +1,7 @@
 <module name="dplay" type="win32dll" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll">  
 	<importlibrary definition="dplay.spec.def" />
 	<include base="dinput8">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index e45c2798038..1bbabb48f9a 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -2,7 +2,7 @@
 	<!-- 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/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 3e311d66db9..0c41c14434e 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dsound.spec.def" />
 	<include base="dsound">.</include>
-	<include base="ReactOS">include/wine</include>	
+	<include base="ReactOS">include/reactos/wine</include>	
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
index 9de8c81d6e2..efcb5cd8ea0 100644
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dxdiagn.spec.def" />
 	<include base="dxdiagn">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index fc38a514f7d..93b746be2d7 100644
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="avifil32.spec.def" />
 	<include base="avifil32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>uuid</library>
diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild
index ab076c2f21c..b79bd4a7e8e 100644
--- a/reactos/dll/win32/cabinet/cabinet.rbuild
+++ b/reactos/dll/win32/cabinet/cabinet.rbuild
@@ -1,7 +1,7 @@
 <module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true">
 	<importlibrary definition="cabinet.spec.def" />
 	<include base="cabinet">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index c5c1995b839..630420b5b29 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllInstall" />
 	<importlibrary definition="comctl32.spec.def" />
 	<include base="comctl32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index 3891fd9e6f3..bef4be99b54 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -1,7 +1,7 @@
 <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" usewrc="false">
 	<importlibrary definition="comdlg32.spec.def" />
 	<include base="comdlg32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<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 c817a0b0fd4..5e60131f731 100644
--- a/reactos/dll/win32/crypt32/crypt32.rbuild
+++ b/reactos/dll/win32/crypt32/crypt32.rbuild
@@ -1,7 +1,7 @@
 <module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll">
 	<importlibrary definition="crypt32.spec.def" />
 	<include base="crypt32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild
index f4c4cfae418..13d1766bc5d 100644
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@@ -1,7 +1,7 @@
 <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true">
 	<importlibrary definition="dbghelp.spec.def" />
 	<include base="dbghelp">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/devenum/devenum.rbuild b/reactos/dll/win32/devenum/devenum.rbuild
index ff5ae676dee..d674e32b7b2 100644
--- a/reactos/dll/win32/devenum/devenum.rbuild
+++ b/reactos/dll/win32/devenum/devenum.rbuild
@@ -2,7 +2,7 @@
   <!-- 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/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild
index 6ebbc9c848b..356f63585c1 100644
--- a/reactos/dll/win32/icmp/icmp.rbuild
+++ b/reactos/dll/win32/icmp/icmp.rbuild
@@ -1,7 +1,7 @@
 <module name="icmp" type="win32dll" baseaddress="${BASEADDRESS_ICMP}" installbase="system32" installname="icmp.dll" allowwarnings="true">
 	<importlibrary definition="icmp.spec.def" />
 	<include base="icmp">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index a35889f9572..cdaf5727771 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -1,7 +1,7 @@
 <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true">
 	<importlibrary definition="iphlpapi.spec.def" />
 	<include base="iphlpapi">include</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild
index 7db672d354a..645a836d0c8 100644
--- a/reactos/dll/win32/mapi32/mapi32.rbuild
+++ b/reactos/dll/win32/mapi32/mapi32.rbuild
@@ -1,7 +1,7 @@
 <module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll">
 	<importlibrary definition="mapi32.spec.def" />
 	<include base="mapi32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="__WINESRC__" />
diff --git a/reactos/dll/win32/mpr/mpr.rbuild b/reactos/dll/win32/mpr/mpr.rbuild
index 62c87441039..41189f1eadd 100644
--- a/reactos/dll/win32/mpr/mpr.rbuild
+++ b/reactos/dll/win32/mpr/mpr.rbuild
@@ -1,7 +1,7 @@
 <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
 	<importlibrary definition="mpr.spec.def" />
 	<include base="mpr">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/msacm/msacm32.rbuild b/reactos/dll/win32/msacm/msacm32.rbuild
index c9f10c64656..cae1946ce7a 100644
--- a/reactos/dll/win32/msacm/msacm32.rbuild
+++ b/reactos/dll/win32/msacm/msacm32.rbuild
@@ -1,7 +1,7 @@
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll">
 	<importlibrary definition="msacm32.spec.def" />
 	<include base="msacm32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/msi/msi.rbuild b/reactos/dll/win32/msi/msi.rbuild
index 3e745ad88cf..ffaa3caf880 100644
--- a/reactos/dll/win32/msi/msi.rbuild
+++ b/reactos/dll/win32/msi/msi.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="msi.spec.def" />
 	<include base="msi">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/msvideo/msvfw32.rbuild b/reactos/dll/win32/msvideo/msvfw32.rbuild
index d8bc0c948c1..d54487a9d7c 100644
--- a/reactos/dll/win32/msvideo/msvfw32.rbuild
+++ b/reactos/dll/win32/msvideo/msvfw32.rbuild
@@ -1,6 +1,6 @@
 <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll">
 	<importlibrary definition="msvfw32.spec.def" />
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/netapi32/netapi32.rbuild b/reactos/dll/win32/netapi32/netapi32.rbuild
index 04796c2b3a8..83f19df6f30 100644
--- a/reactos/dll/win32/netapi32/netapi32.rbuild
+++ b/reactos/dll/win32/netapi32/netapi32.rbuild
@@ -1,7 +1,7 @@
 <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true">
 	<importlibrary definition="netapi32.spec.def" />
 	<include base="netapi32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild
index 584f7274344..4df10a72242 100644
--- a/reactos/dll/win32/objsel/objsel.rbuild
+++ b/reactos/dll/win32/objsel/objsel.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="objsel.spec.def" />
 	<include base="objsel">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
diff --git a/reactos/dll/win32/ole32/ole32.rbuild b/reactos/dll/win32/ole32/ole32.rbuild
index 9935e8fed9f..82740c8cc30 100644
--- a/reactos/dll/win32/ole32/ole32.rbuild
+++ b/reactos/dll/win32/ole32/ole32.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="ole32.spec.def" />
 	<include base="ole32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/oleacc/oleacc.rbuild b/reactos/dll/win32/oleacc/oleacc.rbuild
index 42156975d16..5923a426c44 100644
--- a/reactos/dll/win32/oleacc/oleacc.rbuild
+++ b/reactos/dll/win32/oleacc/oleacc.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="oleacc.spec.def" />
 	<include base="oleacc">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/oleaut32/oleaut32.rbuild b/reactos/dll/win32/oleaut32/oleaut32.rbuild
index c79528e5951..73ca764be8b 100644
--- a/reactos/dll/win32/oleaut32/oleaut32.rbuild
+++ b/reactos/dll/win32/oleaut32/oleaut32.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="oleaut32.spec.def" />
 	<include base="oleaut32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/oledlg/oledlg.rbuild b/reactos/dll/win32/oledlg/oledlg.rbuild
index f3cc030f8bc..5a9bf2d6428 100644
--- a/reactos/dll/win32/oledlg/oledlg.rbuild
+++ b/reactos/dll/win32/oledlg/oledlg.rbuild
@@ -1,7 +1,7 @@
 <module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true">
 	<importlibrary definition="oledlg.spec.def" />
 	<include base="oledlg">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/olepro32/olepro32.rbuild b/reactos/dll/win32/olepro32/olepro32.rbuild
index 4a131976396..a7b2a3ef78f 100644
--- a/reactos/dll/win32/olepro32/olepro32.rbuild
+++ b/reactos/dll/win32/olepro32/olepro32.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="olepro32.spec.def" />
 	<include base="olepro32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/riched20/riched20.rbuild b/reactos/dll/win32/riched20/riched20.rbuild
index 2435d0a7231..b55c23d237c 100644
--- a/reactos/dll/win32/riched20/riched20.rbuild
+++ b/reactos/dll/win32/riched20/riched20.rbuild
@@ -1,7 +1,7 @@
 <module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true">
 	<importlibrary definition="riched20.spec.def" />
 	<include base="riched20">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/richedit/riched32.rbuild b/reactos/dll/win32/richedit/riched32.rbuild
index 992aac63157..24eca302a5c 100644
--- a/reactos/dll/win32/richedit/riched32.rbuild
+++ b/reactos/dll/win32/richedit/riched32.rbuild
@@ -1,7 +1,7 @@
 <module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll">
 	<importlibrary definition="riched32.spec.def" />
 	<include base="riched32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<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 37b043212fa..7b0a32e5fad 100644
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="rpcrt4.spec.def" />
 	<include base="rpcrt4">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild
index 2de1cc89b57..a0bcd43035c 100644
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@@ -1,7 +1,7 @@
 <module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true">
 	<importlibrary definition="setupapi.spec.def" />
 	<include base="setupapi">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<include base="pnp_client">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index 24e45db07f7..62e47ed62b4 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="Both" />
 	<importlibrary definition="shdocvw.spec.def" />
 	<include base="shdocvw">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild
index 686806dc192..e66fe278715 100644
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="Both" />
 	<importlibrary definition="shell32.spec.def" />
 	<include base="shell32">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/shlwapi/shlwapi.rbuild b/reactos/dll/win32/shlwapi/shlwapi.rbuild
index 277396ffcc9..4cf0b9c5339 100644
--- a/reactos/dll/win32/shlwapi/shlwapi.rbuild
+++ b/reactos/dll/win32/shlwapi/shlwapi.rbuild
@@ -1,7 +1,7 @@
 <module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true">
 	<importlibrary definition="shlwapi.spec.def" />
 	<include base="shlwapi">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/urlmon/urlmon.rbuild b/reactos/dll/win32/urlmon/urlmon.rbuild
index 3cf8cd0ba67..b61105a9ed7 100644
--- a/reactos/dll/win32/urlmon/urlmon.rbuild
+++ b/reactos/dll/win32/urlmon/urlmon.rbuild
@@ -1,7 +1,7 @@
 <module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true">
 	<importlibrary definition="urlmon.spec.def" />
 	<include base="urlmon">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/uxtheme/uxtheme.rbuild b/reactos/dll/win32/uxtheme/uxtheme.rbuild
index 2261d88ad6b..896137e7052 100644
--- a/reactos/dll/win32/uxtheme/uxtheme.rbuild
+++ b/reactos/dll/win32/uxtheme/uxtheme.rbuild
@@ -1,7 +1,7 @@
 <module name="uxtheme" type="win32dll" baseaddress="${BASEADDRESS_UXTHEME}" installbase="system32" installname="uxtheme.dll" allowwarnings="true">
 	<importlibrary definition="uxtheme.spec.def" />
 	<include base="uxtheme">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/version/version.rbuild b/reactos/dll/win32/version/version.rbuild
index 1bc62b34bb0..a9524e7173d 100644
--- a/reactos/dll/win32/version/version.rbuild
+++ b/reactos/dll/win32/version/version.rbuild
@@ -1,6 +1,6 @@
 <module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" allowwarnings="true">
 	<importlibrary definition="version.def" />
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
diff --git a/reactos/dll/win32/wininet/wininet.rbuild b/reactos/dll/win32/wininet/wininet.rbuild
index 0ea048a66c6..90fe0d50311 100644
--- a/reactos/dll/win32/wininet/wininet.rbuild
+++ b/reactos/dll/win32/wininet/wininet.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllInstall" />
 	<importlibrary definition="wininet.spec.def" />
 	<include base="wininet">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild
index cc25b8683f1..68a6b4e40ce 100644
--- a/reactos/dll/win32/wintrust/wintrust.rbuild
+++ b/reactos/dll/win32/wintrust/wintrust.rbuild
@@ -2,7 +2,7 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="wintrust.spec.def" />
 	<include base="wintrust">.</include>
-	<include base="ReactOS">include/wine</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__USE_W32API" />
 	<library>wine</library>
 	<library>ntdll</library>
diff --git a/reactos/drivers/lib/chew/chew.xml b/reactos/drivers/lib/chew/chew.xml
index 15984175490..9c42113e019 100644
--- a/reactos/drivers/lib/chew/chew.xml
+++ b/reactos/drivers/lib/chew/chew.xml
@@ -2,6 +2,6 @@
 	<define name="__USE_W32API" />
 	<define name="_NTOSKRNL_" />
 	<include base="chew">include</include>
-	<include base="reactos">w32api/include/ddk</include>
+	<include base="ReactOS">include/ddk</include>
 	<file>workqueue.c</file>
 </module>
\ No newline at end of file
diff --git a/reactos/subsys/subsys.rbuild b/reactos/subsys/subsys.rbuild
index 9dcb86926cd..4e55d4bf539 100644
--- a/reactos/subsys/subsys.rbuild
+++ b/reactos/subsys/subsys.rbuild
@@ -4,7 +4,9 @@
 <directory name="smss">
 	<xi:include href="smss/smss.xml" />
 </directory>
+<!--
 <directory name="system">
 	<xi:include href="system/directory.xml" />
 </directory>
+-->
 </group>
diff --git a/reactos/tools/bin2res/bin2res.mak b/reactos/tools/bin2res/bin2res.mak
index d06cc6a7dd1..cead4d9e90b 100644
--- a/reactos/tools/bin2res/bin2res.mak
+++ b/reactos/tools/bin2res/bin2res.mak
@@ -26,7 +26,7 @@ BIN2RES_SOURCES = $(addprefix $(BIN2RES_BASE_), \
 BIN2RES_OBJECTS = \
 	$(addprefix $(INTERMEDIATE_), $(BIN2RES_SOURCES:.c=.o))
 
-BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ $(TOOLS_CFLAGS)
+BIN2RES_HOST_CFLAGS = -Iinclude/reactos/wine -D__REACTOS__ $(TOOLS_CFLAGS)
 
 BIN2RES_HOST_LFLAGS = $(TOOLS_LFLAGS)
 
diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index a417dae659f..02fdd62807c 100644
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -36,7 +36,7 @@ WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \
                   -DLONG="int" -DULONG="unsigned int" \
                   -DPULONG="unsigned int *" -DLONG_DEFINED \
                   -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \
-                  -Iinclude/wine -Iinclude -Iw32api/include
+                  -Iinclude/reactos/wine -Iinclude/reactos -Iinclude
 
 WMC_HOST_LFLAGS = $(TOOLS_LFLAGS)