diff --git a/reactos/dll/win32/cfgmgr32/CMakeLists.txt b/reactos/dll/win32/cfgmgr32/CMakeLists.txt
index ad1bdcb7ab1..54cadb935f3 100644
--- a/reactos/dll/win32/cfgmgr32/CMakeLists.txt
+++ b/reactos/dll/win32/cfgmgr32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_library(cfgmgr32 SHARED ${SOURCE})
 
-set_entrypoint(cfgmgr32 0)
+set_module_type(cfgmgr32 win32dll ENTRYPOINT 0 )
 add_importlibs(cfgmgr32 setupapi kernel32 ntdll)
 add_dependencies(cfgmgr32 psdk)
 add_cd_file(TARGET cfgmgr32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/comcat/CMakeLists.txt b/reactos/dll/win32/comcat/CMakeLists.txt
index 29a60062079..765307d6bf1 100644
--- a/reactos/dll/win32/comcat/CMakeLists.txt
+++ b/reactos/dll/win32/comcat/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
 
 add_library(comcat SHARED ${SOURCE})
 
-set_entrypoint(comcat 0)
+set_module_type(comcat win32dll ENTRYPOINT 0 )
 
 target_link_libraries(comcat uuid wine)
 
diff --git a/reactos/dll/win32/crtdll/CMakeLists.txt b/reactos/dll/win32/crtdll/CMakeLists.txt
index 942a34a840a..5444d68ae23 100644
--- a/reactos/dll/win32/crtdll/CMakeLists.txt
+++ b/reactos/dll/win32/crtdll/CMakeLists.txt
@@ -19,9 +19,7 @@ list(APPEND SOURCE
 
 add_library(crtdll SHARED ${SOURCE})
 
-set_module_type(crtdll win32dll)
-
-set_entrypoint(crtdll DllMain 12)
+set_module_type(crtdll win32dll ENTRYPOINT DllMain 12)
 
 target_link_libraries(crtdll wine crt)
 
diff --git a/reactos/dll/win32/dnsapi/CMakeLists.txt b/reactos/dll/win32/dnsapi/CMakeLists.txt
index da10aab172c..5e89d65dc2f 100644
--- a/reactos/dll/win32/dnsapi/CMakeLists.txt
+++ b/reactos/dll/win32/dnsapi/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
 
 add_library(dnsapi SHARED ${SOURCE})
 
-set_entrypoint(dnsapi 0)
+set_module_type(dnsapi win32dll ENTRYPOINT 0 )
 target_link_libraries(dnsapi adns)
 add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
 add_pch(dnsapi dnsapi/precomp.h)
diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt
index 469391c2d98..9f86250cc3e 100644
--- a/reactos/dll/win32/fmifs/CMakeLists.txt
+++ b/reactos/dll/win32/fmifs/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
 add_library(fmifs SHARED ${SOURCE})
-set_entrypoint(fmifs InitializeFmIfs 12)
+set_module_type(fmifs win32dll ENTRYPOINT InitializeFmIfs 12)
 add_importlibs(fmifs kernel32 ntdll)
 add_pch(fmifs precomp.h)
 add_dependencies(fmifs psdk)
diff --git a/reactos/dll/win32/glu32/CMakeLists.txt b/reactos/dll/win32/glu32/CMakeLists.txt
index 24f98502940..0a7077b6ddc 100644
--- a/reactos/dll/win32/glu32/CMakeLists.txt
+++ b/reactos/dll/win32/glu32/CMakeLists.txt
@@ -108,7 +108,7 @@ list(APPEND SOURCE
 
 add_library(glu32 SHARED ${SOURCE})
 
-set_entrypoint(glu32 0)
+set_module_type(glu32 win32dll ENTRYPOINT 0 )
 
 if(NOT MSVC)
     target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames)
diff --git a/reactos/dll/win32/imaadp32.acm/CMakeLists.txt b/reactos/dll/win32/imaadp32.acm/CMakeLists.txt
index 772071b846b..030eeaddee2 100644
--- a/reactos/dll/win32/imaadp32.acm/CMakeLists.txt
+++ b/reactos/dll/win32/imaadp32.acm/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(imaadp32.acm SHARED ${SOURCE})
 
-set_entrypoint(imaadp32.acm 0)
+set_module_type(imaadp32.acm win32dll ENTRYPOINT 0 )
 set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")
 target_link_libraries(imaadp32.acm wine)
 add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt
index 28a53b731fe..8e98f23e592 100644
--- a/reactos/dll/win32/lsasrv/CMakeLists.txt
+++ b/reactos/dll/win32/lsasrv/CMakeLists.txt
@@ -24,7 +24,6 @@ list(APPEND SOURCE
 add_library(lsasrv SHARED ${SOURCE})
 set_module_type(lsasrv win32dll ENTRYPOINT 0 UNICODE)
 
-set_entrypoint(lsasrv 0)
 target_link_libraries(lsasrv wine ${PSEH_LIB})
 add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll)
 add_pch(lsasrv lsasrv.h)
diff --git a/reactos/dll/win32/lz32/CMakeLists.txt b/reactos/dll/win32/lz32/CMakeLists.txt
index a120899e5d2..efa2369a102 100644
--- a/reactos/dll/win32/lz32/CMakeLists.txt
+++ b/reactos/dll/win32/lz32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(lz32 SHARED ${SOURCE})
 
-set_entrypoint(lz32 0)
+set_module_type(lz32 win32dll ENTRYPOINT 0 )
 target_link_libraries(lz32 wine)
 
 add_importlibs(lz32 kernel32 ntdll)
diff --git a/reactos/dll/win32/mcicda/CMakeLists.txt b/reactos/dll/win32/mcicda/CMakeLists.txt
index 3c01576d126..d94e9013766 100644
--- a/reactos/dll/win32/mcicda/CMakeLists.txt
+++ b/reactos/dll/win32/mcicda/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(mcicda SHARED ${SOURCE})
 
-set_entrypoint(mcicda 0)
+set_module_type(mcicda win32dll ENTRYPOINT 0 )
 target_link_libraries(mcicda wine)
 add_importlibs(mcicda winmm user32 kernel32 ntdll)
 add_dependencies(mcicda psdk)
diff --git a/reactos/dll/win32/mlang/CMakeLists.txt b/reactos/dll/win32/mlang/CMakeLists.txt
index cdf641dae56..ba1a39846fb 100644
--- a/reactos/dll/win32/mlang/CMakeLists.txt
+++ b/reactos/dll/win32/mlang/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
 
 add_library(mlang SHARED ${SOURCE})
-set_entrypoint(mlang 0)
+set_module_type(mlang win32dll ENTRYPOINT 0 )
 target_link_libraries(mlang uuid wine)
 add_delay_importlibs(mlang oleaut32)
 
diff --git a/reactos/dll/win32/mmdrv/CMakeLists.txt b/reactos/dll/win32/mmdrv/CMakeLists.txt
index 8a906b4a400..cffd8b46795 100644
--- a/reactos/dll/win32/mmdrv/CMakeLists.txt
+++ b/reactos/dll/win32/mmdrv/CMakeLists.txt
@@ -17,7 +17,6 @@ list(APPEND SOURCE
 add_library(mmdrv SHARED ${SOURCE})
 set_module_type(mmdrv win32dll ENTRYPOINT 0 UNICODE)
 
-set_entrypoint(mmdrv 0)
 add_importlibs(mmdrv winmm user32 kernel32 ntdll)
 add_dependencies(mmdrv psdk)
 add_cd_file(TARGET mmdrv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msadp32.acm/CMakeLists.txt b/reactos/dll/win32/msadp32.acm/CMakeLists.txt
index 6a2f55874c3..9e8bcfe9135 100644
--- a/reactos/dll/win32/msadp32.acm/CMakeLists.txt
+++ b/reactos/dll/win32/msadp32.acm/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(msadp32.acm SHARED ${SOURCE})
 
-set_entrypoint(msadp32.acm 0)
+set_module_type(msadp32.acm win32dll ENTRYPOINT 0 )
 set_target_properties(msadp32.acm PROPERTIES SUFFIX "")
 target_link_libraries(msadp32.acm wine)
 add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll)
diff --git a/reactos/dll/win32/msg711.acm/CMakeLists.txt b/reactos/dll/win32/msg711.acm/CMakeLists.txt
index 4ffcd516a7c..47cd1366a8b 100644
--- a/reactos/dll/win32/msg711.acm/CMakeLists.txt
+++ b/reactos/dll/win32/msg711.acm/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(msg711.acm SHARED ${SOURCE})
 
-set_entrypoint(msg711.acm 0)
+set_module_type(msg711.acm win32dll ENTRYPOINT 0 )
 set_target_properties(msg711.acm PROPERTIES SUFFIX "")
 target_link_libraries(msg711.acm wine)
 add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll)
diff --git a/reactos/dll/win32/msgsm32.acm/CMakeLists.txt b/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
index d5fadf4b1c2..aecf1e1d880 100644
--- a/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
+++ b/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(msgsm32.acm SHARED ${SOURCE})
 
-set_entrypoint(msgsm32.acm 0)
+set_module_type(msgsm32.acm win32dll ENTRYPOINT 0 )
 set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
 target_link_libraries(msgsm32.acm wine)
 add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll)
diff --git a/reactos/dll/win32/mshtml.tlb/CMakeLists.txt b/reactos/dll/win32/mshtml.tlb/CMakeLists.txt
index 01e7364085c..f3bd5ee5302 100644
--- a/reactos/dll/win32/mshtml.tlb/CMakeLists.txt
+++ b/reactos/dll/win32/mshtml.tlb/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_library(mshtml.tlb SHARED rsrc.rc)
 
-set_entrypoint(mshtml.tlb 0)
+set_module_type(mshtml.tlb win32dll ENTRYPOINT 0 )
 set_target_properties(mshtml.tlb PROPERTIES SUFFIX "")
 add_dependencies(mshtml.tlb mshtml__tlb)
 add_cd_file(TARGET mshtml.tlb DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/nddeapi/CMakeLists.txt b/reactos/dll/win32/nddeapi/CMakeLists.txt
index a085f6bf6d0..b62840a2b83 100644
--- a/reactos/dll/win32/nddeapi/CMakeLists.txt
+++ b/reactos/dll/win32/nddeapi/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
 
 add_library(nddeapi SHARED ${SOURCE})
-set_entrypoint(nddeapi 0)
+set_module_type(nddeapi win32dll ENTRYPOINT 0 )
 
 target_link_libraries(nddeapi wine)
 
diff --git a/reactos/dll/win32/ntdsapi/CMakeLists.txt b/reactos/dll/win32/ntdsapi/CMakeLists.txt
index 60f13dbc4d2..924821967f6 100644
--- a/reactos/dll/win32/ntdsapi/CMakeLists.txt
+++ b/reactos/dll/win32/ntdsapi/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def)
 
 add_library(ntdsapi SHARED ${SOURCE})
-set_entrypoint(ntdsapi 0)
+set_module_type(ntdsapi win32dll ENTRYPOINT 0 )
 
 target_link_libraries(ntdsapi wine)
 
diff --git a/reactos/dll/win32/odbccp32/CMakeLists.txt b/reactos/dll/win32/odbccp32/CMakeLists.txt
index 16e60613f59..054991cfe63 100644
--- a/reactos/dll/win32/odbccp32/CMakeLists.txt
+++ b/reactos/dll/win32/odbccp32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
 
 add_library(odbccp32 SHARED ${SOURCE})
 
-set_entrypoint(odbccp32 0)
+set_module_type(odbccp32 win32dll ENTRYPOINT 0 )
 target_link_libraries(odbccp32 uuid wine)
 
 add_importlibs(odbccp32
diff --git a/reactos/dll/win32/olecli32/CMakeLists.txt b/reactos/dll/win32/olecli32/CMakeLists.txt
index fa9032389e3..468a80accb4 100644
--- a/reactos/dll/win32/olecli32/CMakeLists.txt
+++ b/reactos/dll/win32/olecli32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def)
 
 add_library(olecli32 SHARED ${SOURCE})
-set_entrypoint(olecli32 0)
+set_module_type(olecli32 win32dll ENTRYPOINT 0 )
 
 target_link_libraries(olecli32 wine)
 
diff --git a/reactos/dll/win32/olepro32/CMakeLists.txt b/reactos/dll/win32/olepro32/CMakeLists.txt
index 3dda022eeb3..4c83b168938 100644
--- a/reactos/dll/win32/olepro32/CMakeLists.txt
+++ b/reactos/dll/win32/olepro32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
 
 add_library(olepro32 SHARED ${SOURCE})
 
-set_entrypoint(olepro32 0)
+set_module_type(olepro32 win32dll ENTRYPOINT 0 )
 
 target_link_libraries(olepro32 wine)
 
diff --git a/reactos/dll/win32/olesvr32/CMakeLists.txt b/reactos/dll/win32/olesvr32/CMakeLists.txt
index dbfc68a3ef4..3521cb66ff2 100644
--- a/reactos/dll/win32/olesvr32/CMakeLists.txt
+++ b/reactos/dll/win32/olesvr32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
 
 add_library(olesvr32 SHARED ${SOURCE})
 
-set_entrypoint(olesvr32 0)
+set_module_type(olesvr32 win32dll ENTRYPOINT 0 )
 
 target_link_libraries(olesvr32 wine)
 
diff --git a/reactos/dll/win32/pdh/CMakeLists.txt b/reactos/dll/win32/pdh/CMakeLists.txt
index 6a814245ccb..edd3534c193 100644
--- a/reactos/dll/win32/pdh/CMakeLists.txt
+++ b/reactos/dll/win32/pdh/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/pdh.def)
 
 add_library(pdh SHARED ${SOURCE})
