diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 94e17acc25d..86797b846eb 100644
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -41,7 +41,7 @@ add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(getuname)
 #add_subdirectory(glu32)# FIXME: set_cpp()?
-#add_subdirectory(hhctrl.ocx)#FIXME: regsvr.c.obj:regsvr.c:(.text+0x393): undefined reference to `RegDeleteTreeW'
+add_subdirectory(hhctrl.ocx)
 add_subdirectory(hid)
 add_subdirectory(hlink)
 add_subdirectory(hnetcfg)
diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt
index deccc40d675..730641826fd 100644
--- a/dll/win32/glu32/CMakeLists.txt
+++ b/dll/win32/glu32/CMakeLists.txt
@@ -1,3 +1,4 @@
+set_cpp()
 
 add_definitions(-DRESOLVE_3D_TEXTURE_SUPPORT)
 add_definitions(-DBUILD_GL32)
diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt
index cc8077c307b..a4858d67030 100644
--- a/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -1,5 +1,8 @@
 
 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(hhctrl.ocx hhctrl.ocx.spec)
@@ -34,4 +37,4 @@ add_importlibs(hhctrl
     kernel32
     ntdll)
 
-
+add_cab_target(hhctrl 1)
\ No newline at end of file
diff --git a/dll/win32/msisys.ocx/CMakeLists.txt b/dll/win32/msisys.ocx/CMakeLists.txt
index 7015e1e6dbf..bd50a76e308 100644
--- a/dll/win32/msisys.ocx/CMakeLists.txt
+++ b/dll/win32/msisys.ocx/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(msisys
 
 add_importlibs(msisys kernel32 ntdll)
 
+add_cab_target(msisys 1)
\ No newline at end of file
diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt
index eec34520e73..3824a6f08ba 100644
--- a/dll/win32/samsrv/CMakeLists.txt
+++ b/dll/win32/samsrv/CMakeLists.txt
@@ -11,3 +11,5 @@ set_entrypoint(samsrv 0)
 
 add_importlibs(samsrv kernel32 ntdll)
 add_dependencies(samsrv psdk buildno_header)
+
+add_cab_target(samsrv 1)
\ No newline at end of file
diff --git a/dll/win32/security/CMakeLists.txt b/dll/win32/security/CMakeLists.txt
index bc12ae5d6ce..bf0f923aa31 100644
--- a/dll/win32/security/CMakeLists.txt
+++ b/dll/win32/security/CMakeLists.txt
@@ -12,3 +12,4 @@ set_entrypoint(security 0)
 
 add_importlibs(security advapi32 ntdll)
 
+add_cab_target(security 1)
\ No newline at end of file
diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt
index 03955e948c6..eee0a73f425 100644
--- a/dll/win32/shdoclc/CMakeLists.txt
+++ b/dll/win32/shdoclc/CMakeLists.txt
@@ -12,3 +12,5 @@ target_link_libraries(shdoclc wine)
 
 add_importlibs(shdoclc kernel32 ntdll)
 add_dependencies(shdoclc psdk buildno_header)
+
+add_cab_target(shdoclc 1)
\ No newline at end of file
diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt
index 40828461d15..6a0927d7328 100644
--- a/dll/win32/shfolder/CMakeLists.txt
+++ b/dll/win32/shfolder/CMakeLists.txt
@@ -14,3 +14,5 @@ target_link_libraries(shfolder wine)
 
 add_importlibs(shfolder shell32 kernel32 ntdll)
 add_dependencies(shfolder psdk buildno_header)
+
+add_cab_target(shfolder 1)
\ No newline at end of file
diff --git a/dll/win32/softpub/CMakeLists.txt b/dll/win32/softpub/CMakeLists.txt
index ba2218e912f..d2915a93779 100644
--- a/dll/win32/softpub/CMakeLists.txt
+++ b/dll/win32/softpub/CMakeLists.txt
@@ -13,4 +13,4 @@ target_link_libraries(softpub wine)
 
 add_importlibs(softpub wintrust)
 
-
+add_cab_target(softpub 1)
\ No newline at end of file
diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt
index f02f392d70d..3b8ca34c7d0 100644
--- a/dll/win32/srclient/CMakeLists.txt
+++ b/dll/win32/srclient/CMakeLists.txt
@@ -8,3 +8,5 @@ set_entrypoint(srclient 0)
 
 add_importlibs(srclient kernel32 ntdll)
 add_dependencies(srclient psdk)
+
+add_cab_target(srclient 1)
\ No newline at end of file
diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt
index b3bd521587f..fa919363fe9 100644
--- a/dll/win32/sxs/CMakeLists.txt
+++ b/dll/win32/sxs/CMakeLists.txt
@@ -13,3 +13,5 @@ target_link_libraries(sxs wine)
 
 add_importlibs(sxs kernel32 ntdll)
 add_dependencies(sxs psdk)
+
+add_cab_target(sxs 1)
\ No newline at end of file
diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt
index 8d314ecb28b..abb19d50783 100644
--- a/dll/win32/tapi32/CMakeLists.txt
+++ b/dll/win32/tapi32/CMakeLists.txt
@@ -17,3 +17,5 @@ target_link_libraries(tapi32 wine)
 
 add_importlibs(tapi32 advapi32 kernel32 ntdll)
 add_dependencies(tapi32 psdk buildno_header)
+
+add_cab_target(tapi32 1)
\ No newline at end of file
diff --git a/dll/win32/tapiui/CMakeLists.txt b/dll/win32/tapiui/CMakeLists.txt
index 5c2196391d4..63f68fa0b72 100644
--- a/dll/win32/tapiui/CMakeLists.txt
+++ b/dll/win32/tapiui/CMakeLists.txt
@@ -2,3 +2,5 @@
 add_library(tapiui SHARED tapiui.rc)
 set_entrypoint(tapiui 0)
 add_dependencies(tapiui psdk buildno_header)
+
+add_cab_target(tapiui 1)
\ No newline at end of file
diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt
index 1523c606c02..f0f25630027 100644
--- a/dll/win32/updspapi/CMakeLists.txt
+++ b/dll/win32/updspapi/CMakeLists.txt
@@ -13,3 +13,5 @@ target_link_libraries(updspapi wine)
 
 add_importlibs(updspapi setupapi kernel32 ntdll)
 add_dependencies(updspapi psdk buildno_header)
+
+add_cab_target(updspapi 1)
\ No newline at end of file
diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt
index befe27e4d3a..059a789e0d2 100644
--- a/dll/win32/wdmaud.drv/CMakeLists.txt
+++ b/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -31,3 +31,5 @@ target_link_libraries(wdmaud.drv
     mmixer)
 
 add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
+
+add_cab_target(wdmaud.drv 1)
\ No newline at end of file
diff --git a/dll/win32/winemp3.acm/CMakeLists.txt b/dll/win32/winemp3.acm/CMakeLists.txt
index 631d1e87b8d..b1e811b2fae 100644
--- a/dll/win32/winemp3.acm/CMakeLists.txt
+++ b/dll/win32/winemp3.acm/CMakeLists.txt
@@ -26,3 +26,5 @@ add_importlibs(winemp3.acm
     ntdll)
 
 add_dependencies(winemp3.acm psdk)
+
+add_cab_target(winemp3.acm 1)
\ No newline at end of file
diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt
index a646be3dfef..b7dca81910f 100644
--- a/dll/win32/winfax/CMakeLists.txt
+++ b/dll/win32/winfax/CMakeLists.txt
@@ -10,3 +10,5 @@ set_entrypoint(winfax 0)
 add_importlibs(winfax kernel32 ntdll)
 
 add_dependencies(winfax psdk)
+
+add_cab_target(winfax 1)
\ No newline at end of file
diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt
index a9fafcfebd3..3e5abbb0891 100644
--- a/dll/win32/wing32/CMakeLists.txt
+++ b/dll/win32/wing32/CMakeLists.txt
@@ -10,3 +10,5 @@ endif()
 set_entrypoint(wing32 0)
 add_importlibs(wing32 user32 gdi32)
 add_dependencies(wing32 psdk)
+
+add_cab_target(wing32 1)
\ No newline at end of file
diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt
index 742c2192b26..7389341a74e 100644
--- a/dll/win32/wlanapi/CMakeLists.txt
+++ b/dll/win32/wlanapi/CMakeLists.txt
@@ -15,3 +15,5 @@ target_link_libraries(wlanapi
 
 add_importlibs(wlanapi rpcrt4 kernel32 ntdll)
 add_dependencies(wlanapi psdk buildno_header)
+
+add_cab_target(wlanapi 1)
\ No newline at end of file
diff --git a/dll/win32/wmi/CMakeLists.txt b/dll/win32/wmi/CMakeLists.txt
index fc115fdd37f..f356dc01a48 100644
--- a/dll/win32/wmi/CMakeLists.txt
+++ b/dll/win32/wmi/CMakeLists.txt
@@ -9,3 +9,5 @@ set_entrypoint(wmi 0)
 
 add_importlibs(wmi advapi32)
 add_dependencies(wmi psdk buildno_header)
+
+add_cab_target(wmi 1)
\ No newline at end of file
diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt
index 27a6bcf401b..28cc35d2c3d 100644
--- a/dll/win32/wshtcpip/CMakeLists.txt
+++ b/dll/win32/wshtcpip/CMakeLists.txt
@@ -16,4 +16,4 @@ target_link_libraries(wshtcpip tdilib)
 add_importlibs(wshtcpip ws2_32 kernel32 ntdll)
 add_dependencies(wshtcpip psdk buildno_header)
 
-add_livecd_target(wshtcpip reactos/system32)
\ No newline at end of file
+add_cab_target(wshtcpip 1)
\ No newline at end of file