Move /sdk/include/reactos/wine to /sdk/include/wine, reorder global includes, remove unneeded includes (#8258)

- Move sdk\include\reactos\wine to sdk\include\wine
- Reorder the directories in include_directories() to be closer to alphabetical. This should make it easier to determine what global include directories can be removed in the future.

CMakeLists.txt

@@ -320,22 +320,23 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
 
     include_directories(
         sdk/include
+        sdk/include/crt
+        sdk/include/ddk
+        sdk/include/ndk
         sdk/include/psdk
-        sdk/include/dxsdk
+        sdk/include/reactos
+        sdk/include/reactos/libs
+        sdk/include/vcruntime
         sdk/include/winrt
         ${REACTOS_BINARY_DIR}/sdk/include
         ${REACTOS_BINARY_DIR}/sdk/include/psdk
-        ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
         ${REACTOS_BINARY_DIR}/sdk/include/ddk
+        ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
         ${REACTOS_BINARY_DIR}/sdk/include/reactos
         ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
-        sdk/include/crt
-        sdk/include/vcruntime
-        sdk/include/ddk
-        sdk/include/ndk
-        sdk/include/reactos
-        sdk/include/reactos/libs
-        sdk/lib/pseh/include)
+        sdk/include/dxsdk
+        sdk/lib/pseh/include
+    )
 
     if(ARCH STREQUAL "arm")
         include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
@@ -343,12 +344,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
 
     add_dependency_header()
 
-    add_subdirectory(sdk/include/ndk/tests)
-    add_subdirectory(sdk/include/xdk)
-    add_subdirectory(sdk/include/psdk)
-    add_subdirectory(sdk/include/dxsdk)
-    add_subdirectory(sdk/include/reactos)
-    add_subdirectory(sdk/include/asm)
+    add_subdirectory(sdk/include)
 
     if(ARCH MATCHES "64$")
         include(sdk/cmake/baseaddress64.cmake)

base/applications/charmap_new/CMakeLists.txt

@@ -13,7 +13,7 @@ add_library(charmap MODULE
     charmap.rc)
 
 set_module_type(charmap win32gui UNICODE)
-target_link_libraries(charmap uuid wine cpprt atl_classes)
+target_link_libraries(charmap uuid cpprt atl_classes)
 set_target_cpp_properties(charmap WITH_EXCEPTIONS WITH_RTTI)
 add_importlibs(charmap advapi32 user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll)
 add_pch(charmap precomp.h SOURCE)

base/applications/rapps/CMakeLists.txt

