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/drivers
include/subsys
include/ndk
- w32api/include
- w32api/include/crt
- w32api/include/ddk
+ include
+ include/crt
+ include/ddk
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/drivers
include/subsys
include/ndk
- w32api/include
- w32api/include/crt
- w32api/include/ddk
+ include
+ include/crt
+ include/ddk
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 @@
- include/wine
+ include/reactos/wine
.
@@ -62,7 +62,7 @@
- include/wine
+ include/reactos/wine
.
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 @@
.
- include/wine
+ include/reactos/wine
.
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 @@
- include/wine
+ include/reactos/wine
.
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x501
uuid
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x501
ntdll
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x501
kernel32
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 @@
include
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x501
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x501
ntdll
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
.
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
- include/wine
+ include/reactos/wine
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 @@
.
- include/wine
+ include/reactos/wine
0x600
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 @@
.
- include/wine
+ include/reactos/wine
wine
ntdll
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 @@
include
- w32api/include/ddk
+ include/ddk
workqueue.c
\ 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 @@
+
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)