-set_entrypoint(pdh 0)
+set_module_type(pdh win32dll ENTRYPOINT 0 )
 
 target_link_libraries(pdh wine)
 
diff --git a/reactos/dll/win32/printui/CMakeLists.txt b/reactos/dll/win32/printui/CMakeLists.txt
index 72777f17c6d..34151efc37a 100644
--- a/reactos/dll/win32/printui/CMakeLists.txt
+++ b/reactos/dll/win32/printui/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/printui.def)
 
 add_library(printui SHARED ${SOURCE})
-set_entrypoint(printui 0)
+set_module_type(printui win32dll ENTRYPOINT 0 )
 
 target_link_libraries(printui wine)
 
diff --git a/reactos/dll/win32/rasapi32/CMakeLists.txt b/reactos/dll/win32/rasapi32/CMakeLists.txt
index f3d3728b568..a3954286467 100644
--- a/reactos/dll/win32/rasapi32/CMakeLists.txt
+++ b/reactos/dll/win32/rasapi32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def)
 
 add_library(rasapi32 SHARED ${SOURCE})
-set_entrypoint(rasapi32 0)
+set_module_type(rasapi32 win32dll ENTRYPOINT 0 )
 
 target_link_libraries(rasapi32 wine)
 
diff --git a/reactos/dll/win32/rsabase/CMakeLists.txt b/reactos/dll/win32/rsabase/CMakeLists.txt
index d9060f0e99d..644eae6c3bd 100644
--- a/reactos/dll/win32/rsabase/CMakeLists.txt
+++ b/reactos/dll/win32/rsabase/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(rsabase SHARED ${SOURCE})
 