@@ -49,7 +49,7 @@ file(GLOB_RECURSE rapps_rc_deps res/*.*)
 add_rc_deps(rapps.rc ${rapps_rc_deps})
 add_executable(rapps ${SOURCE} rapps.rc)
 set_module_type(rapps win32gui UNICODE)
-target_link_libraries(rapps conutils ${PSEH_LIB} uuid wine cpprt atl_classes minizip zlib)
+target_link_libraries(rapps conutils ${PSEH_LIB} uuid cpprt atl_classes minizip zlib)
 add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi gdiplus msvcrt kernel32 ntdll)
 add_pch(rapps include/rapps.h SOURCE)
 add_dependencies(rapps rappsmsg)

base/applications/wordpad/CMakeLists.txt

@@ -1,8 +1,6 @@
 
 remove_definitions(-D_WIN32_IE=0x600)
-
 add_definitions(-D__ROS_LONG64__)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 
 list(APPEND SOURCE
     olecallback.c

base/services/rpcss/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 add_rpc_files(server
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/epm.idl
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/irot.idl)
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine/epm.idl
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine/irot.idl)
 
 
 list(APPEND SOURCE

base/shell/cmd/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 list(APPEND SOURCE

base/system/expand/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_executable(expand expand.c expand.rc)
 set_module_type(expand win32cui)
 add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)

dll/cpl/usrmgr/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(usrmgr.cpl usrmgr.spec)
 
 list(APPEND SOURCE

dll/directx/wine/amstream/CMakeLists.txt

@@ -1,7 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(amstream.dll amstream.spec)
 
 list(APPEND SOURCE

dll/directx/wine/d3dcompiler_43/CMakeLists.txt

@@ -4,8 +4,6 @@ add_definitions(
     -D__ROS_LONG64__
     -Dstrcasecmp=_stricmp
     -DDIRECT3D_VERSION=0x0900)
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/directx/wine/dplay/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(dplay.dll dplay.spec)
 
 add_library(dplay MODULE

dll/win32/actxprxy/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION)
 spec2def(actxprxy.dll actxprxy.spec)
 

dll/win32/avicap32/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 add_library(avicap32 MODULE
     avicap32.c

dll/win32/cryptui/CMakeLists.txt

@@ -2,8 +2,6 @@
 add_definitions(
     -D_WINE
     -D__ROS_LONG64__)
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/win32/dbghelp/CMakeLists.txt

@@ -31,7 +31,7 @@ else()
         -D_IMAGEHLP_SOURCE_)
 
     include_directories(
-        BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+        BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
     spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB)
 

dll/win32/dwmapi/CMakeLists.txt

@@ -1,7 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(dwmapi.dll dwmapi.spec)
 
 list(APPEND SOURCE

dll/win32/fltlib/CMakeLists.txt

@@ -4,7 +4,7 @@ spec2def(fltlib.dll fltlib.spec ADD_IMPORTLIB)
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine
     includes)
 
 list(APPEND SOURCE

dll/win32/getuname/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(getuname.dll getuname.spec ADD_IMPORTLIB)
 
 add_library(getuname MODULE

dll/win32/imagehlp/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_definitions(-D_IMAGEHLP_SOURCE_)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/win32/iphlpapi/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine
     ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include
     ${REACTOS_SOURCE_DIR}/sdk/lib/tdilib)
 

dll/win32/jscript/CMakeLists.txt

@@ -4,7 +4,6 @@ add_definitions(
     -D__ROS_LONG64__
     -D_USE_MATH_DEFINES)
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(jscript.dll jscript.spec)
 
 list(APPEND SOURCE

dll/win32/kernelbase/CMakeLists.txt

@@ -8,7 +8,7 @@ add_definitions(
     -D__ROS_LONG64__
     -D_KERNELBASE_)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 #add_subdirectory(wine)
 # TODO: ReactOS Isn't ready for Kernelbase.dll

dll/win32/kernelbase/wine/CMakeLists.txt

@@ -9,7 +9,7 @@ add_definitions(
     -Dswprintf=_swprintf
     -D_KERNELBASE_)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
    CMAKE_C_COMPILER_ID STREQUAL "Clang")

dll/win32/mapi32/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_definitions(-D__WINESRC__)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(mapi32.dll mapi32.spec)
 
 list(APPEND SOURCE

dll/win32/mcicda/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(mcicda.dll mcicda.spec)
 
 list(APPEND SOURCE

dll/win32/msacm32.drv/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(msacm32.drv msacm32.drv.spec)
 
 add_library(msacm32.drv MODULE

dll/win32/msi/CMakeLists.txt

@@ -2,7 +2,6 @@
 remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_definitions(-D__WINESRC__ -D__ROS_LONG64__ -DMSIRUNMODE=MSIRUNMODE_T)
 spec2def(msi.dll msi.spec ADD_IMPORTLIB)
 generate_idl_iids(msiserver.idl)

dll/win32/mspatcha/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 spec2def(mspatcha.dll mspatcha.spec ADD_IMPORTLIB)
 

dll/win32/mswsock/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_definitions(-DLE)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/win32/riched20/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(riched20.dll riched20.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/win32/samlib/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 add_definitions(-D__WINESRC__)
 spec2def(samlib.dll samlib.spec ADD_IMPORTLIB)

dll/win32/setupapi/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
     ${CMAKE_CURRENT_BINARY_DIR})
 

dll/win32/shdoclc/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(shdoclc.dll shdoclc.spec)
 
 add_library(shdoclc MODULE

dll/win32/shdocvw/CMakeLists.txt

@@ -20,7 +20,7 @@ add_library(shdocvw MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
 
 target_include_directories(shdocvw BEFORE PRIVATE
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine
 )
 
 set_module_type(shdocvw win32dll UNICODE)

dll/win32/shlwapi/CMakeLists.txt

@@ -40,7 +40,7 @@ add_library(shlwapi MODULE
 # our C++ atlbase.h conflicts with the one from wine, so only use wine includes for C
 # Unfortunately, we can't use different includes for C & C++ in VS generator, so use an object library to achieve this
 target_include_directories(shlwapi BEFORE PRIVATE
-    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine
     ${REACTOS_SOURCE_DIR}/sdk/lib/atl)
 
 add_library(shlwapi_autocomp OBJECT autocomp.cpp)

dll/win32/t2embed/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(t2embed.dll t2embed.spec)
 
 list(APPEND SOURCE

dll/win32/uxtheme/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
 
 if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600)

dll/win32/version/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(version.dll version.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/win32/wbemprox/CMakeLists.txt

@@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(wbemprox.dll wbemprox.spec)
 
 list(APPEND SOURCE

dll/win32/winmm/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_definitions(-D_WINE)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(winmm.dll winmm.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

dll/win32/winsta/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 spec2def(winsta.dll winsta.spec)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 list(APPEND SOURCE
     logon.c

dll/win32/wtsapi32/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(wtsapi32.dll wtsapi32.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE

modules/rostests/apitests/browseui/CMakeLists.txt

@@ -13,7 +13,7 @@ list(APPEND SOURCE
 
 add_executable(browseui_apitest ${SOURCE})
 
-target_link_libraries(browseui_apitest uuid wine cpprt atl_classes)
+target_link_libraries(browseui_apitest uuid cpprt atl_classes)
 set_target_cpp_properties(browseui_apitest WITH_EXCEPTIONS WITH_RTTI)
 set_module_type(browseui_apitest win32cui)
 add_importlibs(browseui_apitest advapi32 shell32 ole32 shlwapi msvcrt user32 kernel32 ntdll)

modules/rostests/apitests/imm32/CMakeLists.txt

@@ -1,6 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-
 list(APPEND SOURCE
     clientimc.c
     himc.c

modules/rostests/winetests/advapi32/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 list(APPEND SOURCE
     cred.c

modules/rostests/winetests/imm32/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_executable(imm32_winetest imm32.c testlist.c)
 set_module_type(imm32_winetest win32cui)
 add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32)

modules/rostests/winetests/kernel32/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601)
 

modules/rostests/winetests/localspl/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
 add_executable(localspl_winetest localmon.c testlist.c)
 set_module_type(localspl_winetest win32cui)
 add_importlibs(localspl_winetest advapi32 msvcrt kernel32)

modules/rostests/winetests/localui/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
 add_executable(localui_winetest localui.c testlist.c)
 set_module_type(localui_winetest win32cui)
 add_importlibs(localui_winetest winspool msvcrt kernel32)

modules/rostests/winetests/ntdll/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 add_definitions(-D__WINESRC__ -DWINETEST_USE_DBGSTR_LONGLONG)
 
 list(APPEND SOURCE

modules/rostests/winetests/oleaut32/CMakeLists.txt

@@ -7,7 +7,6 @@ add_definitions(
     -Dstrcasecmp=_stricmp
 )
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
 add_idl_Headers(oleaut32_idlheaders test_reg.idl test_tlb.idl tmarshal.idl)
 generate_idl_iids(test_reg.idl test_tlb.idl tmarshal.idl)

modules/rostests/winetests/oledlg/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_definitions(-DUSE_WINE_TODOS)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_executable(oledlg_winetest main.c testlist.c)
 set_module_type(oledlg_winetest win32cui)
 add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32)

modules/rostests/winetests/quartz/CMakeLists.txt

@@ -1,8 +1,6 @@
 
 add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-
 list(APPEND SOURCE
     avisplitter.c
     dsoundrender.c

modules/rostests/winetests/ws2_32/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 add_executable(ws2_32_winetest protocol.c sock.c testlist.c)
 

sdk/cmake/set_wine_module.cmake

@@ -3,14 +3,14 @@
 
 function(set_wine_module TARGET)
     include_directories(BEFORE
-        ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
-        ${REACTOS_BINARY_DIR}/sdk/include/reactos/wine)
+        ${REACTOS_SOURCE_DIR}/sdk/include/wine
+        ${REACTOS_BINARY_DIR}/sdk/include/wine)
 endfunction()
 
 # FIXME: Replace this call with set_wine_module
 function(set_wine_module_FIXME TARGET)
     include_directories(BEFORE
-        ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
-        ${REACTOS_BINARY_DIR}/sdk/include/reactos/wine)
+        ${REACTOS_SOURCE_DIR}/sdk/include/wine
+        ${REACTOS_BINARY_DIR}/sdk/include/wine)
     target_compile_definitions(${TARGET} PRIVATE __WINESRC__)
 endfunction()

sdk/include/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+add_subdirectory(asm)
+add_subdirectory(dxsdk)
+add_subdirectory(ndk/tests)
+add_subdirectory(psdk)
+add_subdirectory(reactos)
+add_subdirectory(wine)
+add_subdirectory(xdk)

sdk/include/host/wine/list.h

@@ -1 +1 @@
-#include "../../reactos/wine/list.h"
+#include "../../wine/list.h"

sdk/include/host/wine/mscvpdb.h

@@ -1 +1 @@
-#include "../../reactos/wine/mscvpdb.h"
+#include "../../wine/mscvpdb.h"

sdk/include/host/wine/port.h

@@ -1 +1 @@
-#include "../../reactos/wine/port.h"
+#include "../../wine/port.h"

sdk/include/host/wine/rbtree.h

@@ -1,2 +1,2 @@
 #include <stddef.h>
-#include "../../reactos/wine/rbtree.h"
+#include "../../wine/rbtree.h"

sdk/include/host/wine/rpcfc.h

@@ -1 +1 @@
-#include "../../reactos/wine/rpcfc.h"
+#include "../../wine/rpcfc.h"

sdk/include/host/wine/wpp.h

@@ -1 +1 @@
-#include "../../reactos/wine/wpp.h"
+#include "../../wine/wpp.h"

sdk/include/reactos/CMakeLists.txt

@@ -1,5 +1,4 @@
 
-add_subdirectory(wine)
 add_subdirectory(mc)
 
 add_definitions(-D_MIDL_USE_GUIDDEF_)