diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt
index 5e1c751de2f..5315a55e487 100644
--- a/reactos/dll/ntdll/CMakeLists.txt
+++ b/reactos/dll/ntdll/CMakeLists.txt
@@ -36,7 +36,7 @@ endif(ARCH MATCHES i386)
 
 add_library(ntdll SHARED ${SOURCE})
 
-set_entrypoint(ntdll 0)
+set_module_type(ntdll win32dll ENTRYPOINT 0)
 
 if(MSVC)
     add_linkerflag(ntdll /RELEASE)
@@ -48,7 +48,6 @@ target_link_libraries(ntdll
                       libcntpr
                       ${PSEH_LIB})
 
-set_image_base(ntdll ${baseaddress_ntdll})
 add_pch(ntdll include/ntdll.h)
 add_dependencies(ntdll ntstatus asm)
 
diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt
index 114d7d16ce8..a1da4b6da3f 100644
--- a/reactos/dll/win32/kernel32/CMakeLists.txt
+++ b/reactos/dll/win32/kernel32/CMakeLists.txt
@@ -93,8 +93,7 @@ endif(ARCH MATCHES i386)
 
 add_library(kernel32 SHARED ${SOURCE})
 
-set_entrypoint(kernel32 DllMain 12)
-set_image_base(kernel32 ${baseaddress_kernel32})
+set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12)
 
 target_link_libraries(kernel32 wine chkstk ${PSEH_LIB})
 
diff --git a/reactos/dll/win32/msacm32/CMakeLists.txt b/reactos/dll/win32/msacm32/CMakeLists.txt
index c000ed2213e..f3250c30d33 100644
--- a/reactos/dll/win32/msacm32/CMakeLists.txt
+++ b/reactos/dll/win32/msacm32/CMakeLists.txt
@@ -20,8 +20,7 @@ list(APPEND SOURCE
 
 add_library(msacm32 SHARED ${SOURCE})
 
-set_entrypoint(msacm32 DllMain 12)
-set_image_base(msacm32 ${baseaddress_msacm32})
+set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12)
 
 target_link_libraries(msacm32 wine)
 add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
diff --git a/reactos/dll/win32/msvcrt/CMakeLists.txt b/reactos/dll/win32/msvcrt/CMakeLists.txt
index 4335e1ed735..9a3a1f0f865 100644
--- a/reactos/dll/win32/msvcrt/CMakeLists.txt
+++ b/reactos/dll/win32/msvcrt/CMakeLists.txt
@@ -23,9 +23,9 @@ list(APPEND SOURCE
 
 add_library(msvcrt SHARED ${SOURCE})
 
+set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
+
 add_dependencies(msvcrt psdk)
-set_entrypoint(msvcrt DllMain 12)
-set_image_base(msvcrt ${baseaddress_msvcrt})
 
 target_link_libraries(msvcrt crt wine ${PSEH_LIB})
 
diff --git a/reactos/dll/win32/msvcrt20/CMakeLists.txt b/reactos/dll/win32/msvcrt20/CMakeLists.txt
index d9737a63cfa..2de205cee95 100644
--- a/reactos/dll/win32/msvcrt20/CMakeLists.txt
+++ b/reactos/dll/win32/msvcrt20/CMakeLists.txt
@@ -20,10 +20,9 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
 
 add_library(msvcrt20 SHARED ${SOURCE})
+set_module_type(msvcrt20 win32dll ENTRYPOINT DllMain 12)
 
 add_dependencies(msvcrt20 psdk)
-set_entrypoint(msvcrt20 DllMain 12)
-set_image_base(msvcrt20 ${baseaddress_msvcrt20})
 
 target_link_libraries(msvcrt20 crt wine ${PSEH_LIB})
 
diff --git a/reactos/dll/win32/msvcrt40/CMakeLists.txt b/reactos/dll/win32/msvcrt40/CMakeLists.txt
index eb67cd7538c..cd2624771a2 100644
--- a/reactos/dll/win32/msvcrt40/CMakeLists.txt
+++ b/reactos/dll/win32/msvcrt40/CMakeLists.txt
@@ -21,9 +21,9 @@ list(APPEND SOURCE
 
 add_library(msvcrt40 SHARED ${SOURCE})
 
+set_module_type(msvcrt40 win32dll ENTRYPOINT DllMain 12)
+
 add_dependencies(msvcrt40 psdk)
-set_entrypoint(msvcrt40 DllMain 12)
-set_image_base(msvcrt40 ${baseaddress_msvcrt40})
 
 target_link_libraries(msvcrt40 crt wine ${PSEH_LIB})