-set_entrypoint(rsabase 0)
+set_module_type(rsabase win32dll ENTRYPOINT 0 )
 target_link_libraries(rsabase wine)
 add_importlibs(rsabase rsaenh ntdll)
 add_cd_file(TARGET rsabase DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/shdoclc/CMakeLists.txt b/reactos/dll/win32/shdoclc/CMakeLists.txt
index fe4dcba4daf..843c88a3916 100644
--- a/reactos/dll/win32/shdoclc/CMakeLists.txt
+++ b/reactos/dll/win32/shdoclc/CMakeLists.txt
@@ -7,7 +7,7 @@ spec2def(shdoclc.dll shdoclc.spec)
 add_library(shdoclc SHARED rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def)
 
-set_entrypoint(shdoclc 0)
+set_module_type(shdoclc win32dll ENTRYPOINT 0 )
 
 target_link_libraries(shdoclc wine)
 
diff --git a/reactos/dll/win32/shfolder/CMakeLists.txt b/reactos/dll/win32/shfolder/CMakeLists.txt
index 92b32eb30ec..e973f7cae9f 100644
--- a/reactos/dll/win32/shfolder/CMakeLists.txt
+++ b/reactos/dll/win32/shfolder/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 
 add_library(shfolder SHARED ${SOURCE})
 
-set_entrypoint(shfolder 0)
+set_module_type(shfolder win32dll ENTRYPOINT 0 )
 
 target_link_libraries(shfolder wine)
 add_importlibs(shfolder shell32 kernel32 ntdll)
diff --git a/reactos/dll/win32/smdll/CMakeLists.txt b/reactos/dll/win32/smdll/CMakeLists.txt
index 6a8026f1fc5..e12d8a4ea63 100644
--- a/reactos/dll/win32/smdll/CMakeLists.txt
+++ b/reactos/dll/win32/smdll/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
 add_library(smdll SHARED ${SOURCE})
 
 target_link_libraries(smdll smlib)
-set_entrypoint(smdll DllMainCRTStartup 12)
+set_module_type(smdll nativedll ENTRYPOINT DllMainCRTStartup 12)
 add_importlibs(smdll ntdll)
 add_pch(smdll precomp.h)
 add_dependencies(smdll psdk)
diff --git a/reactos/dll/win32/softpub/CMakeLists.txt b/reactos/dll/win32/softpub/CMakeLists.txt
index a4fb73cfbea..72bcd45dbe2 100644
--- a/reactos/dll/win32/softpub/CMakeLists.txt
+++ b/reactos/dll/win32/softpub/CMakeLists.txt
@@ -7,7 +7,7 @@ spec2def(softpub.dll softpub.spec)
 add_library(softpub SHARED softpub.rc
     ${CMAKE_CURRENT_BINARY_DIR}/softpub.def)
 
-set_entrypoint(softpub 0)
+set_module_type(softpub win32dll ENTRYPOINT 0 )
 
 target_link_libraries(softpub wine)
 
diff --git a/reactos/dll/win32/srclient/CMakeLists.txt b/reactos/dll/win32/srclient/CMakeLists.txt
index e6088bb1453..995f2b395ca 100644
--- a/reactos/dll/win32/srclient/CMakeLists.txt
+++ b/reactos/dll/win32/srclient/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
 
 add_library(srclient SHARED ${SOURCE})
-set_entrypoint(srclient 0)
+set_module_type(srclient win32dll ENTRYPOINT 0 )
 
 add_importlibs(srclient kernel32 ntdll)
 add_dependencies(srclient psdk)
diff --git a/reactos/dll/win32/stdole2.tlb/CMakeLists.txt b/reactos/dll/win32/stdole2.tlb/CMakeLists.txt
index 16b15175704..75ac0e19f09 100644
--- a/reactos/dll/win32/stdole2.tlb/CMakeLists.txt
+++ b/reactos/dll/win32/stdole2.tlb/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
 
 add_library(stdole2.tlb SHARED ${SOURCE})
 
-set_entrypoint(stdole2.tlb 0)
+set_module_type(stdole2.tlb win32dll ENTRYPOINT 0 )
 set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
 add_dependencies(stdole2.tlb std_ole_v2)
 add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/stdole32.tlb/CMakeLists.txt b/reactos/dll/win32/stdole32.tlb/CMakeLists.txt
index b563d273fc5..b4d1fbe9197 100644
--- a/reactos/dll/win32/stdole32.tlb/CMakeLists.txt
+++ b/reactos/dll/win32/stdole32.tlb/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
 
 add_library(stdole32.tlb SHARED ${SOURCE})
 
-set_entrypoint(stdole32.tlb 0)
+set_module_type(stdole32.tlb win32dll ENTRYPOINT 0 )
 set_target_properties(stdole32.tlb PROPERTIES SUFFIX "")
 
 add_dependencies(stdole32.tlb std_ole_v1)
diff --git a/reactos/dll/win32/sxs/CMakeLists.txt b/reactos/dll/win32/sxs/CMakeLists.txt
index 74e5742fe6e..4e23ad77755 100644
--- a/reactos/dll/win32/sxs/CMakeLists.txt
+++ b/reactos/dll/win32/sxs/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 
 add_library(sxs SHARED ${SOURCE})
-set_entrypoint(sxs 0)
+set_module_type(sxs win32dll ENTRYPOINT 0 )
 
 target_link_libraries(sxs wine)
 
diff --git a/reactos/dll/win32/tapi32/CMakeLists.txt b/reactos/dll/win32/tapi32/CMakeLists.txt
index 41017c22ee5..c896e373add 100644
--- a/reactos/dll/win32/tapi32/CMakeLists.txt
+++ b/reactos/dll/win32/tapi32/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
 
 add_library(tapi32 SHARED ${SOURCE})
 
-set_entrypoint(tapi32 0)
+set_module_type(tapi32 win32dll ENTRYPOINT 0 )
 
 target_link_libraries(tapi32 wine)
 
diff --git a/reactos/dll/win32/tapiui/CMakeLists.txt b/reactos/dll/win32/tapiui/CMakeLists.txt
index a9bb4f5d442..b75dd8de35f 100644
--- a/reactos/dll/win32/tapiui/CMakeLists.txt
+++ b/reactos/dll/win32/tapiui/CMakeLists.txt
@@ -2,6 +2,6 @@
 set_rc_compiler()
 
 add_library(tapiui SHARED tapiui.rc)
-set_entrypoint(tapiui 0)
+set_module_type(tapiui win32dll ENTRYPOINT 0 )
 add_dependencies(tapiui psdk)
 add_cd_file(TARGET tapiui DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/ufatx/CMakeLists.txt b/reactos/dll/win32/ufatx/CMakeLists.txt
index 1c8704e7551..8304306bbce 100644
--- a/reactos/dll/win32/ufatx/CMakeLists.txt
+++ b/reactos/dll/win32/ufatx/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
 
 add_library(ufatx SHARED ${SOURCE})
 
-set_entrypoint(ufatx 0)
+set_module_type(ufatx win32dll ENTRYPOINT 0 )
 
 target_link_libraries(ufatx vfatxlib)
 add_importlibs(ufatx ntdll)
diff --git a/reactos/dll/win32/unicows/CMakeLists.txt b/reactos/dll/win32/unicows/CMakeLists.txt
index a8ef2fab00e..2c5e7d2aa59 100644
--- a/reactos/dll/win32/unicows/CMakeLists.txt
+++ b/reactos/dll/win32/unicows/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
 
 add_library(unicows SHARED ${SOURCE})
 
-set_entrypoint(unicows 0)
+set_module_type(unicows win32dll ENTRYPOINT 0 )
 
 add_importlibs(unicows
     avicap32
diff --git a/reactos/dll/win32/updspapi/CMakeLists.txt b/reactos/dll/win32/updspapi/CMakeLists.txt
index 456ccde58f2..b68662925e0 100644
--- a/reactos/dll/win32/updspapi/CMakeLists.txt
+++ b/reactos/dll/win32/updspapi/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def)
 
 add_library(updspapi SHARED ${SOURCE})
-set_entrypoint(updspapi 0)
+set_module_type(updspapi win32dll ENTRYPOINT 0 )
 
 target_link_libraries(updspapi wine)
 
diff --git a/reactos/dll/win32/version/CMakeLists.txt b/reactos/dll/win32/version/CMakeLists.txt
index beaf8ba13cc..faf0680239c 100644
--- a/reactos/dll/win32/version/CMakeLists.txt
+++ b/reactos/dll/win32/version/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
 
 add_library(version SHARED ${SOURCE})
 
-set_entrypoint(version 0)
+set_module_type(version win32dll ENTRYPOINT 0 )
 
 target_link_libraries(version wine)
 add_importlibs(version lz32 kernel32 ntdll)
diff --git a/reactos/dll/win32/winemp3.acm/CMakeLists.txt b/reactos/dll/win32/winemp3.acm/CMakeLists.txt
index a7f7e01edf3..cd00d82218d 100644
--- a/reactos/dll/win32/winemp3.acm/CMakeLists.txt
+++ b/reactos/dll/win32/winemp3.acm/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(winemp3.acm SHARED
     mpegl3.c
     ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def)
 
-set_entrypoint(winemp3.acm 0)
+set_module_type(winemp3.acm win32dll ENTRYPOINT 0 )
 set_target_properties(winemp3.acm PROPERTIES SUFFIX "")
 target_link_libraries(winemp3.acm wine libmpg123 oldnames)
 
diff --git a/reactos/dll/win32/winfax/CMakeLists.txt b/reactos/dll/win32/winfax/CMakeLists.txt
index ced03a8fb41..5c001863c26 100644
--- a/reactos/dll/win32/winfax/CMakeLists.txt
+++ b/reactos/dll/win32/winfax/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_library(winfax SHARED ${SOURCE})
 
-set_entrypoint(winfax 0)
+set_module_type(winfax win32dll ENTRYPOINT 0 )
 
 add_importlibs(winfax kernel32 ntdll)
 add_dependencies(winfax psdk)
diff --git a/reactos/dll/win32/winmm/midimap/CMakeLists.txt b/reactos/dll/win32/winmm/midimap/CMakeLists.txt
index 701c69e735f..0e31cdd4887 100644
--- a/reactos/dll/win32/winmm/midimap/CMakeLists.txt
+++ b/reactos/dll/win32/winmm/midimap/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(midimap SHARED
     midimap.rc
     ${CMAKE_CURRENT_BINARY_DIR}/midimap.def)
 
-set_entrypoint(midimap 0)
+set_module_type(midimap win32dll ENTRYPOINT 0 )
 
 target_link_libraries(midimap uuid wine)
 
diff --git a/reactos/dll/win32/wlanapi/CMakeLists.txt b/reactos/dll/win32/wlanapi/CMakeLists.txt
index 5c040013b8a..1f87bd30765 100644
--- a/reactos/dll/win32/wlanapi/CMakeLists.txt
+++ b/reactos/dll/win32/wlanapi/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
 
 add_library(wlanapi SHARED ${SOURCE})
 
-set_entrypoint(wlanapi 0)
+set_module_type(wlanapi win32dll ENTRYPOINT 0 )
 
 target_link_libraries(wlanapi
     wine
diff --git a/reactos/dll/win32/wmi/CMakeLists.txt b/reactos/dll/win32/wmi/CMakeLists.txt
index d80d3eedc3b..7d37a29e7c3 100644
--- a/reactos/dll/win32/wmi/CMakeLists.txt
+++ b/reactos/dll/win32/wmi/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
 
 add_library(wmi SHARED ${SOURCE})
 
-set_entrypoint(wmi 0)
+set_module_type(wmi win32dll ENTRYPOINT 0 )
 
 add_importlibs(wmi advapi32)
 add_dependencies(wmi psdk)