diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 593d7460f13..405f80c7996 100644
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -214,14 +214,14 @@ add_subdirectory(uxtheme)
 #add_subdirectory(wmi)
 #add_subdirectory(ws2_32)
 #add_subdirectory(ws2_32_new)
-#add_subdirectory(ws2help)
-#add_subdirectory(wshirda)
-#add_subdirectory(wshtcpip)
-#add_subdirectory(wsock32)
-#add_subdirectory(wtsapi32)
-#add_subdirectory(wuapi)
-#add_subdirectory(xinput1_1)
-#add_subdirectory(xinput1_2)
-#add_subdirectory(xinput1_3)
-#add_subdirectory(xinput9_1_0)
-#add_subdirectory(xmllite)
+add_subdirectory(ws2help)
+add_subdirectory(wshirda)
+add_subdirectory(wshtcpip)
+add_subdirectory(wsock32)
+add_subdirectory(wtsapi32)
+add_subdirectory(wuapi)
+add_subdirectory(xinput1_1)
+add_subdirectory(xinput1_2)
+add_subdirectory(xinput1_3)
+add_subdirectory(xinput9_1_0)
+add_subdirectory(xmllite)
diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt
new file mode 100644
index 00000000000..cce5dd6e453
--- /dev/null
+++ b/dll/win32/ws2help/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
+
+spec2def(ws2help ${CMAKE_CURRENT_SOURCE_DIR}/ws2help.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
+
+add_library(ws2help SHARED
+    apc.c
+    context.c
+    dllmain.c
+    handle.c
+    notify.c)
+
+set_module_type(ws2help win32dll)
+
+target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
+add_importlibs(ws2help advapi32 ntdll ws2_32)
+add_dependencies(ws2help ws2help_def psdk)
diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt
new file mode 100644
index 00000000000..aa9bb05235f
--- /dev/null
+++ b/dll/win32/wshirda/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
+
+add_library(wshirda SHARED wshirda.c wshirda.rc)
+
+set_module_type(wshirda win32dll)
+
+target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
+add_importlibs(wshirda ntdll ws2_32)
+add_dependencies(wshirda wshirda_def psdk)
diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt
new file mode 100644
index 00000000000..4aded70f6b0
--- /dev/null
+++ b/dll/win32/wshtcpip/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib)
+
+spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def)
+
+add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc)
+
+set_module_type(wshtcpip win32dll)
+
+target_link_libraries(wshtcpip
+    ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def
+    tdilib)
+
+add_importlibs(wshtcpip ntdll ws2_32)
+add_dependencies(wshtcpip wshtcpip_def psdk)
diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt
new file mode 100644
index 00000000000..3e05be8b574
--- /dev/null
+++ b/dll/win32/wsock32/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+add_library(wsock32 SHARED stubs.c wsock32.rc)
+
+set_module_type(wsock32 win32dll)
+
+target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def)
+add_importlibs(wsock32 ntdll ws2_32)
+add_dependencies(wsock32 psdk)
diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt
new file mode 100644
index 00000000000..0d2c16f31e8
--- /dev/null
+++ b/dll/win32/wtsapi32/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(wtsapi32 ${CMAKE_CURRENT_SOURCE_DIR}/wtsapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def)
+
+add_library(wtsapi32 SHARED wtsapi32.c)
+
+set_module_type(wtsapi32 win32dll)
+
+target_link_libraries(wtsapi32
+    ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def
+    wine)
+
+add_importlibs(wtsapi32 advapi32 ntdll)
+add_dependencies(wtsapi32 wtsapi32_def psdk)
diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
new file mode 100644
index 00000000000..0cbea3b2ece
--- /dev/null
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+add_definitions(-D__WINESRC__)
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(wuapi ${CMAKE_CURRENT_SOURCE_DIR}/wuapi.spec ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
+
+add_library(wuapi SHARED
+    downloader.c
+    installer.c
+    main.c
+    regsvr.c
+    searcher.c
+    session.c
+    updates.c)
+
+set_module_type(wuapi win32dll)
+
+target_link_libraries(wuapi
+    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def
+    wine)
+
+add_importlibs(wuapi uuid ole32 advapi32 ntdll)
+add_dependencies(wuapi wuapi_def psdk)
diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt
new file mode 100644
index 00000000000..7271d6e9610
--- /dev/null
+++ b/dll/win32/xinput1_1/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(xinput1_1 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_1.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
+
+add_library(xinput1_1 SHARED xinput1_1_main.c version.rc)
+
+set_module_type(xinput1_1 win32dll)
+target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
+add_dependencies(xinput1_1 xinput1_1_def psdk)
diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt
new file mode 100644
index 00000000000..45d3f75b488
--- /dev/null
+++ b/dll/win32/xinput1_2/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(xinput1_2 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_2.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
+
+add_library(xinput1_2 SHARED xinput1_2_main.c version.rc)
+
+set_module_type(xinput1_2 win32dll)
+target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
+add_dependencies(xinput1_2 xinput1_2_def psdk)
diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt
new file mode 100644
index 00000000000..463928f7d42
--- /dev/null
+++ b/dll/win32/xinput1_3/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(xinput1_3 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_3.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def)
+
+add_library(xinput1_3 SHARED xinput1_3_main.c version.rc)
+
+set_module_type(xinput1_3 win32dll)
+
+target_link_libraries(xinput1_3
+    ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def
+    wine)
+
+add_dependencies(xinput1_3 xinput1_3_def psdk)
diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt
new file mode 100644
index 00000000000..bd715ee6663
--- /dev/null
+++ b/dll/win32/xinput9_1_0/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(xinput9_1_0 ${CMAKE_CURRENT_SOURCE_DIR}/xinput9_1_0.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
+
+add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc)
+
+set_module_type(xinput9_1_0 win32dll)
+target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
+add_dependencies(xinput9_1_0 xinput9_1_0_def psdk)
diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt
new file mode 100644
index 00000000000..b63cffaceb9
--- /dev/null
+++ b/dll/win32/xmllite/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(xmllite ${CMAKE_CURRENT_SOURCE_DIR}/xmllite.spec ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def)
+
+add_library(xmllite SHARED reader.c xmllite_main.c)
+
+set_module_type(xmllite win32dll)
+
+target_link_libraries(xmllite
+    ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def
+    wine)
+
+add_dependencies(xmllite xmllite_def psdk)
diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index 3eff666e4ae..3960ee1e993 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_subdirectory(base)
 add_subdirectory(battery)
 add_subdirectory(bus)
+add_subdirectory(directx)
 add_subdirectory(filesystems)
 add_subdirectory(input)
 add_subdirectory(ksfilter)
diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt
index afc117b06b7..588b8aa00b9 100644
--- a/drivers/bus/acpi/CMakeLists.txt
+++ b/drivers/bus/acpi/CMakeLists.txt
@@ -145,3 +145,6 @@ target_link_libraries(acpi
 
 add_importlibs(acpi ntoskrnl hal)
 add_dependencies(acpi psdk bugcodes)
+
+add_subdirectory(cmbatt)
+add_subdirectory(compbatt)
\ No newline at end of file
diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/bus/acpi/cmbatt/CMakeLists.txt
new file mode 100644
index 00000000000..27dfba0c024
--- /dev/null
+++ b/drivers/bus/acpi/cmbatt/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+list(APPEND SOURCE
+    cmbatt.c
+    cmexec.c
+    cmbpnp.c
+    cmbwmi.c
+    cmbatt.rc)
+
+add_library(cmbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/cmbatt_cmbatt.h.gch ${SOURCE})
+
+set_target_properties(cmbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+add_importlibs(cmbatt ntoskrnl hal battc wmilib)
+
+add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE})
+add_dependencies(cmbatt psdk bugcodes)
diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/bus/acpi/compbatt/CMakeLists.txt
new file mode 100644
index 00000000000..bfe5a052fb4
--- /dev/null
+++ b/drivers/bus/acpi/compbatt/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+list(APPEND SOURCE
+    compbatt.c
+    compmisc.c
+    comppnp.c
+    compbatt.rc)
+
+add_library(compbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/compbatt_compbatt.h.gch ${SOURCE})
+
+set_target_properties(compbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+add_importlibs(compbatt ntoskrnl hal battc)
+add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE})
+add_dependencies(compbatt psdk bugcodes)
diff --git a/drivers/directx/CMakeLists.txt b/drivers/directx/CMakeLists.txt
new file mode 100644
index 00000000000..ade9d59b652
--- /dev/null
+++ b/drivers/directx/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_subdirectory(dxapi)
+add_subdirectory(dxg)
+add_subdirectory(dxgthk)
diff --git a/drivers/directx/dxapi/CMakeLists.txt b/drivers/directx/dxapi/CMakeLists.txt
new file mode 100644
index 00000000000..d004d2a69b2
--- /dev/null
+++ b/drivers/directx/dxapi/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+add_definitions(-D_DXAPI_)
+
+spec2def(dxapi ${CMAKE_CURRENT_SOURCE_DIR}/dxapi.spec ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def)
+
+add_library(dxapi SHARED main.c dxapi.rc)
+
+set_target_properties(dxapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(dxapi ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def)
+add_importlibs(dxapi ntoskrnl hal videoprt)
+add_dependencies(dxapi dxapi_def psdk bugcodes)
diff --git a/drivers/directx/dxg/CMakeLists.txt b/drivers/directx/dxg/CMakeLists.txt
new file mode 100644
index 00000000000..45f65adff63
--- /dev/null
+++ b/drivers/directx/dxg/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+spec2def(dxg ${CMAKE_CURRENT_SOURCE_DIR}/dxg.spec ${CMAKE_CURRENT_BINARY_DIR}/dxg.def)
+
+add_library(dxg SHARED
+    main.c
+    ddhmg.c
+    eng.c
+    historic.c
+    dxg.rc)
+
+set_target_properties(dxg PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(dxg ${CMAKE_CURRENT_BINARY_DIR}/dxg.def)
+add_importlibs(dxg dxgthk ntoskrnl)
+add_dependencies(dxg dxg_def psdk bugcodes)
diff --git a/drivers/directx/dxgthk/CMakeLists.txt b/drivers/directx/dxgthk/CMakeLists.txt
new file mode 100644
index 00000000000..6fe64690bb6
--- /dev/null
+++ b/drivers/directx/dxgthk/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+spec2def(dxgthk ${CMAKE_CURRENT_SOURCE_DIR}/dxgthk.spec ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def)
+
+add_library(dxgthk SHARED main.c dxgthk.rc)
+
+set_target_properties(dxgthk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(dxgthk ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def)
+add_importlibs(dxgthk win32k)
+add_dependencies(dxgthk dxgthk_def psdk bugcodes)
diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt
index b0cb558c1e7..1dd2bc7f115 100644
--- a/drivers/filesystems/CMakeLists.txt
+++ b/drivers/filesystems/CMakeLists.txt
@@ -3,5 +3,8 @@ add_subdirectory(cdfs)
 add_subdirectory(ext2)
 add_subdirectory(fastfat)
 #add_subdirectory(fastfat_new)
+add_subdirectory(fs_rec)
+add_subdirectory(msfs)
+add_subdirectory(mup)
 add_subdirectory(npfs)
 add_subdirectory(ntfs)
diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt
new file mode 100644
index 00000000000..7d3cbd45ee5
--- /dev/null
+++ b/drivers/filesystems/fs_rec/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+add_library(fs_rec SHARED
+    blockdev.c
+    cdfs.c
+    ext2.c
+    fat.c
+    fs_rec.c
+    ntfs.c
+    udfs.c
+    fs_rec.rc)
+
+set_target_properties(fs_rec PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+add_importlibs(fs_rec ntoskrnl hal)
+add_dependencies(fs_rec psdk bugcodes)
diff --git a/drivers/filesystems/msfs/CMakeLists.txt b/drivers/filesystems/msfs/CMakeLists.txt
new file mode 100644
index 00000000000..e8ff43c3563
--- /dev/null
+++ b/drivers/filesystems/msfs/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+list(APPEND SOURCE
+    create.c
+    finfo.c
+    fsctrl.c
+    msfs.c
+    rw.c
+    msfs.rc)
+
+add_library(msfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/msfs_msfs.h.gch ${SOURCE})
+
+set_target_properties(msfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+add_importlibs(msfs ntoskrnl hal)
+add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE})
+add_dependencies(msfs psdk bugcodes)
diff --git a/drivers/filesystems/mup/CMakeLists.txt b/drivers/filesystems/mup/CMakeLists.txt
new file mode 100644
index 00000000000..56f83d609a1
--- /dev/null
+++ b/drivers/filesystems/mup/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+add_library(mup SHARED
+    create.c
+    mup.c
+    mup.rc)
+
+set_target_properties(mup PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+add_importlibs(mup ntoskrnl hal)
+add_dependencies(mup psdk bugcodes)
diff --git a/importlibs/libbattc.a b/importlibs/libbattc.a
new file mode 100644
index 00000000000..28908dc1e60
Binary files /dev/null and b/importlibs/libbattc.a differ
diff --git a/importlibs/libdxgthk.a b/importlibs/libdxgthk.a
new file mode 100644
index 00000000000..b5b889f423f
Binary files /dev/null and b/importlibs/libdxgthk.a differ
diff --git a/importlibs/libwmilib.a b/importlibs/libwmilib.a
new file mode 100644
index 00000000000..ce2f5bb0226
Binary files /dev/null and b/importlibs/libwmilib.a differ