diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84b900c37e7..3b66140da10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ include(sdk/include/reactos/version.cmake)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
+set(CMAKE_SHARED_MODULE_PREFIX "")
 set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
diff --git a/base/applications/charmap_new/CMakeLists.txt b/base/applications/charmap_new/CMakeLists.txt
index 005eff55962..657a5cb8fd5 100644
--- a/base/applications/charmap_new/CMakeLists.txt
+++ b/base/applications/charmap_new/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     MainWindow.cpp
 	)
 
-add_library(charmap SHARED
+add_library(charmap MODULE
     ${SOURCE}
     charmap.rc)
 
diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt b/base/applications/kbswitch/kbsdll/CMakeLists.txt
index b192592cde0..65766c8a045 100644
--- a/base/applications/kbswitch/kbsdll/CMakeLists.txt
+++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     kbsdll.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
 
-add_library(kbsdll SHARED ${SOURCE})
+add_library(kbsdll MODULE ${SOURCE})
 set_module_type(kbsdll win32dll UNICODE)
 add_importlibs(kbsdll user32 comctl32 msvcrt kernel32)
 add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/regedit/clb/CMakeLists.txt b/base/applications/regedit/clb/CMakeLists.txt
index e42653eb50a..ae01afcf05c 100644
--- a/base/applications/regedit/clb/CMakeLists.txt
+++ b/base/applications/regedit/clb/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(clb.dll clb.spec)
 
-add_library(clb SHARED
+add_library(clb MODULE
     clb.c
     clb.rc
     ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
diff --git a/base/services/dcomlaunch/CMakeLists.txt b/base/services/dcomlaunch/CMakeLists.txt
index 6759d029aad..3a736d2b371 100644
--- a/base/services/dcomlaunch/CMakeLists.txt
+++ b/base/services/dcomlaunch/CMakeLists.txt
@@ -1,6 +1,6 @@
 spec2def(dcomlaunch.dll dcomlaunch.spec ADD_IMPORTLIB)
 
-add_library(dcomlaunch SHARED
+add_library(dcomlaunch MODULE
     dcomlaunch.c
     network.c
     dcomlaunch.rc
diff --git a/base/services/dhcpcsvc/CMakeLists.txt b/base/services/dhcpcsvc/CMakeLists.txt
index 517582e5584..e559f15524e 100644
--- a/base/services/dhcpcsvc/CMakeLists.txt
+++ b/base/services/dhcpcsvc/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     dhcpcsvc.c
     include/rosdhcp.h)
 
-add_library(dhcpcsvc SHARED
+add_library(dhcpcsvc MODULE
     ${SOURCE}
     dhcpcsvc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_stubs.c
diff --git a/base/services/schedsvc/CMakeLists.txt b/base/services/schedsvc/CMakeLists.txt
index aef862da15e..df44946efcb 100644
--- a/base/services/schedsvc/CMakeLists.txt
+++ b/base/services/schedsvc/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/atsvc.idl)
 spec2def(schedsvc.dll schedsvc.spec ADD_IMPORTLIB)
 
-add_library(schedsvc SHARED
+add_library(schedsvc MODULE
     job.c
     rpcserver.c
     schedsvc.c
diff --git a/base/services/shsvcs/CMakeLists.txt b/base/services/shsvcs/CMakeLists.txt
index 1de1b2637e8..2c754dbba5f 100644
--- a/base/services/shsvcs/CMakeLists.txt
+++ b/base/services/shsvcs/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(shsvcs.dll shsvcs.spec ADD_IMPORTLIB)
 
-add_library(shsvcs SHARED
+add_library(shsvcs MODULE
     shsvcs.c
     thmsvc.c
     thmserver.c
diff --git a/base/services/srvsvc/CMakeLists.txt b/base/services/srvsvc/CMakeLists.txt
index b72e9f9e497..d66f7abbe61 100644
--- a/base/services/srvsvc/CMakeLists.txt
+++ b/base/services/srvsvc/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/srvsvc.idl)
 spec2def(srvsvc.dll srvsvc.spec ADD_IMPORTLIB)
 
-add_library(srvsvc SHARED
+add_library(srvsvc MODULE
     rpcserver.c
     srvsvc.c
     srvsvc.rc
diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt
index c361e5ef23c..4248d0e9d81 100644
--- a/base/services/umpnpmgr/CMakeLists.txt
+++ b/base/services/umpnpmgr/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl)
 spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB)
 
-add_library(umpnpmgr SHARED
+add_library(umpnpmgr MODULE
     umpnpmgr.c
     umpnpmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/pnp_s.c
diff --git a/base/services/wkssvc/CMakeLists.txt b/base/services/wkssvc/CMakeLists.txt
index 2d2edea85fa..d7404cdcb50 100644
--- a/base/services/wkssvc/CMakeLists.txt
+++ b/base/services/wkssvc/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wkssvc.idl)
 spec2def(wkssvc.dll wkssvc.spec ADD_IMPORTLIB)
 
-add_library(wkssvc SHARED
+add_library(wkssvc MODULE
     rpcserver.c
     wkssvc.c
     wkssvc.rc
diff --git a/base/services/wmisvc/CMakeLists.txt b/base/services/wmisvc/CMakeLists.txt
index 3c8b8f9f924..27bfeb0e0e9 100644
--- a/base/services/wmisvc/CMakeLists.txt
+++ b/base/services/wmisvc/CMakeLists.txt
@@ -1,6 +1,6 @@
 spec2def(wmisvc.dll wmisvc.spec ADD_IMPORTLIB)
 
-add_library(wmisvc SHARED
+add_library(wmisvc MODULE
     wmisvc.c
     wmisvc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wmisvc.def)
diff --git a/base/services/wuauserv/CMakeLists.txt b/base/services/wuauserv/CMakeLists.txt
index 841d836fa6f..14ffee84197 100644
--- a/base/services/wuauserv/CMakeLists.txt
+++ b/base/services/wuauserv/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(wuauserv SHARED
+add_library(wuauserv MODULE
     wuauserv.c
     wuauserv.rc)
 
diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt
index 39a2b19d236..4297edbb2e8 100644
--- a/base/shell/rshell/CMakeLists.txt
+++ b/base/shell/rshell/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     misc.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/rshell.def)
 
-add_library(rshell SHARED ${SOURCE})
+add_library(rshell MODULE ${SOURCE})
 
 set_module_type(rshell win32dll UNICODE)
 
diff --git a/dll/3rdparty/dxtn/CMakeLists.txt b/dll/3rdparty/dxtn/CMakeLists.txt
index 6a9c6432877..c615500586b 100644
--- a/dll/3rdparty/dxtn/CMakeLists.txt
+++ b/dll/3rdparty/dxtn/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(dxtn.dll dxtn.spec)
 
-add_library(dxtn SHARED
+add_library(dxtn MODULE
     txc_compress_dxtn.c
     txc_fetch_dxtn.c
     ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def)
diff --git a/dll/3rdparty/libjpeg/CMakeLists.txt b/dll/3rdparty/libjpeg/CMakeLists.txt
index 41a142dba0f..fefc3da850c 100644
--- a/dll/3rdparty/libjpeg/CMakeLists.txt
+++ b/dll/3rdparty/libjpeg/CMakeLists.txt
@@ -59,7 +59,7 @@ list(APPEND SOURCE
     jmemnobs.c
     precomp.h)
 
-add_library(libjpeg SHARED ${SOURCE})
+add_library(libjpeg MODULE ${SOURCE})
 set_module_type(libjpeg win32dll)
 add_importlibs(libjpeg msvcrt kernel32)
 add_pch(libjpeg precomp.h SOURCE)
diff --git a/dll/3rdparty/libpng/CMakeLists.txt b/dll/3rdparty/libpng/CMakeLists.txt
index cf4b0b4ed42..2e293d369c5 100644
--- a/dll/3rdparty/libpng/CMakeLists.txt
+++ b/dll/3rdparty/libpng/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND SOURCE
     pngwutil.c
     pngpriv.h)
 
-add_library(libpng SHARED ${SOURCE})
+add_library(libpng MODULE ${SOURCE})
 set_module_type(libpng win32dll)
 target_link_libraries(libpng zlib)
 add_importlibs(libpng msvcrt kernel32 ntdll)
diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt
index 476e2b1f726..10fd5e33b06 100644
--- a/dll/3rdparty/libtiff/CMakeLists.txt
+++ b/dll/3rdparty/libtiff/CMakeLists.txt
@@ -54,7 +54,7 @@ list(APPEND SOURCE
     #tif_zstd.c
     precomp.h)
 
-add_library(libtiff SHARED ${SOURCE} libtiff.def)
+add_library(libtiff MODULE ${SOURCE} libtiff.def)
 set_module_type(libtiff win32dll)
 target_link_libraries(libtiff zlib getopt)
 add_importlibs(libtiff user32 msvcrt kernel32 ntdll)
diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt
index 46714d6d718..a48db75fdb0 100644
--- a/dll/3rdparty/libtirpc/CMakeLists.txt
+++ b/dll/3rdparty/libtirpc/CMakeLists.txt
@@ -87,7 +87,7 @@ list(APPEND SOURCE
     src/xdr_stdio.c
     precomp.h)
 
-add_library(libtirpc SHARED
+add_library(libtirpc MODULE
     ${SOURCE}
 #    libtirpc/libtirpc.rc
     libtirpc/libtirpc_ros.rc
diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt
index e7089136d6c..336b1df899a 100644
--- a/dll/3rdparty/libxslt/CMakeLists.txt
+++ b/dll/3rdparty/libxslt/CMakeLists.txt
@@ -34,7 +34,7 @@ list(APPEND SOURCE
     xsltutils.c
     precomp.h)
 
-add_library(libxslt SHARED ${SOURCE})
+add_library(libxslt MODULE ${SOURCE})
 set_module_type(libxslt win32dll)
 target_link_libraries(libxslt libxml2 iconv-static zlib)
 add_importlibs(libxslt msvcrt ws2_32 kernel32)
diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt
index 7a5210bdef2..dcc0a7c2b74 100644
--- a/dll/3rdparty/mbedtls/CMakeLists.txt
+++ b/dll/3rdparty/mbedtls/CMakeLists.txt
@@ -79,7 +79,7 @@ list(APPEND SOURCE
     #xtea.c
     )
 
-add_library(mbedtls SHARED
+add_library(mbedtls MODULE
     ${SOURCE}
     mbedtls.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mbedtls.def)
diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt
index 645a2fcdec5..778af7f878f 100644
--- a/dll/apisets/CMakeLists.txt
+++ b/dll/apisets/CMakeLists.txt
@@ -17,7 +17,7 @@ function (add_apiset apiset_name baseaddress)
         -D_WCTYPE_DEFINED
         -D_CRT_ERRNO_DEFINED)
 
-    add_library(${apiset_name} SHARED
+    add_library(${apiset_name} MODULE
         ${CMAKE_CURRENT_BINARY_DIR}/${apiset_name}_stubs.c
         ${CMAKE_CURRENT_BINARY_DIR}/${apiset_name}.def)
 
diff --git a/dll/appcompat/apphelp/CMakeLists.txt b/dll/appcompat/apphelp/CMakeLists.txt
index 71cb783c74b..20312169c7a 100644
--- a/dll/appcompat/apphelp/CMakeLists.txt
+++ b/dll/appcompat/apphelp/CMakeLists.txt
@@ -30,7 +30,7 @@ list(APPEND HEADERS
     sdbwrite.h
     shimeng.h)
 
-add_library(apphelp SHARED
+add_library(apphelp MODULE
     ${SOURCE}
     ${HEADERS}
     apphelp.rc
diff --git a/dll/appcompat/shims/genral/CMakeLists.txt b/dll/appcompat/shims/genral/CMakeLists.txt
index b0e98edcec2..da6a55d9989 100644
--- a/dll/appcompat/shims/genral/CMakeLists.txt
+++ b/dll/appcompat/shims/genral/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     themes.c
     genral.spec)
 
-add_library(acgenral SHARED
+add_library(acgenral MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/acgenral.def)
 
diff --git a/dll/appcompat/shims/layer/CMakeLists.txt b/dll/appcompat/shims/layer/CMakeLists.txt
index d2b70b2b99d..74c7fb0c7b9 100644
--- a/dll/appcompat/shims/layer/CMakeLists.txt
+++ b/dll/appcompat/shims/layer/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     main.c
     layer.spec)
 
-add_library(aclayers SHARED
+add_library(aclayers MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/aclayers.def)
 
diff --git a/dll/cpl/access/CMakeLists.txt b/dll/cpl/access/CMakeLists.txt
index 1e07328ba59..3e606afb0ef 100644
--- a/dll/cpl/access/CMakeLists.txt
+++ b/dll/cpl/access/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
 
 add_rc_deps(access.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)
 
-add_library(access SHARED
+add_library(access MODULE
     ${SOURCE}
     access.rc
     ${CMAKE_CURRENT_BINARY_DIR}/access.def)
diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt
index 1a7e4a048c2..5afee76d7d8 100644
--- a/dll/cpl/appwiz/CMakeLists.txt
+++ b/dll/cpl/appwiz/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
 file(GLOB appwiz_rc_deps resources/*.*)
 add_rc_deps(appwiz.rc ${appwiz_rc_deps})
 
-add_library(appwiz SHARED
+add_library(appwiz MODULE
     ${SOURCE}
     appwiz.rc
     ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def)
diff --git a/dll/cpl/console/CMakeLists.txt b/dll/cpl/console/CMakeLists.txt
index bbbb6846385..c62ffcaa1ce 100644
--- a/dll/cpl/console/CMakeLists.txt
+++ b/dll/cpl/console/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
 
 add_rc_deps(console.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/terminal.ico)
 
-add_library(console SHARED
+add_library(console MODULE
     ${SOURCE}
     console.rc
     ${CMAKE_CURRENT_BINARY_DIR}/console.def)
diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt
index ae7fb83825a..597679bbf3b 100644
--- a/dll/cpl/desk/CMakeLists.txt
+++ b/dll/cpl/desk/CMakeLists.txt
@@ -26,7 +26,7 @@ list(APPEND SOURCE
 file(GLOB desk_rc_deps resources/*.*)
 add_rc_deps(desk.rc ${desk_rc_deps})
 
-add_library(desk SHARED
+add_library(desk MODULE
     ${SOURCE}
     guid.c
     desk.rc
diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt
index 205e4622c01..2c6c949cdba 100644
--- a/dll/cpl/hdwwiz/CMakeLists.txt
+++ b/dll/cpl/hdwwiz/CMakeLists.txt
@@ -3,7 +3,7 @@ spec2def(hdwwiz.cpl hdwwiz.spec)
 file(GLOB hdwwiz_rc_deps resources/*.*)
 add_rc_deps(hdwwiz.rc ${hdwwiz_rc_deps})
 
-add_library(hdwwiz SHARED
+add_library(hdwwiz MODULE
     hdwwiz.c
     hdwwiz.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
diff --git a/dll/cpl/hotplug/CMakeLists.txt b/dll/cpl/hotplug/CMakeLists.txt
index 46c8d3de2dc..65bd5237a20 100644
--- a/dll/cpl/hotplug/CMakeLists.txt
+++ b/dll/cpl/hotplug/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     hotplug.c
     enum.c)
 
-add_library(hotplug SHARED
+add_library(hotplug MODULE
     ${SOURCE}
     hotplug.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hotplug.def)
diff --git a/dll/cpl/inetcpl/CMakeLists.txt b/dll/cpl/inetcpl/CMakeLists.txt
index 28acde0a4fb..09293f3393d 100644
--- a/dll/cpl/inetcpl/CMakeLists.txt
+++ b/dll/cpl/inetcpl/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
 file(GLOB inetcpl_rc_deps resources/*.*)
 add_rc_deps(inetcpl.rc ${inetcpl_rc_deps})
 
-add_library(inetcpl SHARED
+add_library(inetcpl MODULE
     ${SOURCE}
     inetcpl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/inetcpl_stubs.c
diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt
index b9cecb1c2fa..77363d5e728 100644
--- a/dll/cpl/input/CMakeLists.txt
+++ b/dll/cpl/input/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
 
 add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico)
 
-add_library(input SHARED
+add_library(input MODULE
     ${SOURCE}
     input.rc
     ${CMAKE_CURRENT_BINARY_DIR}/input.def)
diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt
index d18db6f2486..a2b6723e250 100644
--- a/dll/cpl/intl/CMakeLists.txt
+++ b/dll/cpl/intl/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
 
 add_rc_deps(intl.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)
 
-add_library(intl SHARED
+add_library(intl MODULE
     ${SOURCE}
     intl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/intl.def)
diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt
index 9e5bd9128be..70a345f6a22 100644
--- a/dll/cpl/joy/CMakeLists.txt
+++ b/dll/cpl/joy/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(joy.cpl joy.spec)
 add_rc_deps(joy.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)
 
-add_library(joy SHARED
+add_library(joy MODULE
     joy.c
     joy.rc
     ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
diff --git a/dll/cpl/liccpa/CMakeLists.txt b/dll/cpl/liccpa/CMakeLists.txt
index c5871dbef3f..e4435d4a737 100644
--- a/dll/cpl/liccpa/CMakeLists.txt
+++ b/dll/cpl/liccpa/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 file(GLOB liccpa_rc_deps resources/*.*)
 add_rc_deps(liccpa.rc ${liccpa_rc_deps})
 
-add_library(liccpa SHARED
+add_library(liccpa MODULE
     ${SOURCE}
     liccpa.rc
     ${CMAKE_CURRENT_BINARY_DIR}/liccpa.def)
diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt
index 7597123561f..9746795a7fd 100644
--- a/dll/cpl/main/CMakeLists.txt
+++ b/dll/cpl/main/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
 file(GLOB main_rc_deps resources/*.*)
 add_rc_deps(main.rc ${main_rc_deps})
 
-add_library(main SHARED
+add_library(main MODULE
     ${SOURCE}
     main.rc
     ${CMAKE_CURRENT_BINARY_DIR}/main.def)
diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt
index 885b40621fa..3b2abc51d67 100644
--- a/dll/cpl/mmsys/CMakeLists.txt
+++ b/dll/cpl/mmsys/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
 file(GLOB mmsys_rc_deps resources/*.*)
 add_rc_deps(mmsys.rc ${mmsys_rc_deps})
 
-add_library(mmsys SHARED
+add_library(mmsys MODULE
     ${SOURCE}
     mmsys.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
diff --git a/dll/cpl/ncpa/CMakeLists.txt b/dll/cpl/ncpa/CMakeLists.txt
index 2d92f48ba16..82a2b30fd3f 100644
--- a/dll/cpl/ncpa/CMakeLists.txt
+++ b/dll/cpl/ncpa/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(ncpa.cpl ncpa.spec)
 
-add_library(ncpa SHARED
+add_library(ncpa MODULE
     ncpa.c
     ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
 
diff --git a/dll/cpl/odbccp32/CMakeLists.txt b/dll/cpl/odbccp32/CMakeLists.txt
index 950940e9c7a..9337f1f7902 100644
--- a/dll/cpl/odbccp32/CMakeLists.txt
+++ b/dll/cpl/odbccp32/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(odbccp32i.cpl odbccp32.spec)
 
-add_library(odbccp32i SHARED
+add_library(odbccp32i MODULE
     odbccp32.c
     odbccp32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/odbccp32i.def)
diff --git a/dll/cpl/openglcfg/CMakeLists.txt b/dll/cpl/openglcfg/CMakeLists.txt
index 2018e5b8312..17998263b62 100644
--- a/dll/cpl/openglcfg/CMakeLists.txt
+++ b/dll/cpl/openglcfg/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_rc_deps(openglcfg.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/openglcfg.ico)
 
-add_library(openglcfg SHARED
+add_library(openglcfg MODULE
     ${SOURCE}
     openglcfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/openglcfg.def)
diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt
index fadd507c57e..9de4c558737 100644
--- a/dll/cpl/powercfg/CMakeLists.txt
+++ b/dll/cpl/powercfg/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
 file(GLOB powercfg_rc_deps resources/*.*)
 add_rc_deps(powercfg.rc ${powercfg_rc_deps})
 
-add_library(powercfg SHARED
+add_library(powercfg MODULE
     ${SOURCE}
     powercfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt
index 865d5e7697b..4643a4523b5 100644
--- a/dll/cpl/sysdm/CMakeLists.txt
+++ b/dll/cpl/sysdm/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
 file(GLOB sysdm_rc_deps resources/*.*)
 add_rc_deps(sysdm.rc ${sysdm_rc_deps})
 
-add_library(sysdm SHARED
+add_library(sysdm MODULE
     ${SOURCE}
     sysdm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt
index 222d5773c86..625872267ea 100644
--- a/dll/cpl/telephon/CMakeLists.txt
+++ b/dll/cpl/telephon/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(telephon.cpl telephon.spec)
 add_rc_deps(telephon.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)
 
-add_library(telephon SHARED
+add_library(telephon MODULE
     telephon.c
     telephon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt
index ce5907dec13..d1ad1db070e 100644
--- a/dll/cpl/timedate/CMakeLists.txt
+++ b/dll/cpl/timedate/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
 file(GLOB timedate_rc_deps resources/*.*)
 add_rc_deps(timedate.rc ${timedate_rc_deps})
 
-add_library(timedate SHARED
+add_library(timedate MODULE
     ${SOURCE}
     timedate.rc
     ${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt
index ff4f9f7ea16..7d5ce655493 100644
--- a/dll/cpl/usrmgr/CMakeLists.txt
+++ b/dll/cpl/usrmgr/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
 file(GLOB usrmgr_rc_deps resources/*.*)
 add_rc_deps(usrmgr.rc ${usrmgr_rc_deps})
 
-add_library(usrmgr SHARED
+add_library(usrmgr MODULE
     ${SOURCE}
     usrmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
diff --git a/dll/cpl/wined3dcfg/CMakeLists.txt b/dll/cpl/wined3dcfg/CMakeLists.txt
index f7e5b961135..9121b994699 100644
--- a/dll/cpl/wined3dcfg/CMakeLists.txt
+++ b/dll/cpl/wined3dcfg/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_rc_deps(wined3dcfg.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/wined3dcfg.ico)
 
-add_library(wined3dcfg SHARED
+add_library(wined3dcfg MODULE
     ${SOURCE}
     wined3dcfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def)
diff --git a/dll/directx/d3d8thk/CMakeLists.txt b/dll/directx/d3d8thk/CMakeLists.txt
index a17a11544f2..a6fc668518b 100644
--- a/dll/directx/d3d8thk/CMakeLists.txt
+++ b/dll/directx/d3d8thk/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(d3d8thk.dll d3d8thk.spec)
 
-add_library(d3d8thk SHARED
+add_library(d3d8thk MODULE
     d3d8thk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)
 
diff --git a/dll/directx/ddraw/CMakeLists.txt b/dll/directx/ddraw/CMakeLists.txt
index 73518dfe7d8..e86062f1673 100644
--- a/dll/directx/ddraw/CMakeLists.txt
+++ b/dll/directx/ddraw/CMakeLists.txt
@@ -39,7 +39,7 @@ list(APPEND SOURCE
     Vtable/DirectDrawSurface4_Vtable.c
     Vtable/DirectDrawSurface7_Vtable.c)
 
-add_library(ddraw SHARED ${SOURCE})
+add_library(ddraw MODULE ${SOURCE})
 set_module_type(ddraw win32dll)
 target_link_libraries(ddraw uuid dxguid ${PSEH_LIB})
 add_importlibs(ddraw advapi32 gdi32 user32 msvcrt kernel32 ntdll)
diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt
index 122623b7707..15d7ebc0bfe 100644
--- a/dll/directx/ksproxy/CMakeLists.txt
+++ b/dll/directx/ksproxy/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     qualityforward.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)
 
-add_library(ksproxy SHARED ${SOURCE} ksproxy.rc)
+add_library(ksproxy MODULE ${SOURCE} ksproxy.rc)
 set_module_type(ksproxy win32dll)
 set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
 target_link_libraries(ksproxy strmiids)
diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt
index d113df95128..f6c0c75f517 100644
--- a/dll/directx/ksuser/CMakeLists.txt
+++ b/dll/directx/ksuser/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB)
 
-add_library(ksuser SHARED
+add_library(ksuser MODULE
     ksuser.c
     ksuser.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
diff --git a/dll/directx/wine/amstream/CMakeLists.txt b/dll/directx/wine/amstream/CMakeLists.txt
index 85ee1a45e34..45fd90c3285 100644
--- a/dll/directx/wine/amstream/CMakeLists.txt
+++ b/dll/directx/wine/amstream/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     mediastreamfilter.c
     precomp.h)
 
-add_library(amstream SHARED
+add_library(amstream MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/amstream.def)
diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt
index 09d7a6c659d..d3d49e2e76d 100644
--- a/dll/directx/wine/d3d8/CMakeLists.txt
+++ b/dll/directx/wine/d3d8/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     volume.c
     precomp.h)
 
-add_library(d3d8 SHARED
+add_library(d3d8 MODULE
     ${SOURCE}
     guid.c
     version.rc
diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt
index 223606b87ee..14dd3e65320 100644
--- a/dll/directx/wine/d3d9/CMakeLists.txt
+++ b/dll/directx/wine/d3d9/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
     volume.c
     precomp.h)
 
-add_library(d3d9 SHARED
+add_library(d3d9 MODULE
     ${SOURCE}
     guid.c
     version.rc
diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
index d00c1b69ec1..49d18b0b07d 100644
--- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
+++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c)
 
-add_library(d3dcompiler_43 SHARED
+add_library(d3dcompiler_43 MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def)
diff --git a/dll/directx/wine/d3drm/CMakeLists.txt b/dll/directx/wine/d3drm/CMakeLists.txt
index f2ff1f204e9..cd1eaad8832 100644
--- a/dll/directx/wine/d3drm/CMakeLists.txt
+++ b/dll/directx/wine/d3drm/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     viewport.c
     precomp.h)
 
-add_library(d3drm SHARED
+add_library(d3drm MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3drm_stubs.c
diff --git a/dll/directx/wine/d3dx9_24/CMakeLists.txt b/dll/directx/wine/d3dx9_24/CMakeLists.txt
index 9381b3842a9..44e22294ec7 100644
--- a/dll/directx/wine/d3dx9_24/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_24/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24.def)
 
-add_library(d3dx9_24 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_24 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_24 win32dll)
 target_link_libraries(d3dx9_24 wine)
 add_importlibs(d3dx9_24 d3dx9_30 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_25/CMakeLists.txt b/dll/directx/wine/d3dx9_25/CMakeLists.txt
index 24d296d9b2a..bc71d7d9151 100644
--- a/dll/directx/wine/d3dx9_25/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_25/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25.def)
 
-add_library(d3dx9_25 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_25 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_25 win32dll)
 target_link_libraries(d3dx9_25 wine)
 add_importlibs(d3dx9_25 d3dx9_30 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_26/CMakeLists.txt b/dll/directx/wine/d3dx9_26/CMakeLists.txt
index f9264fff34e..3a95d89ae9a 100644
--- a/dll/directx/wine/d3dx9_26/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_26/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26.def)
 
-add_library(d3dx9_26 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_26 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_26 win32dll)
 target_link_libraries(d3dx9_26 wine)
 add_importlibs(d3dx9_26 d3dx9_30 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_27/CMakeLists.txt b/dll/directx/wine/d3dx9_27/CMakeLists.txt
index a75b0088f3e..35f95fb632b 100644
--- a/dll/directx/wine/d3dx9_27/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_27/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27.def)
 
-add_library(d3dx9_27 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_27 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_27 win32dll)
 target_link_libraries(d3dx9_27 wine)
 add_importlibs(d3dx9_27 d3dx9_30 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_28/CMakeLists.txt b/dll/directx/wine/d3dx9_28/CMakeLists.txt
index 9bd5e8e6bd1..2573902b03c 100644
--- a/dll/directx/wine/d3dx9_28/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_28/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28.def)
 
-add_library(d3dx9_28 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_28 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_28 win32dll)
 target_link_libraries(d3dx9_28 wine)
 add_importlibs(d3dx9_28 d3dx9_30 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_29/CMakeLists.txt b/dll/directx/wine/d3dx9_29/CMakeLists.txt
index 83d408ff0a1..07f454a2ab7 100644
--- a/dll/directx/wine/d3dx9_29/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_29/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29.def)
 
-add_library(d3dx9_29 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_29 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_29 win32dll)
 target_link_libraries(d3dx9_29 wine)
 add_importlibs(d3dx9_29 d3dx9_30 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_30/CMakeLists.txt b/dll/directx/wine/d3dx9_30/CMakeLists.txt
index 696605f867f..f6613cf92ed 100644
--- a/dll/directx/wine/d3dx9_30/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_30/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30.def)
 
-add_library(d3dx9_30 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_30 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_30 win32dll)
 target_link_libraries(d3dx9_30 wine)
 add_importlibs(d3dx9_30 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_31/CMakeLists.txt b/dll/directx/wine/d3dx9_31/CMakeLists.txt
index be20ad24bb0..d6f23b999ca 100644
--- a/dll/directx/wine/d3dx9_31/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_31/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31.def)
 
-add_library(d3dx9_31 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_31 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_31 win32dll)
 target_link_libraries(d3dx9_31 wine)
 add_importlibs(d3dx9_31 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_32/CMakeLists.txt b/dll/directx/wine/d3dx9_32/CMakeLists.txt
index 28d140227d3..fae73ec241e 100644
--- a/dll/directx/wine/d3dx9_32/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32.def)
 
-add_library(d3dx9_32 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_32 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_32 win32dll)
 target_link_libraries(d3dx9_32 wine)
 add_importlibs(d3dx9_32 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_33/CMakeLists.txt b/dll/directx/wine/d3dx9_33/CMakeLists.txt
index 99407695d10..c17d9a8eebd 100644
--- a/dll/directx/wine/d3dx9_33/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_33/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33.def)
 
-add_library(d3dx9_33 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_33 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_33 win32dll)
 target_link_libraries(d3dx9_33 wine)
 add_importlibs(d3dx9_33 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_34/CMakeLists.txt b/dll/directx/wine/d3dx9_34/CMakeLists.txt
index 4902df6fd80..fbc11f55e0e 100644
--- a/dll/directx/wine/d3dx9_34/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_34/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34.def)
 
-add_library(d3dx9_34 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_34 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_34 win32dll)
 target_link_libraries(d3dx9_34 wine)
 add_importlibs(d3dx9_34 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_35/CMakeLists.txt b/dll/directx/wine/d3dx9_35/CMakeLists.txt
index 50884be4ec8..93e0ff51918 100644
--- a/dll/directx/wine/d3dx9_35/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_35/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_35_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_35.def)
 
-add_library(d3dx9_35 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_35 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_35 win32dll)
 target_link_libraries(d3dx9_35 wine)
 add_importlibs(d3dx9_35 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_36/CMakeLists.txt b/dll/directx/wine/d3dx9_36/CMakeLists.txt
index 836ee9c743e..0740c46f98a 100644
--- a/dll/directx/wine/d3dx9_36/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_36/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND SOURCE
     xfile.c
     precomp.h)
 
-add_library(d3dx9_36 SHARED
+add_library(d3dx9_36 MODULE
     ${SOURCE}
     guid.c
     version.rc
diff --git a/dll/directx/wine/d3dx9_37/CMakeLists.txt b/dll/directx/wine/d3dx9_37/CMakeLists.txt
index f248a5ca0e6..798c304434a 100644
--- a/dll/directx/wine/d3dx9_37/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_37/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_37_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_37.def)
 
-add_library(d3dx9_37 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_37 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_37 win32dll)
 target_link_libraries(d3dx9_37 wine)
 add_importlibs(d3dx9_37 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_38/CMakeLists.txt b/dll/directx/wine/d3dx9_38/CMakeLists.txt
index 2397cc53801..556b43ed3bd 100644
--- a/dll/directx/wine/d3dx9_38/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_38/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_38_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_38.def)
 
-add_library(d3dx9_38 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_38 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_38 win32dll)
 target_link_libraries(d3dx9_38 wine)
 add_importlibs(d3dx9_38 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_39/CMakeLists.txt b/dll/directx/wine/d3dx9_39/CMakeLists.txt
index 58ed406b9e5..9a4e1fc7eba 100644
--- a/dll/directx/wine/d3dx9_39/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_39/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_39_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_39.def)
 
-add_library(d3dx9_39 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_39 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_39 win32dll)
 target_link_libraries(d3dx9_39 wine)
 add_importlibs(d3dx9_39 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_40/CMakeLists.txt b/dll/directx/wine/d3dx9_40/CMakeLists.txt
index 97373a52b52..2037e9c8316 100644
--- a/dll/directx/wine/d3dx9_40/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_40/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_40_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_40.def)
 
-add_library(d3dx9_40 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_40 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_40 win32dll)
 target_link_libraries(d3dx9_40 wine)
 add_importlibs(d3dx9_40 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_41/CMakeLists.txt b/dll/directx/wine/d3dx9_41/CMakeLists.txt
index 3476a432081..fdbe0821e06 100644
--- a/dll/directx/wine/d3dx9_41/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_41/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_41_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_41.def)
 
-add_library(d3dx9_41 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_41 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_41 win32dll)
 target_link_libraries(d3dx9_41 wine)
 add_importlibs(d3dx9_41 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_42/CMakeLists.txt b/dll/directx/wine/d3dx9_42/CMakeLists.txt
index 436b6954f8c..d6b6dfb84bf 100644
--- a/dll/directx/wine/d3dx9_42/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_42/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_42_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_42.def)
 
-add_library(d3dx9_42 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_42 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_42 win32dll)
 target_link_libraries(d3dx9_42 wine)
 add_importlibs(d3dx9_42 d3dx9_36 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/d3dx9_43/CMakeLists.txt b/dll/directx/wine/d3dx9_43/CMakeLists.txt
index 547285be2d5..2361819fced 100644
--- a/dll/directx/wine/d3dx9_43/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_43/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     d3dx9_43_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_43.def)
 
-add_library(d3dx9_43 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_43 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_43 win32dll)
 add_importlibs(d3dx9_43 d3dx9_36 msvcrt kernel32)
 add_cd_file(TARGET d3dx9_43 DESTINATION reactos/system32 FOR all)
diff --git a/dll/directx/wine/d3dxof/CMakeLists.txt b/dll/directx/wine/d3dxof/CMakeLists.txt
index a4fff47f23b..21b97cd6522 100644
--- a/dll/directx/wine/d3dxof/CMakeLists.txt
+++ b/dll/directx/wine/d3dxof/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     parsing.c
     precomp.h)
 
-add_library(d3dxof SHARED
+add_library(d3dxof MODULE
     ${SOURCE}
     mszip.c
     version.rc
diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt
index 6141d630f3f..03029bdc8f9 100644
--- a/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/dll/directx/wine/ddraw/CMakeLists.txt
@@ -29,7 +29,7 @@ if(MSVC)
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
 endif()
 
-add_library(ddraw SHARED
+add_library(ddraw MODULE
     ${SOURCE}
     ddraw.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
diff --git a/dll/directx/wine/devenum/CMakeLists.txt b/dll/directx/wine/devenum/CMakeLists.txt
index 1f5e7eb321a..671921748a7 100644
--- a/dll/directx/wine/devenum/CMakeLists.txt
+++ b/dll/directx/wine/devenum/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     parsedisplayname.c
     precomp.h)
 
-add_library(devenum SHARED
+add_library(devenum MODULE
     ${SOURCE}
     devenum.rc
     ${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
diff --git a/dll/directx/wine/dinput/CMakeLists.txt b/dll/directx/wine/dinput/CMakeLists.txt
index d964e748e97..7244903e99f 100644
--- a/dll/directx/wine/dinput/CMakeLists.txt
+++ b/dll/directx/wine/dinput/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     mouse.c
     precomp.h)
 
-add_library(dinput SHARED
+add_library(dinput MODULE
     ${SOURCE}
     data_formats.c
     dinput.rc
diff --git a/dll/directx/wine/dinput8/CMakeLists.txt b/dll/directx/wine/dinput8/CMakeLists.txt
index 28d1142f0d3..fb114aa2a2b 100644
--- a/dll/directx/wine/dinput8/CMakeLists.txt
+++ b/dll/directx/wine/dinput8/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     dinput8_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)
 
-add_library(dinput8 SHARED ${SOURCE} version.rc)
+add_library(dinput8 MODULE ${SOURCE} version.rc)
 set_module_type(dinput8 win32dll)
 target_link_libraries(dinput8 dxguid uuid wine)
 add_importlibs(dinput8 ole32 msvcrt kernel32 ntdll)
diff --git a/dll/directx/wine/dmusic/CMakeLists.txt b/dll/directx/wine/dmusic/CMakeLists.txt
index fe4c2706806..88abed338bb 100644
--- a/dll/directx/wine/dmusic/CMakeLists.txt
+++ b/dll/directx/wine/dmusic/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     port.c
     precomp.h)
 
-add_library(dmusic SHARED
+add_library(dmusic MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
diff --git a/dll/directx/wine/dplay/CMakeLists.txt b/dll/directx/wine/dplay/CMakeLists.txt
index 2c3f394fe50..fe71c25dd87 100644
--- a/dll/directx/wine/dplay/CMakeLists.txt
+++ b/dll/directx/wine/dplay/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(dplay.dll dplay.spec)
 
-add_library(dplay SHARED
+add_library(dplay MODULE
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dplay_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
diff --git a/dll/directx/wine/dplayx/CMakeLists.txt b/dll/directx/wine/dplayx/CMakeLists.txt
index 867ba690016..61049520d47 100644
--- a/dll/directx/wine/dplayx/CMakeLists.txt
+++ b/dll/directx/wine/dplayx/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     name_server.c
     precomp.h)
 
-add_library(dplayx SHARED
+add_library(dplayx MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def)
diff --git a/dll/directx/wine/dsound/CMakeLists.txt b/dll/directx/wine/dsound/CMakeLists.txt
index 82ef4652d19..145453b6cdf 100644
--- a/dll/directx/wine/dsound/CMakeLists.txt
+++ b/dll/directx/wine/dsound/CMakeLists.txt
@@ -7,7 +7,7 @@ add_definitions(
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)
 
-add_library(dsound SHARED
+add_library(dsound MODULE
     buffer.c
     capture.c
     dsound.c
diff --git a/dll/directx/wine/dxdiagn/CMakeLists.txt b/dll/directx/wine/dxdiagn/CMakeLists.txt
index 7e16a5a07a7..34c3b637378 100644
--- a/dll/directx/wine/dxdiagn/CMakeLists.txt
+++ b/dll/directx/wine/dxdiagn/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     provider.c
     precomp.h)
 
-add_library(dxdiagn SHARED
+add_library(dxdiagn MODULE
     ${SOURCE}
     guid.c
     dxdiagn.rc
diff --git a/dll/directx/wine/msdmo/CMakeLists.txt b/dll/directx/wine/msdmo/CMakeLists.txt
index 43b7a8074aa..d8d1d34bea0 100644
--- a/dll/directx/wine/msdmo/CMakeLists.txt
+++ b/dll/directx/wine/msdmo/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     dmort.c
     precomp.h)
 
-add_library(msdmo SHARED
+add_library(msdmo MODULE
     ${SOURCE}
     stubs.c
     rsrc.rc
diff --git a/dll/directx/wine/qedit/CMakeLists.txt b/dll/directx/wine/qedit/CMakeLists.txt
index 7ee22ff31b5..50cca289d75 100644
--- a/dll/directx/wine/qedit/CMakeLists.txt
+++ b/dll/directx/wine/qedit/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     timeline.c
     precomp.h)
 
-add_library(qedit SHARED
+add_library(qedit MODULE
     ${SOURCE}
     qedit.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qedit.def)
diff --git a/dll/directx/wine/quartz/CMakeLists.txt b/dll/directx/wine/quartz/CMakeLists.txt
index 8c12e38b855..e0996b88a04 100644
--- a/dll/directx/wine/quartz/CMakeLists.txt
+++ b/dll/directx/wine/quartz/CMakeLists.txt
@@ -37,7 +37,7 @@ list(APPEND SOURCE
     waveparser.c
     precomp.h)
 
-add_library(quartz SHARED
+add_library(quartz MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c
diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt
index 235adab9027..29b337e3bd1 100644
--- a/dll/directx/wine/wined3d/CMakeLists.txt
+++ b/dll/directx/wine/wined3d/CMakeLists.txt
@@ -41,7 +41,7 @@ list(APPEND SOURCE
     wined3d_main.c
     precomp.h)
 
-add_library(d3dwine SHARED
+add_library(d3dwine MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3dwine.def)
diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt
index 76edef5b790..406e314b78f 100644
--- a/dll/keyboard/CMakeLists.txt
+++ b/dll/keyboard/CMakeLists.txt
@@ -86,7 +86,7 @@ list(APPEND _keyboard_layouts
 foreach(_keyboard_layout ${_keyboard_layouts})
     spec2def(${_keyboard_layout}.dll ${_keyboard_layout}/${_keyboard_layout}.spec)
 
-    add_library(${_keyboard_layout} SHARED
+    add_library(${_keyboard_layout} MODULE
         ${_keyboard_layout}/${_keyboard_layout}.c
         ${_keyboard_layout}/${_keyboard_layout}.rc
         ${CMAKE_CURRENT_BINARY_DIR}/${_keyboard_layout}.def)
diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt
index 590ceec807d..efbd71ed0fd 100644
--- a/dll/nls/idndl/CMakeLists.txt
+++ b/dll/nls/idndl/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(-DWINVER=0x600)
 
 spec2def(idndl.dll idndl.spec)
 
-add_library(idndl SHARED
+add_library(idndl MODULE
     idndl.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/idndl.def)
 
diff --git a/dll/nls/normaliz/CMakeLists.txt b/dll/nls/normaliz/CMakeLists.txt
index 95a41e5d88c..ee51a44aca3 100644
--- a/dll/nls/normaliz/CMakeLists.txt
+++ b/dll/nls/normaliz/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     normalize.c
     ${CMAKE_CURRENT_BINARY_DIR}/normaliz.def)
     
-add_library(normaliz SHARED ${SOURCE})
+add_library(normaliz MODULE ${SOURCE})
 set_module_type(normaliz win32dll ENTRYPOINT 0)
 add_importlibs(normaliz msvcrt kernel32 ntdll)
 add_cd_file(TARGET normaliz DESTINATION reactos/system32 FOR all)
diff --git a/dll/np/nfs/CMakeLists.txt b/dll/np/nfs/CMakeLists.txt
index b3d32f3db22..acb8c295672 100644
--- a/dll/np/nfs/CMakeLists.txt
+++ b/dll/np/nfs/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
 include_directories(
     ${REACTOS_SOURCE_DIR}/drivers/filesystems/nfs)
 
-add_library(nfs41_np SHARED
+add_library(nfs41_np MODULE
     ${SOURCE}
     nfsnp.rc
     ${CMAKE_CURRENT_BINARY_DIR}/nfs41_np.def)
diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt
index e94db5c77ab..5ea6ca5d3d3 100644
--- a/dll/ntdll/CMakeLists.txt
+++ b/dll/ntdll/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 
 add_asm_files(ntdll_asm ${ASM_SOURCE})
 
-add_library(ntdll SHARED
+add_library(ntdll MODULE
     ${SOURCE}
     ${ntdll_asm}
     def/ntdll.rc
diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt
index df3a5bb5af3..791cf2df1ea 100644
--- a/dll/opengl/glu32/CMakeLists.txt
+++ b/dll/opengl/glu32/CMakeLists.txt
@@ -110,7 +110,7 @@ list(APPEND LIBNURBS_SOURCE
     src/libnurbs/nurbtess/searchTree.cc
     precomp.h)
 
-add_library(glu32 SHARED
+add_library(glu32 MODULE
     ${LIBNURBS_SOURCE}
     src/libnurbs/nurbtess/polyDBG.cc
     ${SOURCE}
diff --git a/dll/opengl/opengl32/CMakeLists.txt b/dll/opengl/opengl32/CMakeLists.txt
index 9e3b054e531..86e7800d779 100644
--- a/dll/opengl/opengl32/CMakeLists.txt
+++ b/dll/opengl/opengl32/CMakeLists.txt
@@ -32,7 +32,7 @@ if(ARCH STREQUAL "i386")
     )
 endif()
 
-add_library(opengl32 SHARED
+add_library(opengl32 MODULE
     ${SOURCE}
     ${opengl32_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def)
diff --git a/dll/shellext/acppage/CMakeLists.txt b/dll/shellext/acppage/CMakeLists.txt
index 0f16701e3cc..9303c23110e 100644
--- a/dll/shellext/acppage/CMakeLists.txt
+++ b/dll/shellext/acppage/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     CLayerUIPropPage.cpp
     precomp.h)
 
-add_library(acppage SHARED
+add_library(acppage MODULE
     ${SOURCE}
     acppage.spec
     ACPPage.rc
diff --git a/dll/shellext/cryptext/CMakeLists.txt b/dll/shellext/cryptext/CMakeLists.txt
index 8cd10f4a431..3aca7374b1a 100644
--- a/dll/shellext/cryptext/CMakeLists.txt
+++ b/dll/shellext/cryptext/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     cryptext.c
     precomp.h)
 
-add_library(cryptext SHARED
+add_library(cryptext MODULE
     ${SOURCE}
     cryptext.spec
     cryptext.rc
diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt
index 8333fa03d73..e0e0181267e 100644
--- a/dll/shellext/deskadp/CMakeLists.txt
+++ b/dll/shellext/deskadp/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_rc_deps(deskadp.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/adapter.ico)
 
-add_library(deskadp SHARED
+add_library(deskadp MODULE
     ${SOURCE}
     deskadp.rc
     ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def)
diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt
index 93264f1e6af..d01e2e09870 100644
--- a/dll/shellext/deskmon/CMakeLists.txt
+++ b/dll/shellext/deskmon/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_rc_deps(deskmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/monitor.ico)
 
-add_library(deskmon SHARED
+add_library(deskmon MODULE
     ${SOURCE}
     deskmon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def)
diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt
index 08624da93d3..149d9c5c34a 100644
--- a/dll/shellext/devcpux/CMakeLists.txt
+++ b/dll/shellext/devcpux/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 spec2def(devcpux.dll devcpux.spec)
-add_library(devcpux SHARED processor.c processor.rc ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
+add_library(devcpux MODULE processor.c processor.rc ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
 set_module_type(devcpux win32dll UNICODE)
 add_importlibs(devcpux user32 powrprof comctl32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET devcpux DESTINATION reactos/system32 FOR all)
diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt
index a31e78d3e3f..b50844ee7e5 100644
--- a/dll/shellext/fontext/CMakeLists.txt
+++ b/dll/shellext/fontext/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     regsvr.c
     fontext.h)
 
-add_library(fontext SHARED
+add_library(fontext MODULE
     ${SOURCE}
     fontext.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fontext.def)
diff --git a/dll/shellext/netshell/CMakeLists.txt b/dll/shellext/netshell/CMakeLists.txt
index cff3ce29e43..0a2c0fad15c 100644
--- a/dll/shellext/netshell/CMakeLists.txt
+++ b/dll/shellext/netshell/CMakeLists.txt
@@ -32,7 +32,7 @@ list(APPEND SOURCE
 file(GLOB netshell_rc_deps res/*.*)
 add_rc_deps(netshell.rc ${netshell_rc_deps})
 
-add_library(netshell SHARED
+add_library(netshell MODULE
     ${SOURCE}
     netshell.rc
     ${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c
diff --git a/dll/shellext/ntobjshex/CMakeLists.txt b/dll/shellext/ntobjshex/CMakeLists.txt
index 9d2c76e217c..f8a6e7347bc 100644
--- a/dll/shellext/ntobjshex/CMakeLists.txt
+++ b/dll/shellext/ntobjshex/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND SOURCE
     regfolder.cpp
     precomp.h)
 
-add_library(ntobjshex SHARED
+add_library(ntobjshex MODULE
     ${SOURCE}
     ntobjshex.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def)
diff --git a/dll/shellext/shellbtrfs/CMakeLists.txt b/dll/shellext/shellbtrfs/CMakeLists.txt
index 5b239ca2e1b..660699cd43f 100644
--- a/dll/shellext/shellbtrfs/CMakeLists.txt
+++ b/dll/shellext/shellbtrfs/CMakeLists.txt
@@ -26,7 +26,7 @@ list(APPEND SOURCE
     volpropsheet.cpp
     precomp.h)
 
-add_library(shellbtrfs SHARED
+add_library(shellbtrfs MODULE
     ${SOURCE}
     guid.c
     shellbtrfs.rc
diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt
index e25e433f6f0..093303f7289 100644
--- a/dll/shellext/stobject/CMakeLists.txt
+++ b/dll/shellext/stobject/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SOURCE
     volume.cpp
     precomp.h)
 
-add_library(stobject SHARED
+add_library(stobject MODULE
     ${SOURCE}
     stobject.rc
     ${CMAKE_CURRENT_BINARY_DIR}/stobject.def)
diff --git a/dll/shellext/zipfldr/CMakeLists.txt b/dll/shellext/zipfldr/CMakeLists.txt
index f5276658055..9ad72cb1736 100644
--- a/dll/shellext/zipfldr/CMakeLists.txt
+++ b/dll/shellext/zipfldr/CMakeLists.txt
@@ -37,7 +37,7 @@ list(APPEND SOURCE
     precomp.h
     resource.h)
 
-add_library(zipfldr SHARED
+add_library(zipfldr MODULE
     ${SOURCE}
     ${ZLIB_SOURCE}
     zipfldr.rc
diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index fb2222b02fd..db13727cc1e 100644
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     stubs.c
     acleditint.h)
 
-add_library(acledit SHARED
+add_library(acledit MODULE
     ${SOURCE}
     acledit.rc
     ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index de7a6b1c7b9..24d43d5ad23 100644
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     sidcache.c
     precomp.h)
 
-add_library(aclui SHARED
+add_library(aclui MODULE
     ${SOURCE}
     guid.c
     aclui.rc
diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index 19ddb86ba65..58225f1b3c4 100644
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     stubs.c
     precomp.h)
 
-add_library(activeds SHARED
+add_library(activeds MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
 
diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt
index 44672c94bb7..22442e70e0d 100644
--- a/dll/win32/actxprxy/CMakeLists.txt
+++ b/dll/win32/actxprxy/CMakeLists.txt
@@ -35,7 +35,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     precomp.h)
 
-add_library(actxprxy SHARED
+add_library(actxprxy MODULE
     ${SOURCE}
     actxprxy.rc
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt
index 744dc098a10..4a366badecf 100644
--- a/dll/win32/advapi32/CMakeLists.txt
+++ b/dll/win32/advapi32/CMakeLists.txt
@@ -46,7 +46,7 @@ list(APPEND SOURCE
     wine/security.c
     advapi32.h)
 
-add_library(advapi32 SHARED
+add_library(advapi32 MODULE
     ${SOURCE}
     advapi32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/advapi32_stubs.c
diff --git a/dll/win32/advapi32_vista/CMakeLists.txt b/dll/win32/advapi32_vista/CMakeLists.txt
index 34fc459a134..ab6e406876a 100644
--- a/dll/win32/advapi32_vista/CMakeLists.txt
+++ b/dll/win32/advapi32_vista/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     RegLoadMUIString.c
     ${CMAKE_CURRENT_BINARY_DIR}/advapi32_vista.def)
 
-add_library(advapi32_vista SHARED ${SOURCE})
+add_library(advapi32_vista MODULE ${SOURCE})
 set_module_type(advapi32_vista win32dll ENTRYPOINT DllMain 12)
 target_link_libraries(advapi32_vista wine)
 add_importlibs(advapi32_vista advapi32 kernel32 ntdll)
diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index 585927435c8..5df9b29d62b 100644
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     reg.c
     precomp.h)
 
-add_library(advpack SHARED
+add_library(advpack MODULE
     ${SOURCE}
     advpack.rc
     ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt
index 9697e5c0a5b..475ebab24ff 100644
--- a/dll/win32/atl/CMakeLists.txt
+++ b/dll/win32/atl/CMakeLists.txt
@@ -25,7 +25,7 @@ list(APPEND atl_rc_deps
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${atl_rc_deps}")
 
-add_library(atl SHARED
+add_library(atl MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/atl.def)
diff --git a/dll/win32/atl100/CMakeLists.txt b/dll/win32/atl100/CMakeLists.txt
index 85fb948aa6c..73c7843bbe5 100644
--- a/dll/win32/atl100/CMakeLists.txt
+++ b/dll/win32/atl100/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/atl100_stubs.c)
 
-add_library(atl100 SHARED
+add_library(atl100 MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/atl100.def)
 
diff --git a/dll/win32/atl80/CMakeLists.txt b/dll/win32/atl80/CMakeLists.txt
index 6283b496aec..50bb95445f8 100644
--- a/dll/win32/atl80/CMakeLists.txt
+++ b/dll/win32/atl80/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/atl80_stubs.c
     precomp.h)
 
-add_library(atl80 SHARED
+add_library(atl80 MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/atl80.def)
 
diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt
index 5d57622d9d7..88174a48d55 100644
--- a/dll/win32/authz/CMakeLists.txt
+++ b/dll/win32/authz/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/authz_stubs.c)
 
-add_library(authz SHARED
+add_library(authz MODULE
     ${SOURCE}
     authz.rc
     ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt
index 6972b43dd99..75720e4e95e 100644
--- a/dll/win32/avicap32/CMakeLists.txt
+++ b/dll/win32/avicap32/CMakeLists.txt
@@ -3,7 +3,7 @@ spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 
-add_library(avicap32 SHARED
+add_library(avicap32 MODULE
     avicap32.c
     avicap32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt
index c6863011722..62daabfaea1 100644
--- a/dll/win32/avifil32/CMakeLists.txt
+++ b/dll/win32/avifil32/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     precomp.h)
 
-add_library(avifil32 SHARED
+add_library(avifil32 MODULE
     ${SOURCE}
     guid.c
     rsrc.rc
diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt
index cfd7f25fc13..cf775185b37 100644
--- a/dll/win32/batt/CMakeLists.txt
+++ b/dll/win32/batt/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(batt.dll batt.spec)
 
-add_library(batt SHARED
+add_library(batt MODULE
     batt.c
     batt.rc
     ${CMAKE_CURRENT_BINARY_DIR}/batt.def)
diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt
index bcac2afc129..eee62d3a6ab 100644
--- a/dll/win32/bcrypt/CMakeLists.txt
+++ b/dll/win32/bcrypt/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/bcrypt_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def)
 
-add_library(bcrypt SHARED ${SOURCE})
+add_library(bcrypt MODULE ${SOURCE})
 set_module_type(bcrypt win32dll)
 target_link_libraries(bcrypt wine)
 add_importlibs(bcrypt mbedtls advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt
index d760fecbd19..d19032b01c7 100644
--- a/dll/win32/beepmidi/CMakeLists.txt
+++ b/dll/win32/beepmidi/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     beepmidi.c
     ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
 
-add_library(beepmidi SHARED ${SOURCE})
+add_library(beepmidi MODULE ${SOURCE})
 set_module_type(beepmidi win32dll UNICODE)
 add_importlibs(beepmidi winmm msvcrt kernel32 ntdll)
 add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt
index 8c0de76cf7b..0c68a37df08 100644
--- a/dll/win32/browseui/CMakeLists.txt
+++ b/dll/win32/browseui/CMakeLists.txt
@@ -39,7 +39,7 @@ list(APPEND SOURCE
     CProgressDialog.cpp
     precomp.h)
 
-add_library(browseui SHARED
+add_library(browseui MODULE
     ${SOURCE}
     dllinstall.c
     browseui.rc
diff --git a/dll/win32/bthci/CMakeLists.txt b/dll/win32/bthci/CMakeLists.txt
index f8de46d10e4..3e96448c2f3 100644
--- a/dll/win32/bthci/CMakeLists.txt
+++ b/dll/win32/bthci/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(bthci.dll bthci.spec)
 
-add_library(bthci SHARED
+add_library(bthci MODULE
     bthci.c
     bthci.rc
     ${CMAKE_CURRENT_BINARY_DIR}/bthci.def)
diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt
index 20eb368d002..f770a5052fb 100644
--- a/dll/win32/cabinet/CMakeLists.txt
+++ b/dll/win32/cabinet/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     fdi.c
     precomp.h)
 
-add_library(cabinet SHARED
+add_library(cabinet MODULE
     ${SOURCE}
     stubs.c
     cabinet.rc
diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt
index b2548675a8b..822ea963188 100644
--- a/dll/win32/cards/CMakeLists.txt
+++ b/dll/win32/cards/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     cards.rc
     ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
 
-add_library(cards SHARED ${SOURCE})
+add_library(cards MODULE ${SOURCE})
 set_module_type(cards win32dll UNICODE)
 add_importlibs(cards user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET cards DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt
index 2e630932e67..5a40af58973 100644
--- a/dll/win32/cfgmgr32/CMakeLists.txt
+++ b/dll/win32/cfgmgr32/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
 
-add_library(cfgmgr32 SHARED ${SOURCE})
+add_library(cfgmgr32 MODULE ${SOURCE})
 
 set_module_type(cfgmgr32 win32dll)
 add_importlibs(cfgmgr32 setupapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt
index cb86fe4f9ff..6d474658c52 100644
--- a/dll/win32/clusapi/CMakeLists.txt
+++ b/dll/win32/clusapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/clusapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def)
 
-add_library(clusapi SHARED ${SOURCE})
+add_library(clusapi MODULE ${SOURCE})
 set_module_type(clusapi win32dll)
 target_link_libraries(clusapi wine)
 add_importlibs(clusapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt
index bff7fabe737..0e5d6810106 100644
--- a/dll/win32/comcat/CMakeLists.txt
+++ b/dll/win32/comcat/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     comcat_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
 
-add_library(comcat SHARED ${SOURCE} version.rc)
+add_library(comcat MODULE ${SOURCE} version.rc)
 set_module_type(comcat win32dll)
 add_importlibs(comcat ole32 msvcrt kernel32)
 add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt
index 4a1151bd986..8c05f33e6e1 100644
--- a/dll/win32/comctl32/CMakeLists.txt
+++ b/dll/win32/comctl32/CMakeLists.txt
@@ -51,7 +51,7 @@ list(APPEND SOURCE
     updown.c
     precomp.h)
 
-add_library(comctl32 SHARED
+add_library(comctl32 MODULE
     ${SOURCE}
     stubs.c
     rsrc.rc
diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt
index 37e1d7c102b..bb87894e2c8 100644
--- a/dll/win32/comdlg32/CMakeLists.txt
+++ b/dll/win32/comdlg32/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c)
 
-add_library(comdlg32 SHARED
+add_library(comdlg32 MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt
index 58d4f31301f..bb561428ef5 100644
--- a/dll/win32/compstui/CMakeLists.txt
+++ b/dll/win32/compstui/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     compstui_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
 
-add_library(compstui SHARED ${SOURCE})
+add_library(compstui MODULE ${SOURCE})
 set_module_type(compstui win32dll)
 target_link_libraries(compstui wine)
 add_importlibs(compstui msvcrt kernel32 ntdll)
diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index e6a9d1bf499..ab1fa0c3f3a 100644
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/credui_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/credui.def)
 
-add_library(credui SHARED ${SOURCE} credui.rc)
+add_library(credui MODULE ${SOURCE} credui.rc)
 set_module_type(credui win32dll)
 target_link_libraries(credui wine)
 add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt
index 7562398be03..c40dda200e5 100644
--- a/dll/win32/crtdll/CMakeLists.txt
+++ b/dll/win32/crtdll/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     crtdll.rc
     ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def)
 
-add_library(crtdll SHARED ${SOURCE})
+add_library(crtdll MODULE ${SOURCE})
 set_module_type(crtdll win32dll ENTRYPOINT DllMain 12)
 target_link_libraries(crtdll crt wine)
 
diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt
index 6bef4c7af9a..e53c2f9e3be 100644
--- a/dll/win32/crypt32/CMakeLists.txt
+++ b/dll/win32/crypt32/CMakeLists.txt
@@ -37,7 +37,7 @@ list(APPEND SOURCE
     str.c
     precomp.h)
 
-add_library(crypt32 SHARED
+add_library(crypt32 MODULE
     ${SOURCE}
     crypt32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c
diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt
index a7de252a2d3..0ce55339078 100644
--- a/dll/win32/cryptdlg/CMakeLists.txt
+++ b/dll/win32/cryptdlg/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
 
-add_library(cryptdlg SHARED ${SOURCE} cryptdlg.rc)
+add_library(cryptdlg MODULE ${SOURCE} cryptdlg.rc)
 set_module_type(cryptdlg win32dll)
 target_link_libraries(cryptdlg wine)
 add_importlibs(cryptdlg advapi32 user32 crypt32 cryptui wintrust msvcrt kernel32 ntdll)
diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt
index ce141142312..8d64df81d03 100644
--- a/dll/win32/cryptdll/CMakeLists.txt
+++ b/dll/win32/cryptdll/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
 
-add_library(cryptdll SHARED ${SOURCE})
+add_library(cryptdll MODULE ${SOURCE})
 set_module_type(cryptdll win32dll)
 target_link_libraries(cryptdll wine)
 add_importlibs(cryptdll advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt
index 52695eb7657..9bbb47e694a 100644
--- a/dll/win32/cryptnet/CMakeLists.txt
+++ b/dll/win32/cryptnet/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/cryptnet_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def)
 
-add_library(cryptnet SHARED ${SOURCE})
+add_library(cryptnet MODULE ${SOURCE})
 set_module_type(cryptnet win32dll)
 target_link_libraries(cryptnet wine)
 add_delay_importlibs(cryptnet wininet)
diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt
index f2711517769..d6398711d44 100644
--- a/dll/win32/cryptui/CMakeLists.txt
+++ b/dll/win32/cryptui/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/cryptui_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
 
-add_library(cryptui SHARED ${SOURCE} cryptui.rc)
+add_library(cryptui MODULE ${SOURCE} cryptui.rc)
 set_module_type(cryptui win32dll)
 target_link_libraries(cryptui uuid wine)
 add_delay_importlibs(cryptui urlmon wintrust)
diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt
index ed64611e40f..27b44e32cae 100644
--- a/dll/win32/dbghelp/CMakeLists.txt
+++ b/dll/win32/dbghelp/CMakeLists.txt
@@ -72,7 +72,7 @@ else()
         type.c
         precomp.h)
 
-    add_library(dbghelp SHARED
+    add_library(dbghelp MODULE
         ${SOURCE}
         version.rc
         ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c
diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt
index 9c49ebc0464..5cd47dbec95 100644
--- a/dll/win32/dciman32/CMakeLists.txt
+++ b/dll/win32/dciman32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/dciman32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def)
 
-add_library(dciman32 SHARED ${SOURCE})
+add_library(dciman32 MODULE ${SOURCE})
 set_module_type(dciman32 win32dll)
 target_link_libraries(dciman32 wine)
 add_importlibs(dciman32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index ae68d9d244e..44ba6f4cff7 100644
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -29,7 +29,7 @@ list(APPEND SOURCE
     devmgmt/Node.cpp
     devmgmt/RootNode.cpp)
 
-add_library(devmgr SHARED
+add_library(devmgr MODULE
     ${SOURCE}
     devmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt
index 62aacebcd10..89b47e370ce 100644
--- a/dll/win32/dnsapi/CMakeLists.txt
+++ b/dll/win32/dnsapi/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     dnsapi/stubs.c
     dnsapi/precomp.h)
 
-add_library(dnsapi SHARED
+add_library(dnsapi MODULE
     ${SOURCE}
     dnsapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def)
diff --git a/dll/win32/esent/CMakeLists.txt b/dll/win32/esent/CMakeLists.txt
index 67ca4becd78..aab373fe809 100644
--- a/dll/win32/esent/CMakeLists.txt
+++ b/dll/win32/esent/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(esent.dll esent.spec)
 list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/esent_stubs.c)
 
-add_library(esent SHARED
+add_library(esent MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/esent.def)
 
diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt
index ea1a14983f5..a5172103fe7 100644
--- a/dll/win32/faultrep/CMakeLists.txt
+++ b/dll/win32/faultrep/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/faultrep_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def)
 
-add_library(faultrep SHARED ${SOURCE})
+add_library(faultrep MODULE ${SOURCE})
 set_module_type(faultrep win32dll)
 target_link_libraries(faultrep wine)
 add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/fltlib/CMakeLists.txt b/dll/win32/fltlib/CMakeLists.txt
index 1cb7300a131..7b4320ad692 100644
--- a/dll/win32/fltlib/CMakeLists.txt
+++ b/dll/win32/fltlib/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/fltlib.def)
 
-add_library(fltlib SHARED ${SOURCE} rsrc.rc)
+add_library(fltlib MODULE ${SOURCE} rsrc.rc)
 set_module_type(fltlib win32dll)
 target_link_libraries(fltlib wine)
 add_target_compile_definitions(fltlib NTDDI_VERSION=NTDDI_WS03SP1)
diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt
index 5289094d51a..41cac2847a0 100644
--- a/dll/win32/fmifs/CMakeLists.txt
+++ b/dll/win32/fmifs/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     query.c
     precomp.h)
 
-add_library(fmifs SHARED
+add_library(fmifs MODULE
     ${SOURCE}
     fmifs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c
diff --git a/dll/win32/fontsub/CMakeLists.txt b/dll/win32/fontsub/CMakeLists.txt
index 3adf7c42157..1e801ffd6f0 100644
--- a/dll/win32/fontsub/CMakeLists.txt
+++ b/dll/win32/fontsub/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(fontsub.dll fontsub.spec)
 
-add_library(fontsub SHARED
+add_library(fontsub MODULE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/fontsub_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/fontsub.def)
diff --git a/dll/win32/framedyn/CMakeLists.txt b/dll/win32/framedyn/CMakeLists.txt
index 74a083df6fa..edc6ab7c7c2 100644
--- a/dll/win32/framedyn/CMakeLists.txt
+++ b/dll/win32/framedyn/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MSVC)
     add_compile_flags("/Zc:wchar_t-")
 endif()
 
-add_library(framedyn SHARED ${SOURCE})
+add_library(framedyn MODULE ${SOURCE})
 set_module_type(framedyn win32dll UNICODE)
 add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all)
diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt
index fcaa5c23f64..7e151d9db52 100644
--- a/dll/win32/fusion/CMakeLists.txt
+++ b/dll/win32/fusion/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND COMMON_SOURCE
 add_library(fusion_common STATIC ${COMMON_SOURCE})
 add_dependencies(fusion_common psdk)
 
-add_library(fusion SHARED
+add_library(fusion MODULE
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
diff --git a/dll/win32/fusion/fusion_1_1/CMakeLists.txt b/dll/win32/fusion/fusion_1_1/CMakeLists.txt
index 5027b0afbe8..802fecf8c34 100644
--- a/dll/win32/fusion/fusion_1_1/CMakeLists.txt
+++ b/dll/win32/fusion/fusion_1_1/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
 spec2def(fusion.dll fusion.spec)
 
-add_library(fusion_1_1 SHARED
+add_library(fusion_1_1 MODULE
     ${fusion_folder}/version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
diff --git a/dll/win32/fusion/fusion_2_0/CMakeLists.txt b/dll/win32/fusion/fusion_2_0/CMakeLists.txt
index c86f19268c5..035da8ed61c 100644
--- a/dll/win32/fusion/fusion_2_0/CMakeLists.txt
+++ b/dll/win32/fusion/fusion_2_0/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
 spec2def(fusion.dll fusion.spec)
 
-add_library(fusion_2_0 SHARED
+add_library(fusion_2_0 MODULE
     ${fusion_folder}/version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt
index 58ef713dcbf..172089123a4 100644
--- a/dll/win32/gdiplus/CMakeLists.txt
+++ b/dll/win32/gdiplus/CMakeLists.txt
@@ -23,7 +23,7 @@ list(APPEND SOURCE
     stringformat.c
     precomp.h)
 
-add_library(gdiplus SHARED
+add_library(gdiplus MODULE
     ${SOURCE}
     guid.c
     gdiplus.rc
diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt
index b97e7ab3bb8..121c5d02998 100644
--- a/dll/win32/getuname/CMakeLists.txt
+++ b/dll/win32/getuname/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(getuname.dll getuname.spec ADD_IMPORTLIB)
 
-add_library(getuname SHARED
+add_library(getuname MODULE
     getuname.c
     getuname.rc
     ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt
index 80b7975dcaf..103e58e97f5 100644
--- a/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     webbrowser.c
     precomp.h)
 
-add_library(hhctrl SHARED
+add_library(hhctrl MODULE
     ${SOURCE}
     guid.c
     hhctrl.rc
diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt
index 9e966ec9a96..edc34638fae 100644
--- a/dll/win32/hid/CMakeLists.txt
+++ b/dll/win32/hid/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     stubs.c
     precomp.h)
 
-add_library(hid SHARED
+add_library(hid MODULE
     ${SOURCE}
     hid.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index 7ce99227517..29ae5f99da6 100644
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     link.c
     precomp.h)
 
-add_library(hlink SHARED
+add_library(hlink MODULE
     ${SOURCE}
     hlink.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c
diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt
index fd3ab10d925..4e75ba685e0 100644
--- a/dll/win32/hnetcfg/CMakeLists.txt
+++ b/dll/win32/hnetcfg/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     service.c
     precomp.h)
 
-add_library(hnetcfg SHARED
+add_library(hnetcfg MODULE
     ${SOURCE}
     hnetcfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt
index 96b40b1bbb1..5836ccc5455 100644
--- a/dll/win32/httpapi/CMakeLists.txt
+++ b/dll/win32/httpapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/httpapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def)
 
-add_library(httpapi SHARED ${SOURCE})
+add_library(httpapi MODULE ${SOURCE})
 set_module_type(httpapi win32dll)
 target_link_libraries(httpapi wine)
 add_importlibs(httpapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt
index cfcfd6ba325..68dc7057a1f 100644
--- a/dll/win32/iccvid/CMakeLists.txt
+++ b/dll/win32/iccvid/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     iccvid.c
     ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)
 
-add_library(iccvid SHARED ${SOURCE} rsrc.rc)
+add_library(iccvid MODULE ${SOURCE} rsrc.rc)
 set_module_type(iccvid win32dll)
 target_link_libraries(iccvid wine)
 add_importlibs(iccvid user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index d36a089065e..18c7a3a2b58 100644
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/icmp_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/icmp.def)
 
-add_library(icmp SHARED ${SOURCE})
+add_library(icmp MODULE ${SOURCE})
 set_module_type(icmp win32dll)
 add_importlibs(icmp iphlpapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET icmp DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/ieframe/CMakeLists.txt b/dll/win32/ieframe/CMakeLists.txt
index bf7b6034cd0..cdd58efb6e7 100644
--- a/dll/win32/ieframe/CMakeLists.txt
+++ b/dll/win32/ieframe/CMakeLists.txt
@@ -25,7 +25,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/ieframe_stubs.c)
 
-add_library(ieframe SHARED
+add_library(ieframe MODULE
     ${SOURCE}
     ieframe.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ieframe.def)
diff --git a/dll/win32/iernonce/CMakeLists.txt b/dll/win32/iernonce/CMakeLists.txt
index 7308f9a28f6..85b73cdf6e8 100644
--- a/dll/win32/iernonce/CMakeLists.txt
+++ b/dll/win32/iernonce/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(iernonce.dll iernonce.spec)
 
-add_library(iernonce SHARED
+add_library(iernonce MODULE
     iernonce.c
     iernonce.rc
     ${CMAKE_CURRENT_BINARY_DIR}/iernonce.def)
diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt
index 01d7d55060e..fa6e30a2479 100644
--- a/dll/win32/imaadp32.acm/CMakeLists.txt
+++ b/dll/win32/imaadp32.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     imaadp32.c
     ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
 
-add_library(imaadp32.acm SHARED ${SOURCE})
+add_library(imaadp32.acm MODULE ${SOURCE})
 set_module_type(imaadp32.acm win32dll)
 set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")
 target_link_libraries(imaadp32.acm wine)
diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt
index 5284f858165..d39f1b45bee 100644
--- a/dll/win32/imagehlp/CMakeLists.txt
+++ b/dll/win32/imagehlp/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     modify.c
     precomp.h)
 
-add_library(imagehlp SHARED
+add_library(imagehlp MODULE
     ${SOURCE}
     imagehlp.rc
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_stubs.c
diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index 91368f84e4e..01eec2a490c 100644
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
 
-add_library(imm32 SHARED ${SOURCE} version.rc)
+add_library(imm32 MODULE ${SOURCE} version.rc)
 set_module_type(imm32 win32dll)
 target_link_libraries(imm32 wine)
 add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index c995faf2cc4..3e60b9922a7 100644
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     smtptransport.c
     precomp.h)
 
-add_library(inetcomm SHARED
+add_library(inetcomm MODULE
     ${SOURCE}
     guid.c
     inetcomm.rc
diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt
index 0883fc36a15..08c1b0a83fb 100644
--- a/dll/win32/inetmib1/CMakeLists.txt
+++ b/dll/win32/inetmib1/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/inetmib1_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def)
 
-add_library(inetmib1 SHARED ${SOURCE})
+add_library(inetmib1 MODULE ${SOURCE})
 set_module_type(inetmib1 win32dll)
 target_link_libraries(inetmib1 wine)
 add_delay_importlibs(inetmib1 iphlpapi)
diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt
index a811010cedb..406ece9b3a7 100644
--- a/dll/win32/initpki/CMakeLists.txt
+++ b/dll/win32/initpki/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/initpki_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/initpki.def)
 
-add_library(initpki SHARED ${SOURCE})
+add_library(initpki MODULE ${SOURCE})
 set_module_type(initpki win32dll)
 target_link_libraries(initpki wine)
 add_importlibs(initpki msvcrt kernel32 ntdll)
diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
index 20f27dfa4af..1ee71e5ffb8 100644
--- a/dll/win32/inseng/CMakeLists.txt
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/inseng_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
 
-add_library(inseng SHARED ${SOURCE} guid.c inseng.rc)
+add_library(inseng MODULE ${SOURCE} guid.c inseng.rc)
 set_module_type(inseng win32dll)
 target_link_libraries(inseng uuid wine)
 add_importlibs(inseng ole32 urlmon kernel32_vista msvcrt kernel32 ntdll)
diff --git a/dll/win32/iologmsg/CMakeLists.txt b/dll/win32/iologmsg/CMakeLists.txt
index 1a9b2de7919..0e1f230fc18 100644
--- a/dll/win32/iologmsg/CMakeLists.txt
+++ b/dll/win32/iologmsg/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(iologmsg SHARED iologmsg.rc)
+add_library(iologmsg MODULE iologmsg.rc)
 set_module_type(iologmsg module UNICODE)
 add_dependencies(iologmsg ntiologc)
 add_cd_file(TARGET iologmsg DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt
index 3bdcb1f71e1..61f9112d760 100644
--- a/dll/win32/iphlpapi/CMakeLists.txt
+++ b/dll/win32/iphlpapi/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     iphlpapi_private.h
     ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_stubs.c)
 
-add_library(iphlpapi SHARED
+add_library(iphlpapi MODULE
     ${SOURCE}
     iphlpapi.rc
     iphlpapi_fakestubs.c
diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt
index bb246c1006d..e6b3f6a6db7 100644
--- a/dll/win32/itircl/CMakeLists.txt
+++ b/dll/win32/itircl/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/itircl_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
 
-add_library(itircl SHARED ${SOURCE})
+add_library(itircl MODULE ${SOURCE})
 set_module_type(itircl win32dll)
 target_link_libraries(itircl wine)
 add_importlibs(itircl msvcrt kernel32 ntdll)
diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
index 0dbf58025d1..63cefe61bfc 100644
--- a/dll/win32/itss/CMakeLists.txt
+++ b/dll/win32/itss/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     storage.c
     precomp.h)
 
-add_library(itss SHARED
+add_library(itss MODULE
     ${SOURCE}
     guid.c
     rsrc.rc
diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt
index 5551ee74a17..40a48d570bc 100644
--- a/dll/win32/jscript/CMakeLists.txt
+++ b/dll/win32/jscript/CMakeLists.txt
@@ -43,7 +43,7 @@ list(APPEND jscript_rc_deps
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps}")
 
-add_library(jscript SHARED
+add_library(jscript MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
diff --git a/dll/win32/jsproxy/CMakeLists.txt b/dll/win32/jsproxy/CMakeLists.txt
index cec9a196d05..46ae1b7ecf1 100644
--- a/dll/win32/jsproxy/CMakeLists.txt
+++ b/dll/win32/jsproxy/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/jsproxy_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/jsproxy.def)
 
-add_library(jsproxy SHARED ${SOURCE} rsrc.rc)
+add_library(jsproxy MODULE ${SOURCE} rsrc.rc)
 set_module_type(jsproxy win32dll)
 target_link_libraries(jsproxy uuid wine)
 add_importlibs(jsproxy oleaut32 ole32 ws2_32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index 21a21829e72..22409a7605e 100644
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -98,7 +98,7 @@ elseif(ARCH STREQUAL "arm")
 endif()
 
 add_asm_files(kernel32_asm ${ASM_SOURCE})
-add_library(kernel32 SHARED
+add_library(kernel32 MODULE
     ${SOURCE}
     ${kernel32_asm}
     kernel32.rc
diff --git a/dll/win32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32_vista/CMakeLists.txt
index 4f1f09fb5dd..068297a4a03 100644
--- a/dll/win32/kernel32_vista/CMakeLists.txt
+++ b/dll/win32/kernel32_vista/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     sync.c
     ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def)
 
-add_library(kernel32_vista SHARED ${SOURCE})
+add_library(kernel32_vista MODULE ${SOURCE})
 set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12)
 add_importlibs(kernel32_vista kernel32 ntdll)
 add_delay_importlibs(kernel32_vista ntdll_vista)
diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt
index 21af6893f5b..770b188ee96 100644
--- a/dll/win32/loadperf/CMakeLists.txt
+++ b/dll/win32/loadperf/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def)
 
-add_library(loadperf SHARED ${SOURCE})
+add_library(loadperf MODULE ${SOURCE})
 set_module_type(loadperf win32dll)
 target_link_libraries(loadperf wine)
 add_importlibs(loadperf msvcrt kernel32 ntdll)
diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt
index 9f4c504cb02..5a21c6cdeed 100644
--- a/dll/win32/lpk/CMakeLists.txt
+++ b/dll/win32/lpk/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     stub.c
     ros_lpk.h)
 
-add_library(lpk SHARED
+add_library(lpk MODULE
     ${SOURCE}
     lpk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
index 13d3ab4398a..8ea8fe511b7 100644
--- a/dll/win32/lsasrv/CMakeLists.txt
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -31,7 +31,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c
     ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c)
 
-add_library(lsasrv SHARED
+add_library(lsasrv MODULE
     ${SOURCE}
     lsasrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt
index c3b45fc46a0..cbad018bf8e 100644
--- a/dll/win32/lz32/CMakeLists.txt
+++ b/dll/win32/lz32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
 
-add_library(lz32 SHARED ${SOURCE})
+add_library(lz32 MODULE ${SOURCE})
 set_module_type(lz32 win32dll ENTRYPOINT 0 )
 target_link_libraries(lz32 wine)
 add_importlibs(lz32 kernel32 ntdll)
diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt
index 34677e54233..18da64dfec5 100644
--- a/dll/win32/mapi32/CMakeLists.txt
+++ b/dll/win32/mapi32/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     util.c
     precomp.h)
 
-add_library(mapi32 SHARED
+add_library(mapi32 MODULE
     ${SOURCE}
     guid.c
     version.rc
diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt
index bc6251076b9..3f49fc11754 100644
--- a/dll/win32/mciavi32/CMakeLists.txt
+++ b/dll/win32/mciavi32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     wnd.c
     precomp.h)
 
-add_library(mciavi32 SHARED
+add_library(mciavi32 MODULE
     ${SOURCE}
     mciavi_res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt
index 76e10c61a3f..17db5b84874 100644
--- a/dll/win32/mcicda/CMakeLists.txt
+++ b/dll/win32/mcicda/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     mcicda.c
     ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def)
 
-add_library(mcicda SHARED ${SOURCE})
+add_library(mcicda MODULE ${SOURCE})
 set_module_type(mcicda win32dll)
 target_link_libraries(mcicda wine)
 add_importlibs(mcicda winmm user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt
index a7e4d511ee8..88e92f6c4df 100644
--- a/dll/win32/mciqtz32/CMakeLists.txt
+++ b/dll/win32/mciqtz32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     mciqtz.c
     ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
 
-add_library(mciqtz32 SHARED ${SOURCE} mciavi_res.rc)
+add_library(mciqtz32 MODULE ${SOURCE} mciavi_res.rc)
 set_module_type(mciqtz32 win32dll)
 target_link_libraries(mciqtz32 wine strmiids)
 add_importlibs(mciqtz32 winmm ole32 user32 gdi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt
index 6630d33e048..62b3f54b341 100644
--- a/dll/win32/mciseq/CMakeLists.txt
+++ b/dll/win32/mciseq/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     mcimidi.c
     ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
 
-add_library(mciseq SHARED ${SOURCE})
+add_library(mciseq MODULE ${SOURCE})
 set_module_type(mciseq win32dll)
 target_link_libraries(mciseq wine)
 add_importlibs(mciseq winmm user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt
index 05c779109e3..e4b06aa0d2e 100644
--- a/dll/win32/mciwave/CMakeLists.txt
+++ b/dll/win32/mciwave/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     mciwave.c
     ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
 
-add_library(mciwave SHARED ${SOURCE})
+add_library(mciwave MODULE ${SOURCE})
 set_module_type(mciwave win32dll)
 target_link_libraries(mciwave wine)
 add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll)
diff --git a/dll/win32/mgmtapi/CMakeLists.txt b/dll/win32/mgmtapi/CMakeLists.txt
index 0659c584f07..c2d5ce11181 100644
--- a/dll/win32/mgmtapi/CMakeLists.txt
+++ b/dll/win32/mgmtapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mgmtapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mgmtapi.def)
 
-add_library(mgmtapi SHARED ${SOURCE})
+add_library(mgmtapi MODULE ${SOURCE})
 set_module_type(mgmtapi win32dll)
 target_link_libraries(mgmtapi wine)
 add_importlibs(mgmtapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt
index 5592c23e5ae..0afca92b55c 100644
--- a/dll/win32/mlang/CMakeLists.txt
+++ b/dll/win32/mlang/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mlang_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
 
-add_library(mlang SHARED ${SOURCE} mlang.rc)
+add_library(mlang MODULE ${SOURCE} mlang.rc)
 set_module_type(mlang win32dll UNICODE)
 target_link_libraries(mlang uuid wine)
 add_delay_importlibs(mlang oleaut32)
diff --git a/dll/win32/mmdevapi/CMakeLists.txt b/dll/win32/mmdevapi/CMakeLists.txt
index 5d4245ca09d..1cda15a8c5f 100644
--- a/dll/win32/mmdevapi/CMakeLists.txt
+++ b/dll/win32/mmdevapi/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c)
 
-add_library(mmdevapi SHARED
+add_library(mmdevapi MODULE
     ${SOURCE}
     guid.c
     mmdevapi.rc
diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt
index fa6f6ce17f3..17d7e92c9b1 100644
--- a/dll/win32/mmdrv/CMakeLists.txt
+++ b/dll/win32/mmdrv/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     wave_io.c
     mmdrv.h)
 
-add_library(mmdrv SHARED
+add_library(mmdrv MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
index 3953a52f4f5..ead0401d7cc 100644
--- a/dll/win32/modemui/CMakeLists.txt
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/modemui_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
 
-add_library(modemui SHARED ${SOURCE})
+add_library(modemui MODULE ${SOURCE})
 set_module_type(modemui win32dll UNICODE)
 add_importlibs(modemui msvcrt kernel32 ntdll)
 add_cd_file(TARGET modemui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt
index 28c76f88819..af182ae0421 100644
--- a/dll/win32/mpr/CMakeLists.txt
+++ b/dll/win32/mpr/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c)
 
-add_library(mpr SHARED
+add_library(mpr MODULE
     ${SOURCE}
     mpr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt
index 607624dc63e..17a1a1b4042 100644
--- a/dll/win32/mprapi/CMakeLists.txt
+++ b/dll/win32/mprapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mprapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
 
-add_library(mprapi SHARED ${SOURCE})
+add_library(mprapi MODULE ${SOURCE})
 set_module_type(mprapi win32dll)
 target_link_libraries(mprapi wine)
 add_importlibs(mprapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32.drv/CMakeLists.txt
index ed542d99b5a..3964c916267 100644
--- a/dll/win32/msacm32.drv/CMakeLists.txt
+++ b/dll/win32/msacm32.drv/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(msacm32.drv msacm32.drv.spec)
 
-add_library(msacm32.drv SHARED
+add_library(msacm32.drv MODULE
     wavemap.c
     wavemap.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index b1be7b9b487..822bb649b53 100644
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
 
-add_library(msacm32 SHARED
+add_library(msacm32 MODULE
     ${SOURCE}
     msacm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt
index 3333e4182f6..f784c6c60df 100644
--- a/dll/win32/msadp32.acm/CMakeLists.txt
+++ b/dll/win32/msadp32.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     msadp32.c
     ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def)
 
-add_library(msadp32.acm SHARED ${SOURCE})
+add_library(msadp32.acm MODULE ${SOURCE})
 set_module_type(msadp32.acm win32dll)
 set_target_properties(msadp32.acm PROPERTIES SUFFIX "")
 target_link_libraries(msadp32.acm wine)
diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt
index db60e83f420..14f97943bf9 100644
--- a/dll/win32/msafd/CMakeLists.txt
+++ b/dll/win32/msafd/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     misc/stubs.c
     msafd.h)
 
-add_library(msafd SHARED
+add_library(msafd MODULE
     ${SOURCE}
     msafd.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt
index d7471d99ea5..94788acc589 100644
--- a/dll/win32/mscat32/CMakeLists.txt
+++ b/dll/win32/mscat32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
 
-add_library(mscat32 SHARED ${SOURCE})
+add_library(mscat32 MODULE ${SOURCE})
 set_module_type(mscat32 win32dll)
 target_link_libraries(mscat32 wine)
 add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll)
diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt
index 89126cd4eee..785e1e425d3 100644
--- a/dll/win32/mscms/CMakeLists.txt
+++ b/dll/win32/mscms/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mscms_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
 
-add_library(mscms SHARED ${SOURCE} version.rc)
+add_library(mscms MODULE ${SOURCE} version.rc)
 set_module_type(mscms win32dll)
 target_link_libraries(mscms wine)
 add_importlibs(mscms advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt
index f39b9bb2302..8cba9456648 100644
--- a/dll/win32/mscoree/CMakeLists.txt
+++ b/dll/win32/mscoree/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     mscoree_main.c
     mscoree_private.h)
 
-add_library(mscoree SHARED
+add_library(mscoree MODULE
     ${SOURCE}
     guid.c
     mscoree.rc
diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt
index 02e172ac436..d7ae222c8da 100644
--- a/dll/win32/msctf/CMakeLists.txt
+++ b/dll/win32/msctf/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c)
 
-add_library(msctf SHARED
+add_library(msctf MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt
index 1b37a69abbd..8fba4ccd089 100644
--- a/dll/win32/msftedit/CMakeLists.txt
+++ b/dll/win32/msftedit/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msftedit_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def)
 
-add_library(msftedit SHARED ${SOURCE})
+add_library(msftedit MODULE ${SOURCE})
 set_module_type(msftedit win32dll)
 target_link_libraries(msftedit uuid wine)
 add_importlibs(msftedit riched20 msvcrt kernel32 ntdll)
diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt
index 3796e5ef996..3dc5c79492e 100644
--- a/dll/win32/msg711.acm/CMakeLists.txt
+++ b/dll/win32/msg711.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     msg711.c
     ${CMAKE_CURRENT_BINARY_DIR}/msg711.def)
 
-add_library(msg711.acm SHARED ${SOURCE})
+add_library(msg711.acm MODULE ${SOURCE})
 set_module_type(msg711.acm win32dll)
 set_target_properties(msg711.acm PROPERTIES SUFFIX "")
 target_link_libraries(msg711.acm wine)
diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt
index 7c6b5618f22..1cfa45f8081 100644
--- a/dll/win32/msgina/CMakeLists.txt
+++ b/dll/win32/msgina/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND C_SOURCE
 list(APPEND CPP_SOURCE
     dimmedwindow.cpp)
 
-add_library(msgina SHARED
+add_library(msgina MODULE
     ${C_SOURCE}
     ${CPP_SOURCE}
     msgina.rc
diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt
index b7683bd2b4f..5a0238ceef4 100644
--- a/dll/win32/msgsm32.acm/CMakeLists.txt
+++ b/dll/win32/msgsm32.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     msgsm32.c
     ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
 
-add_library(msgsm32.acm SHARED ${SOURCE})
+add_library(msgsm32.acm MODULE ${SOURCE})
 set_module_type(msgsm32.acm win32dll)
 set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
 target_link_libraries(msgsm32.acm wine)
diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt
index d928b5368b4..c795544636d 100644
--- a/dll/win32/mshtml.tlb/CMakeLists.txt
+++ b/dll/win32/mshtml.tlb/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_typelib(mshtml_tlb.idl)
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-add_library(mshtml.tlb SHARED rsrc.rc)
+add_library(mshtml.tlb MODULE rsrc.rc)
 
 list(APPEND mshtml_tlb_rc_deps
     ${CMAKE_CURRENT_BINARY_DIR}/mshtml_tlb.tlb
diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt
index 1b93bfa575f..e89b34b5ae3 100644
--- a/dll/win32/mshtml/CMakeLists.txt
+++ b/dll/win32/mshtml/CMakeLists.txt
@@ -89,7 +89,7 @@ if(MSVC)
     add_asm_files(mshtml_asm msvc.S)
 endif()
 
-add_library(mshtml SHARED
+add_library(mshtml MODULE
     ${SOURCE}
     ${mshtml_asm}
     guid.c
diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt
index 3eaee0fefa3..b2e6bf72f75 100644
--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -51,7 +51,7 @@ list(APPEND SOURCE
     where.c
     precomp.h)
 
-add_library(msi SHARED
+add_library(msi MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c
diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt
index 6291b366709..c55790ef352 100644
--- a/dll/win32/msimg32/CMakeLists.txt
+++ b/dll/win32/msimg32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     msimg32_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
 
-add_library(msimg32 SHARED ${SOURCE})
+add_library(msimg32 MODULE ${SOURCE})
 set_module_type(msimg32 win32dll)
 target_link_libraries(msimg32 wine)
 add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt
index a1c28dafcd9..567159de071 100644
--- a/dll/win32/msimtf/CMakeLists.txt
+++ b/dll/win32/msimtf/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c)
 
-add_library(msimtf SHARED
+add_library(msimtf MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt
index 76aff6775d4..3a194e7bc16 100644
--- a/dll/win32/msisip/CMakeLists.txt
+++ b/dll/win32/msisip/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msisip_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
 
-add_library(msisip SHARED ${SOURCE})
+add_library(msisip MODULE ${SOURCE})
 set_module_type(msisip win32dll)
 target_link_libraries(msisip wine)
 add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/msisys.ocx/CMakeLists.txt b/dll/win32/msisys.ocx/CMakeLists.txt
index c9e17b553e0..0d711a5817d 100644
--- a/dll/win32/msisys.ocx/CMakeLists.txt
+++ b/dll/win32/msisys.ocx/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     msisys.c
     ${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
 
-add_library(msisys SHARED ${SOURCE})
+add_library(msisys MODULE ${SOURCE})
 set_module_type(msisys win32ocx)
 target_link_libraries(msisys wine)
 add_importlibs(msisys msvcrt kernel32 ntdll)
diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt
index 3bb042403de..c8a5c5a2f5c 100644
--- a/dll/win32/msnet32/CMakeLists.txt
+++ b/dll/win32/msnet32/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 spec2def(msnet32.dll msnet32.spec)
-add_library(msnet32 SHARED msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
+add_library(msnet32 MODULE msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
 set_module_type(msnet32 win32dll)
 target_link_libraries(msnet32 wine)
 add_importlibs(msnet32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mspatcha/CMakeLists.txt b/dll/win32/mspatcha/CMakeLists.txt
index 3c21db607da..129eebdca55 100644
--- a/dll/win32/mspatcha/CMakeLists.txt
+++ b/dll/win32/mspatcha/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mspatcha_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mspatcha.def)
 
-add_library(mspatcha SHARED ${SOURCE} version.rc)
+add_library(mspatcha MODULE ${SOURCE} version.rc)
 set_module_type(mspatcha win32dll)
 target_link_libraries(mspatcha wine)
 add_importlibs(mspatcha msvcrt kernel32 ntdll)
diff --git a/dll/win32/msports/CMakeLists.txt b/dll/win32/msports/CMakeLists.txt
index b0fee514b8e..f924e4a4398 100644
--- a/dll/win32/msports/CMakeLists.txt
+++ b/dll/win32/msports/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c)
 
-add_library(msports SHARED
+add_library(msports MODULE
     ${SOURCE}
     msports.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msports.def)
diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt
index 2efae9a17f5..8db9998c3bb 100644
--- a/dll/win32/msrle32/CMakeLists.txt
+++ b/dll/win32/msrle32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     msrle32.c
     ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def)
 
-add_library(msrle32 SHARED ${SOURCE} rsrc.rc)
+add_library(msrle32 MODULE ${SOURCE} rsrc.rc)
 set_module_type(msrle32 win32dll)
 target_link_libraries(msrle32 wine)
 add_importlibs(msrle32 winmm user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt
index 0a4cac1a14f..b60527f2529 100644
--- a/dll/win32/mssign32/CMakeLists.txt
+++ b/dll/win32/mssign32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mssign32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def)
 
-add_library(mssign32 SHARED ${SOURCE})
+add_library(mssign32 MODULE ${SOURCE})
 set_module_type(mssign32 win32dll)
 target_link_libraries(mssign32 wine)
 add_importlibs(mssign32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt
index f4ee56f496f..1dcdae40baf 100644
--- a/dll/win32/mssip32/CMakeLists.txt
+++ b/dll/win32/mssip32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mssip32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def)
 
-add_library(mssip32 SHARED ${SOURCE})
+add_library(mssip32 MODULE ${SOURCE})
 set_module_type(mssip32 win32dll)
 target_link_libraries(mssip32 wine)
 add_importlibs(mssip32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt
index de210746d5b..5dec2c43a8d 100644
--- a/dll/win32/mstask/CMakeLists.txt
+++ b/dll/win32/mstask/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c)
 
-add_library(mstask SHARED
+add_library(mstask MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt
index e24124707d7..6e2e41bb9d3 100644
--- a/dll/win32/msv1_0/CMakeLists.txt
+++ b/dll/win32/msv1_0/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def)
 
-add_library(msv1_0 SHARED ${SOURCE})
+add_library(msv1_0 MODULE ${SOURCE})
 set_module_type(msv1_0 win32dll UNICODE ENTRYPOINT 0)
 target_link_libraries(msv1_0 wine ${PSEH_LIB})
 add_delay_importlibs(msv1_0 samsrv lsasrv)
diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt
index 0799e290be4..2b558d18191 100644
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def)
 
-add_library(msvcrt SHARED ${SOURCE})
+add_library(msvcrt MODULE ${SOURCE})
 set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
 add_dependencies(msvcrt psdk)
 target_link_libraries(msvcrt crt wine ${PSEH_LIB})
diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt
index 7ae2240ec13..64ff8379c8b 100644
--- a/dll/win32/msvcrt20/CMakeLists.txt
+++ b/dll/win32/msvcrt20/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
 
-add_library(msvcrt20 SHARED ${SOURCE})
+add_library(msvcrt20 MODULE ${SOURCE})
 set_module_type(msvcrt20 win32dll ENTRYPOINT DllMain 12)
 add_dependencies(msvcrt20 psdk)
 target_link_libraries(msvcrt20 crt wine ${PSEH_LIB})
diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt
index 5e2f89b223e..e21c8d9f225 100644
--- a/dll/win32/msvcrt40/CMakeLists.txt
+++ b/dll/win32/msvcrt40/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
 
-add_library(msvcrt40 SHARED ${SOURCE})
+add_library(msvcrt40 MODULE ${SOURCE})
 set_module_type(msvcrt40 win32dll ENTRYPOINT DllMain 12)
 add_dependencies(msvcrt40 psdk)
 target_link_libraries(msvcrt40 crt wine ${PSEH_LIB})
diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt
index 4bf2590bacd..8c6309f80bf 100644
--- a/dll/win32/msvfw32/CMakeLists.txt
+++ b/dll/win32/msvfw32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c)
 
-add_library(msvfw32 SHARED
+add_library(msvfw32 MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt
index 947852af7e4..ca5da724207 100644
--- a/dll/win32/msvidc32/CMakeLists.txt
+++ b/dll/win32/msvidc32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     msvideo1.c
     ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
 
-add_library(msvidc32 SHARED ${SOURCE} rsrc.rc)
+add_library(msvidc32 MODULE ${SOURCE} rsrc.rc)
 set_module_type(msvidc32 win32dll)
 target_link_libraries(msvidc32 wine)
 add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt
index 87214631103..1950ca8192c 100644
--- a/dll/win32/mswsock/CMakeLists.txt
+++ b/dll/win32/mswsock/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     stubs.c
     precomp.h)
 
-add_library(mswsock SHARED
+add_library(mswsock MODULE
     ${SOURCE}
     mswsock.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
diff --git a/dll/win32/msxml/CMakeLists.txt b/dll/win32/msxml/CMakeLists.txt
index c02242213d6..44fc897ff84 100644
--- a/dll/win32/msxml/CMakeLists.txt
+++ b/dll/win32/msxml/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/msxml.def)
 
-add_library(msxml SHARED ${SOURCE} rsrc.rc)
+add_library(msxml MODULE ${SOURCE} rsrc.rc)
 set_module_type(msxml win32dll)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml_tlb.tlb)
 target_link_libraries(msxml wine)
diff --git a/dll/win32/msxml2/CMakeLists.txt b/dll/win32/msxml2/CMakeLists.txt
index fb7541fcdc1..52deb1777de 100644
--- a/dll/win32/msxml2/CMakeLists.txt
+++ b/dll/win32/msxml2/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/msxml2.def)
 
-add_library(msxml2 SHARED ${SOURCE} msxml2.rc)
+add_library(msxml2 MODULE ${SOURCE} msxml2.rc)
 set_module_type(msxml2 win32dll)
 set_source_files_properties(msxml2.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml2_tlb.tlb)
 target_link_libraries(msxml2 wine)
diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt
index af6af6485ac..7abb691b219 100644
--- a/dll/win32/msxml3/CMakeLists.txt
+++ b/dll/win32/msxml3/CMakeLists.txt
@@ -60,7 +60,7 @@ list(APPEND msxml3_rc_deps
 
 set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_deps}")
 
-add_library(msxml3 SHARED
+add_library(msxml3 MODULE
     ${SOURCE}
     factory.c
     uuid.c
diff --git a/dll/win32/msxml4/CMakeLists.txt b/dll/win32/msxml4/CMakeLists.txt
index a7b404d232f..ae8258358da 100644
--- a/dll/win32/msxml4/CMakeLists.txt
+++ b/dll/win32/msxml4/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/msxml4.def)
 
-add_library(msxml4 SHARED ${SOURCE} rsrc.rc)
+add_library(msxml4 MODULE ${SOURCE} rsrc.rc)
 set_module_type(msxml4 win32dll)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml4_tlb.tlb)
 target_link_libraries(msxml4 wine)
diff --git a/dll/win32/msxml6/CMakeLists.txt b/dll/win32/msxml6/CMakeLists.txt
index ae20fc6bd0c..b0a95ec0457 100644
--- a/dll/win32/msxml6/CMakeLists.txt
+++ b/dll/win32/msxml6/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/msxml6.def)
 
-add_library(msxml6 SHARED ${SOURCE} rsrc.rc)
+add_library(msxml6 MODULE ${SOURCE} rsrc.rc)
 set_module_type(msxml6 win32dll)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml6_tlb.tlb)
 target_link_libraries(msxml6 wine)
diff --git a/dll/win32/mycomput/CMakeLists.txt b/dll/win32/mycomput/CMakeLists.txt
index 2a828c73ade..add3ffa0839 100644
--- a/dll/win32/mycomput/CMakeLists.txt
+++ b/dll/win32/mycomput/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(mycomput SHARED
+add_library(mycomput MODULE
     mycomput.rc)
 
 set_module_type(mycomput win32dll UNICODE ENTRYPOINT 0)
diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt
index 77525828f04..b3b6568c9be 100644
--- a/dll/win32/nddeapi/CMakeLists.txt
+++ b/dll/win32/nddeapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/nddeapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
 
-add_library(nddeapi SHARED ${SOURCE})
+add_library(nddeapi MODULE ${SOURCE})
 set_module_type(nddeapi win32dll)
 target_link_libraries(nddeapi wine)
 add_importlibs(nddeapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt
index dab40b16eb5..046e372b6a4 100644
--- a/dll/win32/netapi32/CMakeLists.txt
+++ b/dll/win32/netapi32/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/srvsvc_c.c
     ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c)
 
-add_library(netapi32 SHARED
+add_library(netapi32 MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt
index edbc3509b50..99313a57a41 100644
--- a/dll/win32/netcfgx/CMakeLists.txt
+++ b/dll/win32/netcfgx/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c)
 
-add_library(netcfgx SHARED
+add_library(netcfgx MODULE
     ${SOURCE}
     netcfgx.rc
     ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def)
diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt
index 20a6b8bc023..d21c01dd82a 100644
--- a/dll/win32/netevent/CMakeLists.txt
+++ b/dll/win32/netevent/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(netevent SHARED netevent.rc)
+add_library(netevent MODULE netevent.rc)
 set_module_type(netevent module UNICODE)
 add_dependencies(netevent neteventmsg)
 add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt
index 0bdd5e9d66f..1f3b87fc348 100644
--- a/dll/win32/netid/CMakeLists.txt
+++ b/dll/win32/netid/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     netid.rc
     ${CMAKE_CURRENT_BINARY_DIR}/netid.def)
 
-add_library(netid SHARED ${SOURCE})
+add_library(netid MODULE ${SOURCE})
 set_module_type(netid win32dll UNICODE)
 add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET netid DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/netmsg/CMakeLists.txt b/dll/win32/netmsg/CMakeLists.txt
index 7115171eba1..50913fc444c 100644
--- a/dll/win32/netmsg/CMakeLists.txt
+++ b/dll/win32/netmsg/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(netmsg SHARED netmsg.rc)
+add_library(netmsg MODULE netmsg.rc)
 set_module_type(netmsg module UNICODE ENTRYPOINT 0)
 add_dependencies(netmsg netmsgmsg)
 add_cd_file(TARGET netmsg DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt
index 7e8c13e940f..1b4b76d0b65 100644
--- a/dll/win32/newdev/CMakeLists.txt
+++ b/dll/win32/newdev/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     newdev_private.h
     ${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c)
 
-add_library(newdev SHARED
+add_library(newdev MODULE
     ${SOURCE}
     newdev.rc
     ${CMAKE_CURRENT_BINARY_DIR}/newdev.def)
diff --git a/dll/win32/npptools/CMakeLists.txt b/dll/win32/npptools/CMakeLists.txt
index fbb0f5999cb..122c121ef1d 100644
--- a/dll/win32/npptools/CMakeLists.txt
+++ b/dll/win32/npptools/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(npptools.dll npptools.spec)
 
-add_library(npptools SHARED
+add_library(npptools MODULE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/npptools_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/npptools.def)
diff --git a/dll/win32/ntdll_vista/CMakeLists.txt b/dll/win32/ntdll_vista/CMakeLists.txt
index 3a73db8df8c..4ec1c0ab70e 100644
--- a/dll/win32/ntdll_vista/CMakeLists.txt
+++ b/dll/win32/ntdll_vista/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     srw.c
     ${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def)
 
-add_library(ntdll_vista SHARED ${SOURCE})
+add_library(ntdll_vista MODULE ${SOURCE})
 set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12)
 add_importlibs(ntdll_vista ntdll)
 add_dependencies(ntdll_vista psdk)
diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt
index 4f2db858153..88a3f816553 100644
--- a/dll/win32/ntdsapi/CMakeLists.txt
+++ b/dll/win32/ntdsapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def)
 
-add_library(ntdsapi SHARED ${SOURCE})
+add_library(ntdsapi MODULE ${SOURCE})
 set_module_type(ntdsapi win32dll)
 target_link_libraries(ntdsapi wine)
 add_importlibs(ntdsapi user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt
index 21773ad6224..20c73ab0a07 100644
--- a/dll/win32/ntlanman/CMakeLists.txt
+++ b/dll/win32/ntlanman/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/ntlanman_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def)
 
-add_library(ntlanman SHARED ${SOURCE})
+add_library(ntlanman MODULE ${SOURCE})
 set_module_type(ntlanman win32dll UNICODE)
 target_link_libraries(ntlanman wine)
 add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt
index 62553858c26..cecb8282bce 100644
--- a/dll/win32/ntmarta/CMakeLists.txt
+++ b/dll/win32/ntmarta/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ntmarta.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def)
 
-add_library(ntmarta SHARED ${SOURCE})
+add_library(ntmarta MODULE ${SOURCE})
 set_module_type(ntmarta win32dll UNICODE)
 add_importlibs(ntmarta user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET ntmarta DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt
index c32bda6d5f6..4187d1d9b0b 100644
--- a/dll/win32/objsel/CMakeLists.txt
+++ b/dll/win32/objsel/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     objsel.c
     precomp.h)
 
-add_library(objsel SHARED
+add_library(objsel MODULE
     ${SOURCE}
     objsel.rc
     ${CMAKE_CURRENT_BINARY_DIR}/objsel.def)
diff --git a/dll/win32/odbc32/CMakeLists.txt b/dll/win32/odbc32/CMakeLists.txt
index 109606c113e..2fd48cc3c89 100644
--- a/dll/win32/odbc32/CMakeLists.txt
+++ b/dll/win32/odbc32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/odbc32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/odbc32.def)
 
-add_library(odbc32 SHARED ${SOURCE})
+add_library(odbc32 MODULE ${SOURCE})
 set_module_type(odbc32 win32dll)
 target_link_libraries(odbc32 wine)
 add_importlibs(odbc32 advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt
index b2f61e6e223..77949d4d164 100644
--- a/dll/win32/odbccp32/CMakeLists.txt
+++ b/dll/win32/odbccp32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/odbccp32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
 
-add_library(odbccp32 SHARED ${SOURCE})
+add_library(odbccp32 MODULE ${SOURCE})
 set_module_type(odbccp32 win32dll)
 target_link_libraries(odbccp32 uuid wine)
 add_importlibs(odbccp32 advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt
index 327812243be..c0b2f2007a2 100644
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -66,7 +66,7 @@ if(MSVC AND (ARCH STREQUAL "i386"))
     list(APPEND SOURCE msvc-thiscall.c)
 endif()
 
-add_library(ole32 SHARED
+add_library(ole32 MODULE
     ${SOURCE}
     guid.c
     ole32res.rc
diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt
index 9f28fffd6c0..bea28fa0476 100644
--- a/dll/win32/oleacc/CMakeLists.txt
+++ b/dll/win32/oleacc/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND oleacc_rc_deps
 
 set_source_files_properties(oleacc.rc PROPERTIES OBJECT_DEPENDS "${oleacc_rc_deps}")
 
-add_library(oleacc SHARED
+add_library(oleacc MODULE
     ${SOURCE}
     guid.c
     oleacc.rc
diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 1eae81ee810..30a18b9baa7 100644
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -36,7 +36,7 @@ if(MSVC)
     add_asm_files(oleaut32_asm msvc.S)
 endif()
 
-add_library(oleaut32 SHARED
+add_library(oleaut32 MODULE
     ${SOURCE}
     ${oleaut32_asm}
     oleaut32.rc
diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt
index ac5d2bfb0f7..5ade3f7433b 100644
--- a/dll/win32/olecli32/CMakeLists.txt
+++ b/dll/win32/olecli32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/olecli32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def)
 
-add_library(olecli32 SHARED ${SOURCE})
+add_library(olecli32 MODULE ${SOURCE})
 set_module_type(olecli32 win32dll)
 target_link_libraries(olecli32 wine)
 add_importlibs(olecli32 ole32 gdi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt
index 4d568d37e37..f1abe4e3e12 100644
--- a/dll/win32/oledlg/CMakeLists.txt
+++ b/dll/win32/oledlg/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     pastespl.c
     precomp.h)
 
-add_library(oledlg SHARED
+add_library(oledlg MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)
diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt
index c4a172e0b3b..0513497edd7 100644
--- a/dll/win32/olepro32/CMakeLists.txt
+++ b/dll/win32/olepro32/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND olepro32_rc_deps
 
 set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${olepro32_rc_deps}")
 
-add_library(olepro32 SHARED ${SOURCE} version.rc)
+add_library(olepro32 MODULE ${SOURCE} version.rc)
 add_dependencies(olepro32 stdole2)
 set_module_type(olepro32 win32dll)
 target_link_libraries(olepro32 wine)
diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt
index ebe0bca5b24..13188640f2b 100644
--- a/dll/win32/olesvr32/CMakeLists.txt
+++ b/dll/win32/olesvr32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/olesvr32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def)
 
-add_library(olesvr32 SHARED ${SOURCE})
+add_library(olesvr32 MODULE ${SOURCE})
 set_module_type(olesvr32 win32dll)
 target_link_libraries(olesvr32 wine)
 add_importlibs(olesvr32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt
index c687bcb509b..aa5bb2da220 100644
--- a/dll/win32/olethk32/CMakeLists.txt
+++ b/dll/win32/olethk32/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/olethk32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def)
 
-add_library(olethk32 SHARED ${SOURCE})
+add_library(olethk32 MODULE ${SOURCE})
 set_module_type(olethk32 win32dll)
 target_link_libraries(olethk32 wine)
 add_importlibs(olethk32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt
index ca8c9433f5b..dc735a73677 100644
--- a/dll/win32/pdh/CMakeLists.txt
+++ b/dll/win32/pdh/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/pdh_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/pdh.def)
 
-add_library(pdh SHARED ${SOURCE})
+add_library(pdh MODULE ${SOURCE})
 set_module_type(pdh win32dll)
 target_link_libraries(pdh wine)
 add_importlibs(pdh msvcrt kernel32_vista kernel32 ntdll)
diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt
index 8b5be1943c5..f15cb982b86 100644
--- a/dll/win32/pidgen/CMakeLists.txt
+++ b/dll/win32/pidgen/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/pidgen_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def)
 
-add_library(pidgen SHARED ${SOURCE})
+add_library(pidgen MODULE ${SOURCE})
 set_module_type(pidgen win32dll)
 target_link_libraries(pidgen wine)
 add_importlibs(pidgen msvcrt kernel32 ntdll)
diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt
index 44146f91a35..cf6a2199a9b 100644
--- a/dll/win32/powrprof/CMakeLists.txt
+++ b/dll/win32/powrprof/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(powrprof.dll powrprof.spec ADD_IMPORTLIB)
 
-add_library(powrprof SHARED
+add_library(powrprof MODULE
     powrprof.c
     powrprof.rc
     ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def)
diff --git a/dll/win32/printui/CMakeLists.txt b/dll/win32/printui/CMakeLists.txt
index 076fbfa82d0..ebf9752e55a 100644
--- a/dll/win32/printui/CMakeLists.txt
+++ b/dll/win32/printui/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/printui_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/printui.def)
 
-add_library(printui SHARED ${SOURCE} printui.rc)
+add_library(printui MODULE ${SOURCE} printui.rc)
 set_module_type(printui win32dll)
 target_link_libraries(printui wine)
 add_importlibs(printui shell32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/propsys/CMakeLists.txt b/dll/win32/propsys/CMakeLists.txt
index 7b61789aa2b..8d788ae20d4 100644
--- a/dll/win32/propsys/CMakeLists.txt
+++ b/dll/win32/propsys/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c)
 
-add_library(propsys SHARED
+add_library(propsys MODULE
     ${SOURCE}
     propsys.rc
     ${CMAKE_CURRENT_BINARY_DIR}/propsys.def)
diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt
index a58d7324d5b..d92b5d415ff 100644
--- a/dll/win32/psapi/CMakeLists.txt
+++ b/dll/win32/psapi/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     psapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/psapi.def)
 
-add_library(psapi SHARED ${SOURCE})
+add_library(psapi MODULE ${SOURCE})
 set_module_type(psapi win32dll)
 target_link_libraries(psapi ${PSEH_LIB})
 add_importlibs(psapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/pstorec/CMakeLists.txt b/dll/win32/pstorec/CMakeLists.txt
index e75e4e8f2e5..1f168e3fbf4 100644
--- a/dll/win32/pstorec/CMakeLists.txt
+++ b/dll/win32/pstorec/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
 
 add_typelib(pstorec_tlb.idl)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb)
-add_library(pstorec SHARED ${SOURCE} rsrc.rc)
+add_library(pstorec MODULE ${SOURCE} rsrc.rc)
 set_module_type(pstorec win32dll)
 target_link_libraries(pstorec uuid wine)
 add_importlibs(pstorec msvcrt kernel32 ntdll)
diff --git a/dll/win32/qmgr/CMakeLists.txt b/dll/win32/qmgr/CMakeLists.txt
index 21fec58fe3a..eea7ab2bf33 100644
--- a/dll/win32/qmgr/CMakeLists.txt
+++ b/dll/win32/qmgr/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c)
 
-add_library(qmgr SHARED
+add_library(qmgr MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def)
diff --git a/dll/win32/qmgrprxy/CMakeLists.txt b/dll/win32/qmgrprxy/CMakeLists.txt
index 1ec90cdbb76..a207e3eff36 100644
--- a/dll/win32/qmgrprxy/CMakeLists.txt
+++ b/dll/win32/qmgrprxy/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def)
 
-add_library(qmgrprxy SHARED ${SOURCE})
+add_library(qmgrprxy MODULE ${SOURCE})
 set_module_type(qmgrprxy win32dll)
 target_link_libraries(qmgrprxy ${PSEH_LIB} wine)
 add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll)
diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt
index cc527e413d3..dcceb5106a8 100644
--- a/dll/win32/query/CMakeLists.txt
+++ b/dll/win32/query/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/query_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/query.def)
 
-add_library(query SHARED ${SOURCE})
+add_library(query MODULE ${SOURCE})
 set_module_type(query win32dll)
 target_link_libraries(query wine)
 add_importlibs(query msvcrt kernel32 ntdll)
diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt
index 891525a0ec7..9ab054df3e3 100644
--- a/dll/win32/rasadhlp/CMakeLists.txt
+++ b/dll/win32/rasadhlp/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp_stubs.c)
 
-add_library(rasadhlp SHARED
+add_library(rasadhlp MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
 
diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt
index b5eba57f372..41c7cca7619 100644
--- a/dll/win32/rasapi32/CMakeLists.txt
+++ b/dll/win32/rasapi32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/rasapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def)
 
-add_library(rasapi32 SHARED ${SOURCE})
+add_library(rasapi32 MODULE ${SOURCE})
 set_module_type(rasapi32 win32dll)
 target_link_libraries(rasapi32 wine)
 add_importlibs(rasapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt
index 3b0cb2a4a5e..3f2e84d499b 100644
--- a/dll/win32/rasdlg/CMakeLists.txt
+++ b/dll/win32/rasdlg/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/rasdlg_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def)
 
-add_library(rasdlg SHARED ${SOURCE})
+add_library(rasdlg MODULE ${SOURCE})
 set_module_type(rasdlg win32dll)
 target_link_libraries(rasdlg wine uuid)
 add_importlibs(rasdlg msvcrt kernel32 ntdll)
diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt
index ef32f9b54dd..5ba8619d413 100644
--- a/dll/win32/rasman/CMakeLists.txt
+++ b/dll/win32/rasman/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/rasman_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/rasman.def)
 
-add_library(rasman SHARED ${SOURCE})
+add_library(rasman MODULE ${SOURCE})
 set_module_type(rasman win32dll)
 target_link_libraries(rasman wine uuid)
 add_importlibs(rasman msvcrt kernel32 ntdll)
diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt
index 0bdf8f665a9..111ab7e1839 100644
--- a/dll/win32/resutils/CMakeLists.txt
+++ b/dll/win32/resutils/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/resutils_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/resutils.def)
 
-add_library(resutils SHARED ${SOURCE})
+add_library(resutils MODULE ${SOURCE})
 set_module_type(resutils win32dll)
 target_link_libraries(resutils wine)
 add_importlibs(resutils msvcrt kernel32 ntdll)
diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt
index d7ed37de708..11e185983e6 100644
--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -30,7 +30,7 @@ list(APPEND riched20_rc_deps
     ${CMAKE_CURRENT_BINARY_DIR}/riched_tom.tlb)
 set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${riched20_rc_deps}")
 
-add_library(riched20 SHARED
+add_library(riched20 MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt
index 8db9e188825..f719d7a2612 100644
--- a/dll/win32/riched32/CMakeLists.txt
+++ b/dll/win32/riched32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     richedit.c
     ${CMAKE_CURRENT_BINARY_DIR}/riched32.def)
 
-add_library(riched32 SHARED ${SOURCE} version.rc)
+add_library(riched32 MODULE ${SOURCE} version.rc)
 set_module_type(riched32 win32dll)
 target_link_libraries(riched32 wine)
 add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt
index 24c5d8fb406..a3d68266de8 100644
--- a/dll/win32/rpcrt4/CMakeLists.txt
+++ b/dll/win32/rpcrt4/CMakeLists.txt
@@ -46,7 +46,7 @@ if(MSVC AND NOT ARCH STREQUAL "arm")
     add_asm_files(rpcrt4_asm msvc.S)
 endif()
 
-add_library(rpcrt4 SHARED
+add_library(rpcrt4 MODULE
     ${SOURCE}
     ndr_typelib.c
     ${CMAKE_CURRENT_BINARY_DIR}/ndr_types_p.c
diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt
index 38d9335eb87..4b4cd83743c 100644
--- a/dll/win32/rsabase/CMakeLists.txt
+++ b/dll/win32/rsabase/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def)
 
-add_library(rsabase SHARED ${SOURCE})
+add_library(rsabase MODULE ${SOURCE})
 set_module_type(rsabase win32dll ENTRYPOINT 0 )
 target_link_libraries(rsabase wine)
 add_importlibs(rsabase rsaenh ntdll)
diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt
index 6248ed3e570..700ccb81f94 100644
--- a/dll/win32/rsaenh/CMakeLists.txt
+++ b/dll/win32/rsaenh/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     sha2.c
     tomcrypt.h)
 
-add_library(rsaenh SHARED
+add_library(rsaenh MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt
index 8c23aed7a6a..7cf73e25389 100644
--- a/dll/win32/samlib/CMakeLists.txt
+++ b/dll/win32/samlib/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/sam_c.c
     ${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c)
 
-add_library(samlib SHARED
+add_library(samlib MODULE
     ${SOURCE}
     samlib.rc
     ${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt
index 3e367abb87a..f3303d61eed 100644
--- a/dll/win32/samsrv/CMakeLists.txt
+++ b/dll/win32/samsrv/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c
     ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c)
 
-add_library(samsrv SHARED
+add_library(samsrv MODULE
     ${SOURCE}
     samsrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt
index 5733cae59a2..c4c81abc6c8 100644
--- a/dll/win32/sccbase/CMakeLists.txt
+++ b/dll/win32/sccbase/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/sccbase_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def)
 
-add_library(sccbase SHARED ${SOURCE})
+add_library(sccbase MODULE ${SOURCE})
 set_module_type(sccbase win32dll)
 target_link_libraries(sccbase wine)
 add_importlibs(sccbase msvcrt kernel32 ntdll)
diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt
index 205535005b0..4a0cf0cc53a 100644
--- a/dll/win32/schannel/CMakeLists.txt
+++ b/dll/win32/schannel/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/schannel_stubs.c)
 
-add_library(schannel SHARED
+add_library(schannel MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/schannel.def)
diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt
index d77282faf24..791cb93bb65 100644
--- a/dll/win32/scrrun/CMakeLists.txt
+++ b/dll/win32/scrrun/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND scrrun_rc_deps
 
 set_source_files_properties(scrrun.rc PROPERTIES OBJECT_DEPENDS "${scrrun_rc_deps}")
 
-add_library(scrrun SHARED
+add_library(scrrun MODULE
     ${SOURCE}
     guid.c
     scrrun.rc
diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt
index f1b696d584d..d8e06d9ef17 100644
--- a/dll/win32/secur32/CMakeLists.txt
+++ b/dll/win32/secur32/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     wine/util.c
     precomp.h)
 
-add_library(secur32 SHARED
+add_library(secur32 MODULE
     ${SOURCE}
     secur32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c
diff --git a/dll/win32/security/CMakeLists.txt b/dll/win32/security/CMakeLists.txt
index 12a85b169ea..faf84a39a1a 100644
--- a/dll/win32/security/CMakeLists.txt
+++ b/dll/win32/security/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     security.rc
     ${CMAKE_CURRENT_BINARY_DIR}/security.def)
 
-add_library(security SHARED ${SOURCE})
+add_library(security MODULE ${SOURCE})
 set_module_type(security win32dll ENTRYPOINT 0 UNICODE)
 add_importlibs(security secur32)
 add_cd_file(TARGET security DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt
index 463a461c016..fac2b2cd59a 100644
--- a/dll/win32/sensapi/CMakeLists.txt
+++ b/dll/win32/sensapi/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     sensapi.c
     ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def)
 
-add_library(sensapi SHARED ${SOURCE})
+add_library(sensapi MODULE ${SOURCE})
 set_module_type(sensapi win32dll)
 target_link_libraries(sensapi wine)
 add_importlibs(sensapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt
index 728ff9a6bd8..c9a02f22caa 100644
--- a/dll/win32/serialui/CMakeLists.txt
+++ b/dll/win32/serialui/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     serialui.rc
     ${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
 
-add_library(serialui SHARED ${SOURCE})
+add_library(serialui MODULE ${SOURCE})
 set_module_type(serialui win32dll UNICODE)
 add_importlibs(serialui user32 shlwapi msvcrt kernel32)
 add_cd_file(TARGET serialui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt
index 933d66111a6..964614012b3 100644
--- a/dll/win32/setupapi/CMakeLists.txt
+++ b/dll/win32/setupapi/CMakeLists.txt
@@ -33,7 +33,7 @@ list(APPEND SOURCE
     setupapi_private.h
     ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c)
 
-add_library(setupapi SHARED
+add_library(setupapi MODULE
     ${SOURCE}
     setupapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c
diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt
index 350c8d8a54a..33fa498945a 100644
--- a/dll/win32/sfc/CMakeLists.txt
+++ b/dll/win32/sfc/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/sfc_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sfc.def)
 
-add_library(sfc SHARED ${SOURCE})
+add_library(sfc MODULE ${SOURCE})
 set_module_type(sfc win32dll)
 add_importlibs(sfc sfc_os msvcrt kernel32 ntdll)
 add_cd_file(TARGET sfc DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sfc_os/CMakeLists.txt b/dll/win32/sfc_os/CMakeLists.txt
index d9713f9dec5..4d722e916c0 100644
--- a/dll/win32/sfc_os/CMakeLists.txt
+++ b/dll/win32/sfc_os/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/sfc_os_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def)
 
-add_library(sfc_os SHARED ${SOURCE})
+add_library(sfc_os MODULE ${SOURCE})
 set_module_type(sfc_os win32dll)
 add_importlibs(sfc_os msvcrt kernel32 ntdll)
 add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt
index ebc0823bcd5..2e5415585a6 100644
--- a/dll/win32/shdoclc/CMakeLists.txt
+++ b/dll/win32/shdoclc/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(shdoclc.dll shdoclc.spec)
 
-add_library(shdoclc SHARED
+add_library(shdoclc MODULE
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def)
 
diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt
index 5efd1fda99d..ecc274f294f 100644
--- a/dll/win32/shdocvw/CMakeLists.txt
+++ b/dll/win32/shdocvw/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
 add_typelib(shdocvw_v1.idl)
 set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb)
 
-add_library(shdocvw SHARED
+add_library(shdocvw MODULE
     ${SOURCE}
     shdocvw.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 78ee1af5319..871e9247031 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -86,7 +86,7 @@ file(GLOB_RECURSE shell32_rc_deps res/*.*)
 list(APPEND shell32_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb)
 add_rc_deps(shell32.rc ${shell32_rc_deps})
 
-add_library(shell32 SHARED
+add_library(shell32 MODULE
     ${SOURCE}
     wine/brsfolder.c
     wine/changenotify.c
diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt
index 6beb2697763..34f08350df2 100644
--- a/dll/win32/shfolder/CMakeLists.txt
+++ b/dll/win32/shfolder/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def)
 
-add_library(shfolder SHARED ${SOURCE})
+add_library(shfolder MODULE ${SOURCE})
 set_module_type(shfolder win32dll ENTRYPOINT 0 )
 target_link_libraries(shfolder wine)
 add_importlibs(shfolder shell32 kernel32 ntdll)
diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt
index 8895a0b654d..e26d54f73be 100644
--- a/dll/win32/shimgvw/CMakeLists.txt
+++ b/dll/win32/shimgvw/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/shimgvw_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def)
 
-add_library(shimgvw SHARED ${SOURCE})
+add_library(shimgvw MODULE ${SOURCE})
 set_module_type(shimgvw win32dll)
 target_link_libraries(shimgvw wine)
 add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 gdiplus comdlg32 shlwapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt
index ec0e2e65e65..78fe1d19bf8 100644
--- a/dll/win32/shlwapi/CMakeLists.txt
+++ b/dll/win32/shlwapi/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SOURCE
     url.c
     precomp.h)
 
-add_library(shlwapi SHARED
+add_library(shlwapi MODULE
     ${SOURCE}
     shlwapi.rc
     wsprintf.c
diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt
index f697aef964e..b05ac017d90 100644
--- a/dll/win32/slbcsp/CMakeLists.txt
+++ b/dll/win32/slbcsp/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/slbcsp_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def)
 
-add_library(slbcsp SHARED ${SOURCE})
+add_library(slbcsp MODULE ${SOURCE})
 set_module_type(slbcsp win32dll)
 target_link_libraries(slbcsp wine)
 add_importlibs(slbcsp msvcrt kernel32 ntdll)
diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt
index 4c5d88cb48c..9c38ba32b27 100644
--- a/dll/win32/smdll/CMakeLists.txt
+++ b/dll/win32/smdll/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     query.c
     precomp.h)
 
-add_library(smdll SHARED
+add_library(smdll MODULE
     ${SOURCE}
     smdll.rc
     ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt
index 43935837dc5..47a5880355a 100644
--- a/dll/win32/sndblst/CMakeLists.txt
+++ b/dll/win32/sndblst/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     sndblst.c
     ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def)
 
-add_library(sndblst SHARED ${SOURCE})
+add_library(sndblst MODULE ${SOURCE})
 set_module_type(sndblst win32dll UNICODE)
 target_link_libraries(sndblst mment4 mmebuddy)
 add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt
index 76c9994bd94..32b10f7f931 100644
--- a/dll/win32/snmpapi/CMakeLists.txt
+++ b/dll/win32/snmpapi/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/snmpapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def)
 
-add_library(snmpapi SHARED ${SOURCE} snmpapi.rc)
+add_library(snmpapi MODULE ${SOURCE} snmpapi.rc)
 set_module_type(snmpapi win32dll)
 target_link_libraries(snmpapi wine)
 add_importlibs(snmpapi msvcrt kernel32_vista kernel32 ntdll)
diff --git a/dll/win32/softpub/CMakeLists.txt b/dll/win32/softpub/CMakeLists.txt
index eb474e5eef6..3d867642734 100644
--- a/dll/win32/softpub/CMakeLists.txt
+++ b/dll/win32/softpub/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(softpub.dll softpub.spec)
 
-add_library(softpub SHARED
+add_library(softpub MODULE
     softpub.rc
     ${CMAKE_CURRENT_BINARY_DIR}/softpub.def)
 
diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt
index c65d5d3b65e..53f8cf318d5 100644
--- a/dll/win32/srclient/CMakeLists.txt
+++ b/dll/win32/srclient/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/srclient_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
 
-add_library(srclient SHARED ${SOURCE})
+add_library(srclient MODULE ${SOURCE})
 set_module_type(srclient win32dll)
 add_importlibs(srclient msvcrt kernel32 ntdll)
 add_cd_file(TARGET srclient DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt
index ece681090ec..162e10c0713 100644
--- a/dll/win32/stdole2.tlb/CMakeLists.txt
+++ b/dll/win32/stdole2.tlb/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb)
-add_library(stdole2.tlb SHARED ${SOURCE})
+add_library(stdole2.tlb MODULE ${SOURCE})
 set_module_type(stdole2.tlb module)
 set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
 add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt
index 8c2b9cb2927..59b78f8c03a 100644
--- a/dll/win32/stdole32.tlb/CMakeLists.txt
+++ b/dll/win32/stdole32.tlb/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb)
-add_library(stdole32.tlb SHARED ${SOURCE})
+add_library(stdole32.tlb MODULE ${SOURCE})
 set_module_type(stdole32.tlb module)
 set_target_properties(stdole32.tlb PROPERTIES SUFFIX "")
 add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt
index a134aa77a18..e751fda2af0 100644
--- a/dll/win32/sti/CMakeLists.txt
+++ b/dll/win32/sti/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c)
 
-add_library(sti SHARED
+add_library(sti MODULE
     ${SOURCE}
     guid.c
     sti.rc
diff --git a/dll/win32/streamci/CMakeLists.txt b/dll/win32/streamci/CMakeLists.txt
index c0c903b7525..fb83c0f7bbd 100644
--- a/dll/win32/streamci/CMakeLists.txt
+++ b/dll/win32/streamci/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     streamci.c
     precomp.h)
 
-add_library(streamci SHARED
+add_library(streamci MODULE
     ${SOURCE}
     streamci.rc
     ${CMAKE_CURRENT_BINARY_DIR}/streamci.def)
diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt
index 79d166e0361..5df97444659 100644
--- a/dll/win32/sxs/CMakeLists.txt
+++ b/dll/win32/sxs/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c)
 
-add_library(sxs SHARED
+add_library(sxs MODULE
     ${SOURCE}
     guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt
index 13286aa6430..ab1ab4db45a 100644
--- a/dll/win32/syssetup/CMakeLists.txt
+++ b/dll/win32/syssetup/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/syssetup_stubs.c)
 
-add_library(syssetup SHARED
+add_library(syssetup MODULE
     ${SOURCE}
     syssetup.rc
     ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def)
diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt
index 6453e4a4d4c..ecb40360c9f 100644
--- a/dll/win32/t2embed/CMakeLists.txt
+++ b/dll/win32/t2embed/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/t2embed_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def)
 
-add_library(t2embed SHARED ${SOURCE} t2embed.rc)
+add_library(t2embed MODULE ${SOURCE} t2embed.rc)
 set_module_type(t2embed win32dll UNICODE)
 target_link_libraries(t2embed wine)
 add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll)
diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt
index 0fc299772b1..3c1d617136f 100644
--- a/dll/win32/tapi32/CMakeLists.txt
+++ b/dll/win32/tapi32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/tapi32_stubs.c)
 
-add_library(tapi32 SHARED
+add_library(tapi32 MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
 
diff --git a/dll/win32/tapiui/CMakeLists.txt b/dll/win32/tapiui/CMakeLists.txt
index dc5fe431f56..b48a26de72f 100644
--- a/dll/win32/tapiui/CMakeLists.txt
+++ b/dll/win32/tapiui/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(tapiui SHARED tapiui.rc)
+add_library(tapiui MODULE tapiui.rc)
 set_module_type(tapiui win32dll ENTRYPOINT 0 )
 add_dependencies(tapiui psdk)
 add_cd_file(TARGET tapiui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/themeui/CMakeLists.txt b/dll/win32/themeui/CMakeLists.txt
index dcad389e1ef..6f2538967e4 100644
--- a/dll/win32/themeui/CMakeLists.txt
+++ b/dll/win32/themeui/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-add_library(themeui SHARED themeui.rc)
+add_library(themeui MODULE themeui.rc)
 set_module_type(themeui win32dll ENTRYPOINT 0)
 add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt
index 98e8446304b..85625c63e4e 100644
--- a/dll/win32/traffic/CMakeLists.txt
+++ b/dll/win32/traffic/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/traffic_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/traffic.def)
 
-add_library(traffic SHARED ${SOURCE})
+add_library(traffic MODULE ${SOURCE})
 set_module_type(traffic win32dll)
 target_link_libraries(traffic wine)
 add_importlibs(traffic msvcrt kernel32 ntdll)
diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt
index 2861f22ba23..6a00adfb665 100644
--- a/dll/win32/twain_32/CMakeLists.txt
+++ b/dll/win32/twain_32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     twain32_main.c
     precomp.h)
 
-add_library(twain_32 SHARED
+add_library(twain_32 MODULE
     ${SOURCE}
     twain_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def)
diff --git a/dll/win32/ubtrfs/CMakeLists.txt b/dll/win32/ubtrfs/CMakeLists.txt
index 0f37c4717df..866aecbbe20 100644
--- a/dll/win32/ubtrfs/CMakeLists.txt
+++ b/dll/win32/ubtrfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ubtrfs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ubtrfs.def)
 
-add_library(ubtrfs SHARED ${SOURCE})
+add_library(ubtrfs MODULE ${SOURCE})
 set_module_type(ubtrfs nativedll)
 target_link_libraries(ubtrfs btrfslib)
 add_importlibs(ubtrfs ntdll)
diff --git a/dll/win32/ucdfs/CMakeLists.txt b/dll/win32/ucdfs/CMakeLists.txt
index 9dfe3eab683..c35ad3fdd1c 100644
--- a/dll/win32/ucdfs/CMakeLists.txt
+++ b/dll/win32/ucdfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ucdfs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ucdfs.def)
 
-add_library(ucdfs SHARED ${SOURCE})
+add_library(ucdfs MODULE ${SOURCE})
 set_module_type(ucdfs nativedll)
 target_link_libraries(ucdfs cdfslib)
 add_importlibs(ucdfs ntdll)
diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt
index eef6c63213a..ec0480f9491 100644
--- a/dll/win32/uext2/CMakeLists.txt
+++ b/dll/win32/uext2/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     uext2.rc
     ${CMAKE_CURRENT_BINARY_DIR}/uext2.def)
 
-add_library(uext2 SHARED ${SOURCE})
+add_library(uext2 MODULE ${SOURCE})
 set_module_type(uext2 nativedll)
 target_link_libraries(uext2 ext2lib)
 add_importlibs(uext2 ntdll)
diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt
index 432af9db096..e58ae95d24b 100644
--- a/dll/win32/ufat/CMakeLists.txt
+++ b/dll/win32/ufat/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ufat.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ufat.def)
 
-add_library(ufat SHARED ${SOURCE})
+add_library(ufat MODULE ${SOURCE})
 set_module_type(ufat nativedll)
 target_link_libraries(ufat vfatlib)
 add_importlibs(ufat ntdll)
diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt
index 9f7ce367b6c..e9bbeb58cef 100644
--- a/dll/win32/ufatx/CMakeLists.txt
+++ b/dll/win32/ufatx/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ufatx.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
 
-add_library(ufatx SHARED ${SOURCE})
+add_library(ufatx MODULE ${SOURCE})
 set_module_type(ufatx nativedll)
 target_link_libraries(ufatx vfatxlib)
 add_importlibs(ufatx ntdll)
diff --git a/dll/win32/uffs/CMakeLists.txt b/dll/win32/uffs/CMakeLists.txt
index 63eeee9f5f6..2bc8f14e2f2 100644
--- a/dll/win32/uffs/CMakeLists.txt
+++ b/dll/win32/uffs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     uffs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/uffs.def)
 
-add_library(uffs SHARED ${SOURCE})
+add_library(uffs MODULE ${SOURCE})
 set_module_type(uffs nativedll)
 target_link_libraries(uffs ffslib)
 add_importlibs(uffs ntdll)
diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt
index c65863708e1..7012263a52a 100644
--- a/dll/win32/untfs/CMakeLists.txt
+++ b/dll/win32/untfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     untfs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/untfs.def)
 
-add_library(untfs SHARED ${SOURCE})
+add_library(untfs MODULE ${SOURCE})
 set_module_type(untfs nativedll)
 target_link_libraries(untfs ntfslib)
 add_importlibs(untfs ntdll)
diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt
index 088e86597e0..e27c628b3a4 100644
--- a/dll/win32/updspapi/CMakeLists.txt
+++ b/dll/win32/updspapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/updspapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def)
 
-add_library(updspapi SHARED ${SOURCE})
+add_library(updspapi MODULE ${SOURCE})
 set_module_type(updspapi win32dll)
 target_link_libraries(updspapi wine)
 add_importlibs(updspapi setupapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/ureiserfs/CMakeLists.txt b/dll/win32/ureiserfs/CMakeLists.txt
index 836fab87692..e08d3835989 100644
--- a/dll/win32/ureiserfs/CMakeLists.txt
+++ b/dll/win32/ureiserfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ureiserfs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ureiserfs.def)
 
-add_library(ureiserfs SHARED ${SOURCE})
+add_library(ureiserfs MODULE ${SOURCE})
 set_module_type(ureiserfs nativedll)
 target_link_libraries(ureiserfs reiserfslib)
 add_importlibs(ureiserfs ntdll)
diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt
index e032989d89a..6ccecd52884 100644
--- a/dll/win32/url/CMakeLists.txt
+++ b/dll/win32/url/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/url_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/url.def)
 
-add_library(url SHARED ${SOURCE})
+add_library(url MODULE ${SOURCE})
 set_module_type(url win32dll)
 target_link_libraries(url wine)
 add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt
index 51eeb5abc5a..6c7938ff35e 100644
--- a/dll/win32/urlmon/CMakeLists.txt
+++ b/dll/win32/urlmon/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SOURCE
     usrmarshal.c
     precomp.h)
 
-add_library(urlmon SHARED
+add_library(urlmon MODULE
     ${SOURCE}
     urlmon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt
index 4fb503a109d..d30c2438a24 100644
--- a/dll/win32/userenv/CMakeLists.txt
+++ b/dll/win32/userenv/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     userenv.c
     precomp.h)
 
-add_library(userenv SHARED
+add_library(userenv MODULE
     ${SOURCE}
     userenv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/userenv_stubs.c
diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt
index 25b76c56420..57fc2be44f7 100644
--- a/dll/win32/usp10/CMakeLists.txt
+++ b/dll/win32/usp10/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c)
 
-add_library(usp10 SHARED
+add_library(usp10 MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/usp10.def)
 
diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt
index dcdedb11ddc..80d31bf44c7 100644
--- a/dll/win32/uxtheme/CMakeLists.txt
+++ b/dll/win32/uxtheme/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     uxthemep.h
     ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c)
 
-add_library(uxtheme SHARED
+add_library(uxtheme MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt
index 458cd1c7905..d562befb467 100644
--- a/dll/win32/vbscript/CMakeLists.txt
+++ b/dll/win32/vbscript/CMakeLists.txt
@@ -30,7 +30,7 @@ set_source_files_properties(vbscript.rc PROPERTIES OBJECT_DEPENDS "${vbscript_rc
 add_idl_headers(vbscript_idlheader vbscript_classes.idl vbsglobal.idl vbsregexp55.idl)
 add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl)
 
-add_library(vbscript SHARED
+add_library(vbscript MODULE
     ${SOURCE}
     vbscript.rc
     ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
diff --git a/dll/win32/verifier/CMakeLists.txt b/dll/win32/verifier/CMakeLists.txt
index df2c1b68964..5e9825bad10 100644
--- a/dll/win32/verifier/CMakeLists.txt
+++ b/dll/win32/verifier/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/verifier.def
     ${CMAKE_CURRENT_BINARY_DIR}/verifier_stubs.c)
 
-add_library(verifier SHARED ${SOURCE})
+add_library(verifier MODULE ${SOURCE})
 set_module_type(verifier win32dll UNICODE ENTRYPOINT DllMain 12)
 add_importlibs(verifier ntdll)  # Only ntdll!
 add_cd_file(TARGET verifier DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt
index 3d63c8fcb22..2e56518c160 100644
--- a/dll/win32/version/CMakeLists.txt
+++ b/dll/win32/version/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     version.c
     ${CMAKE_CURRENT_BINARY_DIR}/version.def)
 
-add_library(version SHARED ${SOURCE} version.rc)
+add_library(version MODULE ${SOURCE} version.rc)
 set_module_type(version win32dll)
 target_link_libraries(version wine)
 add_importlibs(version msvcrt kernel32 ntdll)
diff --git a/dll/win32/vssapi/CMakeLists.txt b/dll/win32/vssapi/CMakeLists.txt
index 5e1ed551450..744f9da9119 100644
--- a/dll/win32/vssapi/CMakeLists.txt
+++ b/dll/win32/vssapi/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MSVC AND ARCH STREQUAL "i386")
     add_asm_files(vssapi_asm msvc.s)
 endif()
 
-add_library(vssapi SHARED ${SOURCE} ${vssapi_asm})
+add_library(vssapi MODULE ${SOURCE} ${vssapi_asm})
 set_module_type(vssapi win32dll)
 target_link_libraries(vssapi wine)
 add_importlibs(vssapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/wbemdisp/CMakeLists.txt b/dll/win32/wbemdisp/CMakeLists.txt
index 439e1100672..974446545d3 100644
--- a/dll/win32/wbemdisp/CMakeLists.txt
+++ b/dll/win32/wbemdisp/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND wbemdisp_rc_deps
 
 set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc_deps}")
 
-add_library(wbemdisp SHARED
+add_library(wbemdisp MODULE
     ${SOURCE}
     guid.c
     wbemdisp.rc
diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt
index 5aea8b66214..d11bb0da53a 100644
--- a/dll/win32/wbemprox/CMakeLists.txt
+++ b/dll/win32/wbemprox/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     wql.tab.c
     precomp.h)
 
-add_library(wbemprox SHARED
+add_library(wbemprox MODULE
     ${SOURCE}
     guid.c
     wbemprox.rc
diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt
index 23a65c3e113..16703b0d0fd 100644
--- a/dll/win32/wdmaud.drv/CMakeLists.txt
+++ b/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     legacy.c
     wdmaud.h)
 
-add_library(wdmaud.drv SHARED
+add_library(wdmaud.drv MODULE
     ${SOURCE}
     wdmaud.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def)
diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt
index 6c67bfe1a9e..72cea6d42ad 100644
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -70,7 +70,7 @@ list(APPEND ADDITIONAL_SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c)
 
-add_library(windowscodecs SHARED
+add_library(windowscodecs MODULE
     ${SOURCE}
     ${ADDITIONAL_SOURCE})
 
diff --git a/dll/win32/windowscodecsext/CMakeLists.txt b/dll/win32/windowscodecsext/CMakeLists.txt
index e1988893421..da3505e34fa 100644
--- a/dll/win32/windowscodecsext/CMakeLists.txt
+++ b/dll/win32/windowscodecsext/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     main.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecsext.def)
 
-add_library(windowscodecsext SHARED ${SOURCE})
+add_library(windowscodecsext MODULE ${SOURCE})
 set_module_type(windowscodecsext win32dll)
 target_link_libraries(windowscodecsext wine)
 add_importlibs(windowscodecsext ole32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/winemp3.acm/CMakeLists.txt b/dll/win32/winemp3.acm/CMakeLists.txt
index 3ad86b6c51f..4d428baa456 100644
--- a/dll/win32/winemp3.acm/CMakeLists.txt
+++ b/dll/win32/winemp3.acm/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
 
 spec2def(winemp3.acm winemp3.acm.spec)
 
-add_library(winemp3.acm SHARED
+add_library(winemp3.acm MODULE
     mpegl3.c
     ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def)
 
diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt
index 830d8e62fb0..5913515ce21 100644
--- a/dll/win32/winfax/CMakeLists.txt
+++ b/dll/win32/winfax/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     winfax.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winfax.def)
 
-add_library(winfax SHARED ${SOURCE})
+add_library(winfax MODULE ${SOURCE})
 set_module_type(winfax win32dll)
 add_importlibs(winfax msvcrt kernel32 ntdll)
 add_cd_file(TARGET winfax DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt
index a4980b8eb2b..74f53245d60 100644
--- a/dll/win32/wing32/CMakeLists.txt
+++ b/dll/win32/wing32/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     wing32.c
     ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
 
-add_library(wing32 SHARED ${SOURCE})
+add_library(wing32 MODULE ${SOURCE})
 set_module_type(wing32 win32dll UNICODE)
 add_importlibs(wing32 user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET wing32 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index 988c769b0b0..f0dca0805ed 100644
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winhttp_tlb.tlb)
 add_typelib(winhttp_tlb.idl)
 
-add_library(winhttp SHARED
+add_library(winhttp MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt
index fc12adf7e5b..3389140c1d2 100644
--- a/dll/win32/wininet/CMakeLists.txt
+++ b/dll/win32/wininet/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND SOURCE
     utility.c
     precomp.h)
 
-add_library(wininet SHARED
+add_library(wininet MODULE
     ${SOURCE}
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c
diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt
index eb3cbecbbea..616680b2ec6 100644
--- a/dll/win32/winmm/CMakeLists.txt
+++ b/dll/win32/winmm/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     winemm.h
     ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c)
 
-add_library(winmm SHARED
+add_library(winmm MODULE
     ${SOURCE}
     winmm_res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt
index a025f148c11..755b22018a6 100644
--- a/dll/win32/winmm/midimap/CMakeLists.txt
+++ b/dll/win32/winmm/midimap/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(midimap.dll midimap.spec)
 
-add_library(midimap SHARED
+add_library(midimap MODULE
     midimap.c
     midimap.rc
     ${CMAKE_CURRENT_BINARY_DIR}/midimap.def)
diff --git a/dll/win32/winscard/CMakeLists.txt b/dll/win32/winscard/CMakeLists.txt
index e11f992a1a1..7c3cf89a5e6 100644
--- a/dll/win32/winscard/CMakeLists.txt
+++ b/dll/win32/winscard/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/winscard_stubs.c)
 
-add_library(winscard SHARED
+add_library(winscard MODULE
     ${SOURCE}
     winscard.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winscard.def)
diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt
index efc4296c297..75769aab709 100644
--- a/dll/win32/winsta/CMakeLists.txt
+++ b/dll/win32/winsta/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     ws.c
     winsta.h)
 
-add_library(winsta SHARED
+add_library(winsta MODULE
     ${SOURCE}
     winsta.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winsta.def)
diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt
index 1e8d8bf5353..d47599c97a2 100644
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c)
 
-add_library(wintrust SHARED
+add_library(wintrust MODULE
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def)
diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt
index 44a95896923..f1f7c1f0626 100644
--- a/dll/win32/wlanapi/CMakeLists.txt
+++ b/dll/win32/wlanapi/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def
     ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_c.c)
 
-add_library(wlanapi SHARED ${SOURCE})
+add_library(wlanapi MODULE ${SOURCE})
 set_module_type(wlanapi win32dll)
 target_link_libraries(wlanapi wine ${PSEH_LIB})
 add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll)
diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt
index 2f1375099fe..b0b0b21f594 100644
--- a/dll/win32/wldap32/CMakeLists.txt
+++ b/dll/win32/wldap32/CMakeLists.txt
@@ -26,7 +26,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c)
 
-add_library(wldap32 SHARED
+add_library(wldap32 MODULE
     ${SOURCE}
     ber.c
     wldap32.rc
diff --git a/dll/win32/wlnotify/CMakeLists.txt b/dll/win32/wlnotify/CMakeLists.txt
index 9a29d0628c8..f4625964248 100644
--- a/dll/win32/wlnotify/CMakeLists.txt
+++ b/dll/win32/wlnotify/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     wlnotify.c
     precomp.h)
 
-add_library(wlnotify SHARED
+add_library(wlnotify MODULE
     ${SOURCE}
     wlnotify.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wlnotify.def)
diff --git a/dll/win32/wmi/CMakeLists.txt b/dll/win32/wmi/CMakeLists.txt
index 0519d44940e..f93ebf2b5e6 100644
--- a/dll/win32/wmi/CMakeLists.txt
+++ b/dll/win32/wmi/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     wmi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wmi.def)
 
-add_library(wmi SHARED ${SOURCE})
+add_library(wmi MODULE ${SOURCE})
 set_module_type(wmi win32dll ENTRYPOINT 0 )
 add_importlibs(wmi advapi32)
 add_dependencies(wmi psdk)
diff --git a/dll/win32/wmiutils/CMakeLists.txt b/dll/win32/wmiutils/CMakeLists.txt
index f0542a1ffac..01df1c8e3c0 100644
--- a/dll/win32/wmiutils/CMakeLists.txt
+++ b/dll/win32/wmiutils/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     statuscode.c
     ${CMAKE_CURRENT_BINARY_DIR}/wmiutils.def)
 
-add_library(wmiutils SHARED ${SOURCE} wmiutils.rc)
+add_library(wmiutils MODULE ${SOURCE} wmiutils.rc)
 set_module_type(wmiutils win32dll)
 target_link_libraries(wmiutils wine)
 add_importlibs(wmiutils oleaut32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/wmvcore/CMakeLists.txt b/dll/win32/wmvcore/CMakeLists.txt
index d22c8c42b75..a89df2a3b61 100644
--- a/dll/win32/wmvcore/CMakeLists.txt
+++ b/dll/win32/wmvcore/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/wmvcore_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/wmvcore.def)
 
-add_library(wmvcore SHARED ${SOURCE} version.rc)
+add_library(wmvcore MODULE ${SOURCE} version.rc)
 set_module_type(wmvcore win32dll)
 target_link_libraries(wmvcore wine)
 add_importlibs(wmvcore msvcrt kernel32 ntdll)
diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt
index 476ed6d615e..6b3ebb429ce 100644
--- a/dll/win32/ws2_32/CMakeLists.txt
+++ b/dll/win32/ws2_32/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SOURCE
     src/wsautil.c
     inc/ws2_32.h)
 
-add_library(ws2_32 SHARED
+add_library(ws2_32 MODULE
     ${SOURCE}
     ws2_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt
index 234af5e70f6..00c8ad02b05 100644
--- a/dll/win32/ws2help/CMakeLists.txt
+++ b/dll/win32/ws2help/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     notify.c
     precomp.h)
 
-add_library(ws2help SHARED
+add_library(ws2help MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 
diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt
index d7fc1562c94..be1995d0a41 100644
--- a/dll/win32/wshirda/CMakeLists.txt
+++ b/dll/win32/wshirda/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     wshirda.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
 
-add_library(wshirda SHARED ${SOURCE})
+add_library(wshirda MODULE ${SOURCE})
 set_module_type(wshirda win32dll UNICODE)
 add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wshirda DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/wshom.ocx/CMakeLists.txt b/dll/win32/wshom.ocx/CMakeLists.txt
index 56c3d3f1aa0..27c99b2fc12 100644
--- a/dll/win32/wshom.ocx/CMakeLists.txt
+++ b/dll/win32/wshom.ocx/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     wshom_main.c
     precomp.h)
 
-add_library(wshom SHARED
+add_library(wshom MODULE
     ${SOURCE}
     guid.c
     wshom.rc
diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt
index 2c9059afbca..887443f1ce9 100644
--- a/dll/win32/wshtcpip/CMakeLists.txt
+++ b/dll/win32/wshtcpip/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     wshtcpip.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def)
 
-add_library(wshtcpip SHARED ${SOURCE})
+add_library(wshtcpip MODULE ${SOURCE})
 set_module_type(wshtcpip win32dll UNICODE)
 target_link_libraries(wshtcpip tdilib)
 add_importlibs(wshtcpip ws2_32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt
index 2826ec78046..659b06f1137 100644
--- a/dll/win32/wsock32/CMakeLists.txt
+++ b/dll/win32/wsock32/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 spec2def(wsock32.dll wsock32.spec)
-add_library(wsock32 SHARED stubs.c wsock32.rc ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def)
+add_library(wsock32 MODULE stubs.c wsock32.rc ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def)
 set_module_type(wsock32 win32dll UNICODE)
 add_importlibs(wsock32 mswsock ws2_32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wsock32 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt
index 6c587337917..18b97c1ebfd 100644
--- a/dll/win32/wtsapi32/CMakeLists.txt
+++ b/dll/win32/wtsapi32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def)
 
-add_library(wtsapi32 SHARED ${SOURCE})
+add_library(wtsapi32 MODULE ${SOURCE})
 set_module_type(wtsapi32 win32dll)
 target_link_libraries(wtsapi32 wine)
 add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
index c5afb5a95c6..470d013c60f 100644
--- a/dll/win32/wuapi/CMakeLists.txt
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
 add_typelib(wuapi_tlb.idl)
 set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb)
 
-add_library(wuapi SHARED
+add_library(wuapi MODULE
     ${SOURCE}
     wuapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt
index 09621a84f7c..fd0b3483c7b 100644
--- a/dll/win32/xinput1_1/CMakeLists.txt
+++ b/dll/win32/xinput1_1/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     xinput1_1_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
 
-add_library(xinput1_1 SHARED ${SOURCE} version.rc)
+add_library(xinput1_1 MODULE ${SOURCE} version.rc)
 set_module_type(xinput1_1 win32dll)
 add_importlibs(xinput1_1 xinput1_3 msvcrt kernel32)
 add_cd_file(TARGET xinput1_1 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt
index b0cbdcb4157..20ad05be6e4 100644
--- a/dll/win32/xinput1_2/CMakeLists.txt
+++ b/dll/win32/xinput1_2/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     xinput1_2_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
 
-add_library(xinput1_2 SHARED ${SOURCE} version.rc)
+add_library(xinput1_2 MODULE ${SOURCE} version.rc)
 set_module_type(xinput1_2 win32dll)
 add_importlibs(xinput1_2 xinput1_3 msvcrt kernel32)
 add_cd_file(TARGET xinput1_2 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt
index ccb4f71abdb..9f0aa725502 100644
--- a/dll/win32/xinput1_3/CMakeLists.txt
+++ b/dll/win32/xinput1_3/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     xinput1_3_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def)
 
-add_library(xinput1_3 SHARED ${SOURCE} version.rc)
+add_library(xinput1_3 MODULE ${SOURCE} version.rc)
 set_module_type(xinput1_3 win32dll)
 target_link_libraries(xinput1_3 wine)
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt
index 171fc2e39c7..c41d07a46c2 100644
--- a/dll/win32/xinput9_1_0/CMakeLists.txt
+++ b/dll/win32/xinput9_1_0/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     xinput9_1_0_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
 
-add_library(xinput9_1_0 SHARED ${SOURCE} version.rc)
+add_library(xinput9_1_0 MODULE ${SOURCE} version.rc)
 set_module_type(xinput9_1_0 win32dll)
 add_importlibs(xinput9_1_0 msvcrt kernel32 xinput1_3)
 add_cd_file(TARGET xinput9_1_0 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt
index b027396d6c9..19ebd3879ef 100644
--- a/dll/win32/xmllite/CMakeLists.txt
+++ b/dll/win32/xmllite/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c)
 
-add_library(xmllite SHARED
+add_library(xmllite MODULE
     ${SOURCE}
     guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def)
diff --git a/dll/win32/xolehlp/CMakeLists.txt b/dll/win32/xolehlp/CMakeLists.txt
index 28a30d5abe6..6e0a97fcae6 100644
--- a/dll/win32/xolehlp/CMakeLists.txt
+++ b/dll/win32/xolehlp/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/xolehlp_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/xolehlp.def)
 
-add_library(xolehlp SHARED ${SOURCE})
+add_library(xolehlp MODULE ${SOURCE})
 set_module_type(xolehlp win32dll)
 target_link_libraries(xolehlp adsiid uuid wine)
 add_importlibs(xolehlp msvcrt kernel32 ntdll)
diff --git a/drivers/base/beep/CMakeLists.txt b/drivers/base/beep/CMakeLists.txt
index 371877599aa..198378b928f 100644
--- a/drivers/base/beep/CMakeLists.txt
+++ b/drivers/base/beep/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(beep SHARED beep.c beep.rc)
+add_library(beep MODULE beep.c beep.rc)
 set_module_type(beep kernelmodedriver)
 add_importlibs(beep ntoskrnl hal)
 add_cd_file(TARGET beep DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt
index 8b1321b5524..07bfa1ed90d 100644
--- a/drivers/base/bootvid/CMakeLists.txt
+++ b/drivers/base/bootvid/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 
 list(APPEND SOURCE precomp.h)
 
-add_library(bootvid SHARED
+add_library(bootvid MODULE
     ${SOURCE}
     bootvid.rc
     ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def)
diff --git a/drivers/base/condrv/CMakeLists.txt b/drivers/base/condrv/CMakeLists.txt
index d3b11790bd7..f0d8643e0d2 100644
--- a/drivers/base/condrv/CMakeLists.txt
+++ b/drivers/base/condrv/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     dispatch.c
     condrv.h)
 
-add_library(condrv SHARED
+add_library(condrv MODULE
     ${SOURCE}
     condrv.rc)
 
diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt
index 8725ed55ab0..bed4484fa1b 100644
--- a/drivers/base/kdcom/CMakeLists.txt
+++ b/drivers/base/kdcom/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     kdserial.c
     kddll.h)
 
-add_library(kdcom SHARED
+add_library(kdcom MODULE
     ${SOURCE}
     kdcom.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def)
diff --git a/drivers/base/kdgdb/CMakeLists.txt b/drivers/base/kdgdb/CMakeLists.txt
index 494429238a2..86bb0b33850 100644
--- a/drivers/base/kdgdb/CMakeLists.txt
+++ b/drivers/base/kdgdb/CMakeLists.txt
@@ -15,7 +15,7 @@ if(ARCH STREQUAL "i386")
     list(APPEND SOURCE i386_sup.c)
 endif()
 
-add_library(kdcom SHARED
+add_library(kdcom MODULE
     ${SOURCE}
     kdgdb.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def)
diff --git a/drivers/base/kdrosdbg/CMakeLists.txt b/drivers/base/kdrosdbg/CMakeLists.txt
index 5c69e731783..845aabba9a5 100644
--- a/drivers/base/kdrosdbg/CMakeLists.txt
+++ b/drivers/base/kdrosdbg/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     kdrosdbg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def)
 
-add_library(kdcom SHARED ${SOURCE})
+add_library(kdcom MODULE ${SOURCE})
 set_module_type(kdcom kerneldll ENTRYPOINT 0)
 add_importlibs(kdcom ntoskrnl hal)
 target_link_libraries(kdcom cportlib)
diff --git a/drivers/base/kdvm/CMakeLists.txt b/drivers/base/kdvm/CMakeLists.txt
index 2d2ad3359bd..e8eeae8a180 100644
--- a/drivers/base/kdvm/CMakeLists.txt
+++ b/drivers/base/kdvm/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(kdvbox.dll kdvm.spec)
 add_asm_files(kdvbox_asm kdvbox_asm.S)
 
-add_library(kdvbox SHARED
+add_library(kdvbox MODULE
     kdvm.c
     kdvbox.c
     kdvm.rc
diff --git a/drivers/base/nmidebug/CMakeLists.txt b/drivers/base/nmidebug/CMakeLists.txt
index f54fe194f75..4468c2e09d0 100644
--- a/drivers/base/nmidebug/CMakeLists.txt
+++ b/drivers/base/nmidebug/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(nmidebug SHARED nmidebug.c nmidebug.rc)
+add_library(nmidebug MODULE nmidebug.c nmidebug.rc)
 set_module_type(nmidebug kernelmodedriver)
 add_importlibs(nmidebug ntoskrnl hal)
 add_cd_file(TARGET nmidebug DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/base/null/CMakeLists.txt b/drivers/base/null/CMakeLists.txt
index 830eb4018bb..66846fa3290 100644
--- a/drivers/base/null/CMakeLists.txt
+++ b/drivers/base/null/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(null SHARED null.c null.rc)
+add_library(null MODULE null.c null.rc)
 target_link_libraries(null ${PSEH_LIB})
 set_module_type(null kernelmodedriver)
 add_importlibs(null ntoskrnl hal)
diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt
index e112069c575..d70930ff459 100644
--- a/drivers/battery/battc/CMakeLists.txt
+++ b/drivers/battery/battc/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_definitions(-D_BATTERYCLASS_)
 spec2def(battc.sys battc.spec ADD_IMPORTLIB)
 
-add_library(battc SHARED
+add_library(battc MODULE
             battc.c
             battc.rc
             ${CMAKE_CURRENT_BINARY_DIR}/battc.def)
diff --git a/drivers/bluetooth/fbtusb/CMakeLists.txt b/drivers/bluetooth/fbtusb/CMakeLists.txt
index b0e167a50e3..3ac3f8941dc 100644
--- a/drivers/bluetooth/fbtusb/CMakeLists.txt
+++ b/drivers/bluetooth/fbtusb/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     fbtusb.c
     precomp.h)
 
-add_library(fbtusb SHARED ${SOURCE} fbtusb.rc)
+add_library(fbtusb MODULE ${SOURCE} fbtusb.rc)
 
 if(NOT MSVC)
     add_target_compile_flags(fbtusb "-Wno-unused-but-set-variable")
diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt
index 0473748a4a3..c7be9f22ca3 100644
--- a/drivers/bus/acpi/CMakeLists.txt
+++ b/drivers/bus/acpi/CMakeLists.txt
@@ -197,7 +197,7 @@ list(APPEND ACPI_SOURCE
     main.c
     precomp.h)
 
-add_library(acpi SHARED ${ACPI_SOURCE})
+add_library(acpi MODULE ${ACPI_SOURCE})
 set_module_type(acpi kernelmodedriver)
 target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB})
 add_importlibs(acpi ntoskrnl hal)
diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/bus/acpi/cmbatt/CMakeLists.txt
index bf13da15940..63753425c81 100644
--- a/drivers/bus/acpi/cmbatt/CMakeLists.txt
+++ b/drivers/bus/acpi/cmbatt/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     cmbwmi.c
     cmbatt.h)
 
-add_library(cmbatt SHARED
+add_library(cmbatt MODULE
     ${SOURCE}
     guid.c
     cmbatt.rc)
diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/bus/acpi/compbatt/CMakeLists.txt
index b394648dee4..65743fce00c 100644
--- a/drivers/bus/acpi/compbatt/CMakeLists.txt
+++ b/drivers/bus/acpi/compbatt/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     comppnp.c
     compbatt.h)
 
-add_library(compbatt SHARED
+add_library(compbatt MODULE
     ${SOURCE}
     guid.c
     compbatt.rc)
diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt
index 8646764f92a..0d91dbf2691 100644
--- a/drivers/bus/isapnp/CMakeLists.txt
+++ b/drivers/bus/isapnp/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     hardware.c
     isapnp.h)
 
-add_library(isapnp SHARED ${SOURCE} isapnp.rc)
+add_library(isapnp MODULE ${SOURCE} isapnp.rc)
 set_module_type(isapnp kernelmodedriver)
 add_importlibs(isapnp ntoskrnl hal)
 add_pch(isapnp isapnp.h SOURCE)
diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt
index 79125d89b21..5bd36b7bb7c 100644
--- a/drivers/bus/pci/CMakeLists.txt
+++ b/drivers/bus/pci/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     pdo.c
     pci.h)
 
-add_library(pci SHARED ${SOURCE} pci.rc)
+add_library(pci MODULE ${SOURCE} pci.rc)
 set_module_type(pci kernelmodedriver)
 add_importlibs(pci ntoskrnl hal)
 add_pch(pci pci.h SOURCE)
diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt
index d17325c2ad1..3bd5089972d 100644
--- a/drivers/bus/pcix/CMakeLists.txt
+++ b/drivers/bus/pcix/CMakeLists.txt
@@ -35,7 +35,7 @@ list(APPEND SOURCE
     utils.c
     pci.h)
 
-add_library(pcix SHARED
+add_library(pcix MODULE
     ${SOURCE}
     guid.c
     pci.rc)
diff --git a/drivers/bus/pcmcia/CMakeLists.txt b/drivers/bus/pcmcia/CMakeLists.txt
index 6a7f6fb3d37..cb0ac207ca5 100644
--- a/drivers/bus/pcmcia/CMakeLists.txt
+++ b/drivers/bus/pcmcia/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     pdo.c
     pcmcia.h)
 
-add_library(pcmcia SHARED ${SOURCE} pcmcia.rc)
+add_library(pcmcia MODULE ${SOURCE} pcmcia.rc)
 set_module_type(pcmcia kernelmodedriver)
 add_pch(pcmcia pcmcia.h SOURCE)
 add_importlibs(pcmcia ntoskrnl hal)
diff --git a/drivers/crypto/ksecdd/CMakeLists.txt b/drivers/crypto/ksecdd/CMakeLists.txt
index 35092e8d4a8..77ed0e4d9dc 100644
--- a/drivers/crypto/ksecdd/CMakeLists.txt
+++ b/drivers/crypto/ksecdd/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     ksecdd.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ksecdd.def)
 
-add_library(ksecdd SHARED ${SOURCE})
+add_library(ksecdd MODULE ${SOURCE})
 target_link_libraries(ksecdd cryptlib pseh)
 set_module_type(ksecdd kernelmodedriver)
 add_importlibs(ksecdd ntoskrnl hal)
diff --git a/drivers/filesystems/btrfs/CMakeLists.txt b/drivers/filesystems/btrfs/CMakeLists.txt
index 7a8806c23a7..cd4c76e3501 100644
--- a/drivers/filesystems/btrfs/CMakeLists.txt
+++ b/drivers/filesystems/btrfs/CMakeLists.txt
@@ -51,7 +51,7 @@ list(APPEND SOURCE
     zstd/zstd_opt.c
     btrfs_drv.h)
 
-add_library(btrfs SHARED ${SOURCE} btrfs.rc)
+add_library(btrfs MODULE ${SOURCE} btrfs.rc)
 
 add_definitions(-D__KERNEL__)
 set_module_type(btrfs kernelmodedriver)
diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt
index 8bf4fa2639d..2f1d4526c3e 100644
--- a/drivers/filesystems/cdfs/CMakeLists.txt
+++ b/drivers/filesystems/cdfs/CMakeLists.txt
@@ -32,7 +32,7 @@ list(APPEND SOURCE
     workque.c
     write.c)
 
-add_library(cdfs SHARED ${SOURCE} cdfs.rc)
+add_library(cdfs MODULE ${SOURCE} cdfs.rc)
 set_module_type(cdfs kernelmodedriver)
 target_link_libraries(cdfs ${PSEH_LIB} memcmp)
 add_importlibs(cdfs ntoskrnl hal)
diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt
index 864962d9ecc..62541e1c345 100644
--- a/drivers/filesystems/ext2/CMakeLists.txt
+++ b/drivers/filesystems/ext2/CMakeLists.txt
@@ -86,7 +86,7 @@ list(APPEND SOURCE
     src/write.c
     inc/ext2fs.h)
 
-add_library(ext2fs SHARED ${SOURCE} ext2fs.rc)
+add_library(ext2fs MODULE ${SOURCE} ext2fs.rc)
 
 if(USE_CLANG_CL)
     set_property(SOURCE src/create.c src/fileinfo.c src/memory.c src/read.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback")
diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt
index cc69334b01d..123845f813d 100644
--- a/drivers/filesystems/fastfat/CMakeLists.txt
+++ b/drivers/filesystems/fastfat/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND SOURCE
     volume.c
     vfat.h)
 
-add_library(fastfat SHARED ${SOURCE} vfatfs.rc)
+add_library(fastfat MODULE ${SOURCE} vfatfs.rc)
 set_module_type(fastfat kernelmodedriver)
 target_link_libraries(fastfat ${PSEH_LIB})
 add_importlibs(fastfat ntoskrnl hal)
diff --git a/drivers/filesystems/fastfat_new/CMakeLists.txt b/drivers/filesystems/fastfat_new/CMakeLists.txt
index 1c254a1f4c3..7abdce95302 100644
--- a/drivers/filesystems/fastfat_new/CMakeLists.txt
+++ b/drivers/filesystems/fastfat_new/CMakeLists.txt
@@ -35,7 +35,7 @@ list(APPEND SOURCE
     write.c
     fatprocs.h)
 
-add_library(fastfat SHARED ${SOURCE} fastfat.rc)
+add_library(fastfat MODULE ${SOURCE} fastfat.rc)
 set_module_type(fastfat kernelmodedriver)
 target_link_libraries(fastfat ${PSEH_LIB} memcmp)
 add_importlibs(fastfat ntoskrnl hal)
diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt
index 6f371875b2d..3f0b56d9423 100644
--- a/drivers/filesystems/ffs/CMakeLists.txt
+++ b/drivers/filesystems/ffs/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SOURCE
     src/write.c
     inc/ffsdrv.h)
 
-add_library(ffs SHARED ${SOURCE} src/ffsdrv.rc)
+add_library(ffs MODULE ${SOURCE} src/ffsdrv.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
     add_target_compile_flags(ffs "-Wno-pointer-sign -Wno-unused-function")
diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt
index 81394b599ce..2d309ef7447 100644
--- a/drivers/filesystems/fs_rec/CMakeLists.txt
+++ b/drivers/filesystems/fs_rec/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     udfs.c
     fs_rec.h)
 
-add_library(fs_rec SHARED ${SOURCE} fs_rec.rc)
+add_library(fs_rec MODULE ${SOURCE} fs_rec.rc)
 set_module_type(fs_rec kernelmodedriver)
 add_importlibs(fs_rec ntoskrnl hal)
 add_pch(fs_rec fs_rec.h SOURCE)
diff --git a/drivers/filesystems/msfs/CMakeLists.txt b/drivers/filesystems/msfs/CMakeLists.txt
index 1b153becf1e..79e3285a2f7 100644
--- a/drivers/filesystems/msfs/CMakeLists.txt
+++ b/drivers/filesystems/msfs/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     rw.c
     msfs.h)
 
-add_library(msfs SHARED ${SOURCE} msfs.rc)
+add_library(msfs MODULE ${SOURCE} msfs.rc)
 set_module_type(msfs kernelmodedriver)
 add_importlibs(msfs ntoskrnl hal)
 add_pch(msfs msfs.h SOURCE)
diff --git a/drivers/filesystems/mup/CMakeLists.txt b/drivers/filesystems/mup/CMakeLists.txt
index f47a0663023..8ffe777b6b8 100644
--- a/drivers/filesystems/mup/CMakeLists.txt
+++ b/drivers/filesystems/mup/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
      dfs.h
      mup.h)
 
-add_library(mup SHARED ${SOURCE} mup.rc)
+add_library(mup MODULE ${SOURCE} mup.rc)
 set_module_type(mup kernelmodedriver)
 target_link_libraries(mup ${PSEH_LIB})
 add_importlibs(mup ntoskrnl hal)
diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt
index 88f7fd71398..455d30127ec 100644
--- a/drivers/filesystems/nfs/CMakeLists.txt
+++ b/drivers/filesystems/nfs/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
 
 add_definitions(-DRDBSS_TRACKER)
 
-add_library(nfs41_driver SHARED ${SOURCE} nfs.rc)
+add_library(nfs41_driver MODULE ${SOURCE} nfs.rc)
 set_module_type(nfs41_driver kernelmodedriver)
 target_link_libraries(nfs41_driver ntoskrnl_vista rdbsslib rxce copysup memcmp ${PSEH_LIB})
 add_importlibs(nfs41_driver ntoskrnl hal)
diff --git a/drivers/filesystems/npfs/CMakeLists.txt b/drivers/filesystems/npfs/CMakeLists.txt
index ee22a31208f..43bcd84081c 100644
--- a/drivers/filesystems/npfs/CMakeLists.txt
+++ b/drivers/filesystems/npfs/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     writesup.c
     npfs.h)
 
-add_library(npfs SHARED ${SOURCE} npfs.rc)
+add_library(npfs MODULE ${SOURCE} npfs.rc)
 set_module_type(npfs kernelmodedriver)
 target_link_libraries(npfs ${PSEH_LIB})
 add_importlibs(npfs ntoskrnl hal)
diff --git a/drivers/filesystems/ntfs/CMakeLists.txt b/drivers/filesystems/ntfs/CMakeLists.txt
index 5a193b449dd..ac663538fbe 100644
--- a/drivers/filesystems/ntfs/CMakeLists.txt
+++ b/drivers/filesystems/ntfs/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND SOURCE
     volinfo.c
     ntfs.h)
 
-add_library(ntfs SHARED ${SOURCE} ntfs.rc)
+add_library(ntfs MODULE ${SOURCE} ntfs.rc)
 set_module_type(ntfs kernelmodedriver)
 target_link_libraries(ntfs ${PSEH_LIB})
 add_importlibs(ntfs ntoskrnl hal)
diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt
index 9bbfe3775df..60429d98127 100644
--- a/drivers/filesystems/reiserfs/CMakeLists.txt
+++ b/drivers/filesystems/reiserfs/CMakeLists.txt
@@ -76,7 +76,7 @@ list(APPEND SOURCE
     src/write.c
     inc/rfsd.h)
 
-add_library(reiserfs SHARED ${SOURCE} src/rfsd.rc)
+add_library(reiserfs MODULE ${SOURCE} src/rfsd.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
     add_target_compile_flags(reiserfs "-Wno-missing-braces -Wno-pointer-sign")
diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt
index 8bb85aa627b..66ce8d5ec4c 100644
--- a/drivers/filesystems/udfs/CMakeLists.txt
+++ b/drivers/filesystems/udfs/CMakeLists.txt
@@ -41,7 +41,7 @@ list(APPEND SOURCE
     write.cpp
     udffs.h)
 
-add_library(udfs SHARED ${SOURCE} udffs.rc)
+add_library(udfs MODULE ${SOURCE} udffs.rc)
 
 if(MSVC)
     # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this.
diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt
index 85199741d2c..92f86b20608 100644
--- a/drivers/filters/fltmgr/CMakeLists.txt
+++ b/drivers/filters/fltmgr/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     Volume.c
     fltmgr.h)
 
-add_library(fltmgr SHARED
+add_library(fltmgr MODULE
     ${SOURCE}
     fltmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def)
diff --git a/drivers/filters/mountmgr/CMakeLists.txt b/drivers/filters/mountmgr/CMakeLists.txt
index c1732e6fc43..d30f5c60662 100644
--- a/drivers/filters/mountmgr/CMakeLists.txt
+++ b/drivers/filters/mountmgr/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     uniqueid.c
     mntmgr.h)
 
-add_library(mountmgr SHARED ${SOURCE} mountmgr.rc)
+add_library(mountmgr MODULE ${SOURCE} mountmgr.rc)
 target_link_libraries(mountmgr wdmguid ioevent memcmp)
 set_module_type(mountmgr kernelmodedriver)
 add_importlibs(mountmgr ntoskrnl hal)
diff --git a/drivers/hid/hidclass/CMakeLists.txt b/drivers/hid/hidclass/CMakeLists.txt
index a9e53004aba..f81954eca00 100644
--- a/drivers/hid/hidclass/CMakeLists.txt
+++ b/drivers/hid/hidclass/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     pdo.c
     precomp.h)
 
-add_library(hidclass SHARED
+add_library(hidclass MODULE
     ${SOURCE}
     guid.c
     hidclass.rc
diff --git a/drivers/hid/hidparse/CMakeLists.txt b/drivers/hid/hidparse/CMakeLists.txt
index c4ff3b1216c..57cabdbb3ca 100644
--- a/drivers/hid/hidparse/CMakeLists.txt
+++ b/drivers/hid/hidparse/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/hidparser)
 
 
-add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def)
+add_library(hidparse MODULE hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def)
 set_module_type(hidparse kernelmodedriver)
 add_importlibs(hidparse ntoskrnl)
 target_link_libraries(hidparse hidparser)
diff --git a/drivers/hid/hidusb/CMakeLists.txt b/drivers/hid/hidusb/CMakeLists.txt
index 9ec04ea5f91..b5dda800479 100644
--- a/drivers/hid/hidusb/CMakeLists.txt
+++ b/drivers/hid/hidusb/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND SOURCE
     hidusb.c
     hidusb.rc)
 
-add_library(hidusb SHARED ${SOURCE})
+add_library(hidusb MODULE ${SOURCE})
 set_module_type(hidusb kernelmodedriver)
 add_importlibs(hidusb hidclass ntoskrnl usbd hal)
 add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/hid/kbdhid/CMakeLists.txt b/drivers/hid/kbdhid/CMakeLists.txt
index 7a5f48e1340..a019a6ea730 100644
--- a/drivers/hid/kbdhid/CMakeLists.txt
+++ b/drivers/hid/kbdhid/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(-DDEBUG_MODE)
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
-add_library(kbdhid SHARED kbdhid.c kbdhid.rc)
+add_library(kbdhid MODULE kbdhid.c kbdhid.rc)
 set_module_type(kbdhid kernelmodedriver)
 add_importlibs(kbdhid ntoskrnl hal hidparse)
 add_cd_file(TARGET kbdhid DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/hid/mouhid/CMakeLists.txt b/drivers/hid/mouhid/CMakeLists.txt
index 6a7e7349fb3..1350ca1c863 100644
--- a/drivers/hid/mouhid/CMakeLists.txt
+++ b/drivers/hid/mouhid/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(-DDEBUG_MODE)
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
-add_library(mouhid SHARED mouhid.c mouhid.rc)
+add_library(mouhid MODULE mouhid.c mouhid.rc)
 set_module_type(mouhid kernelmodedriver)
 add_importlibs(mouhid ntoskrnl hal hidparse)
 add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt
index 808367f0690..b16547b72a6 100644
--- a/drivers/input/i8042prt/CMakeLists.txt
+++ b/drivers/input/i8042prt/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     registry.c
     i8042prt.h)
 
-add_library(i8042prt SHARED
+add_library(i8042prt MODULE
     ${SOURCE}
     guid.c
     i8042prt.rc)
diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt
index 326915a6c2c..fc3169d4360 100644
--- a/drivers/input/kbdclass/CMakeLists.txt
+++ b/drivers/input/kbdclass/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND SOURCE
     misc.c
     kbdclass.h)
 
-add_library(kbdclass SHARED
+add_library(kbdclass MODULE
     ${SOURCE}
     guid.c
     kbdclass.rc)
diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt
index bf7714dfdf4..9a060d1cae4 100644
--- a/drivers/input/mouclass/CMakeLists.txt
+++ b/drivers/input/mouclass/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND SOURCE
     mouclass.c
     mouclass.h)
 
-add_library(mouclass SHARED
+add_library(mouclass MODULE
     ${SOURCE}
     guid.c
     mouclass.rc)
diff --git a/drivers/input/sermouse/CMakeLists.txt b/drivers/input/sermouse/CMakeLists.txt
index b2cd5da6a39..93a857fcc8e 100644
--- a/drivers/input/sermouse/CMakeLists.txt
+++ b/drivers/input/sermouse/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     sermouse.c
     sermouse.h)
 
-add_library(sermouse SHARED ${SOURCE} sermouse.rc)
+add_library(sermouse MODULE ${SOURCE} sermouse.rc)
 set_module_type(sermouse kernelmodedriver)
 add_pch(sermouse sermouse.h SOURCE)
 add_importlibs(sermouse ntoskrnl hal)
diff --git a/drivers/ksfilter/ks/CMakeLists.txt b/drivers/ksfilter/ks/CMakeLists.txt
index 7a79f9f678a..b4d24330166 100644
--- a/drivers/ksfilter/ks/CMakeLists.txt
+++ b/drivers/ksfilter/ks/CMakeLists.txt
@@ -34,7 +34,7 @@ if(MSVC)
     add_asm_files(ks_asm msvc.S)
 endif()
 
-add_library(ks SHARED
+add_library(ks MODULE
     ${SOURCE}
     ${ks_asm}
     ks.rc
diff --git a/drivers/ksfilter/swenum/CMakeLists.txt b/drivers/ksfilter/swenum/CMakeLists.txt
index c5f22cf902e..dfcbe869748 100644
--- a/drivers/ksfilter/swenum/CMakeLists.txt
+++ b/drivers/ksfilter/swenum/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(swenum SHARED swenum.c swenum.rc)
+add_library(swenum MODULE swenum.c swenum.rc)
 set_module_type(swenum kernelmodedriver)
 add_importlibs(swenum ks ntoskrnl hal)
 add_cd_file(TARGET swenum DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/multimedia/bdasup/CMakeLists.txt b/drivers/multimedia/bdasup/CMakeLists.txt
index 868e6610008..598084a9e82 100644
--- a/drivers/multimedia/bdasup/CMakeLists.txt
+++ b/drivers/multimedia/bdasup/CMakeLists.txt
@@ -1,6 +1,6 @@
 spec2def(bdasup.sys bdasup.spec ADD_IMPORTLIB)
 
-add_library(bdasup SHARED
+add_library(bdasup MODULE
             bdasup.c
             ${CMAKE_CURRENT_BINARY_DIR}/bdasup.def)
 
diff --git a/drivers/network/afd/CMakeLists.txt b/drivers/network/afd/CMakeLists.txt
index 623f07f9ce1..5ab16b12f3a 100644
--- a/drivers/network/afd/CMakeLists.txt
+++ b/drivers/network/afd/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     afd/write.c
     include/afd.h)
 
-add_library(afd SHARED ${SOURCE} afd.rc)
+add_library(afd MODULE ${SOURCE} afd.rc)
 target_link_libraries(afd ${PSEH_LIB})
 set_module_type(afd kernelmodedriver)
 add_importlibs(afd ntoskrnl hal)
diff --git a/drivers/network/dd/e1000/CMakeLists.txt b/drivers/network/dd/e1000/CMakeLists.txt
index 591f01d796c..2e0bf13a7e0 100644
--- a/drivers/network/dd/e1000/CMakeLists.txt
+++ b/drivers/network/dd/e1000/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     debug.c
     debug.h)
 
-add_library(e1000 SHARED ${SOURCE} e1000.rc)
+add_library(e1000 MODULE ${SOURCE} e1000.rc)
 add_pch(e1000 nic.h SOURCE)
 set_module_type(e1000 kernelmodedriver)
 add_importlibs(e1000 ndis ntoskrnl hal)
diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt
index f11974f37c9..7e720aaa2c3 100644
--- a/drivers/network/dd/ne2000/CMakeLists.txt
+++ b/drivers/network/dd/ne2000/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     ne2000/main.c
     include/ne2000.h)
 
-add_library(ne2000 SHARED ${SOURCE} ne2000.rc)
+add_library(ne2000 MODULE ${SOURCE} ne2000.rc)
 add_pch(ne2000 include/ne2000.h SOURCE)
 set_module_type(ne2000 kernelmodedriver)
 add_importlibs(ne2000 ndis ntoskrnl hal)
diff --git a/drivers/network/dd/pcnet/CMakeLists.txt b/drivers/network/dd/pcnet/CMakeLists.txt
index 0e78bf34e4a..34e58268e21 100644
--- a/drivers/network/dd/pcnet/CMakeLists.txt
+++ b/drivers/network/dd/pcnet/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     requests.c
     pcnet.h)
 
-add_library(pcnet SHARED ${SOURCE} pcnet.rc)
+add_library(pcnet MODULE ${SOURCE} pcnet.rc)
 add_pch(pcnet pcnet.h SOURCE)
 set_module_type(pcnet kernelmodedriver)
 add_importlibs(pcnet ndis ntoskrnl hal)
diff --git a/drivers/network/dd/rtl8139/CMakeLists.txt b/drivers/network/dd/rtl8139/CMakeLists.txt
index 9a6a975621d..59ad7fc55e2 100644
--- a/drivers/network/dd/rtl8139/CMakeLists.txt
+++ b/drivers/network/dd/rtl8139/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     interrupt.c
     nic.h)
 
-add_library(rtl8139 SHARED ${SOURCE} rtl8139.rc)
+add_library(rtl8139 MODULE ${SOURCE} rtl8139.rc)
 add_pch(rtl8139 nic.h SOURCE)
 set_module_type(rtl8139 kernelmodedriver)
 add_importlibs(rtl8139 ndis ntoskrnl hal)
diff --git a/drivers/network/ndis/CMakeLists.txt b/drivers/network/ndis/CMakeLists.txt
index f338362d125..e3ca48807c5 100644
--- a/drivers/network/ndis/CMakeLists.txt
+++ b/drivers/network/ndis/CMakeLists.txt
@@ -33,7 +33,7 @@ list(APPEND SOURCE
     ndis/time.c
     include/ndissys.h)
 
-add_library(ndis SHARED
+add_library(ndis MODULE
     ${SOURCE}
     ndis.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ndis.def)
diff --git a/drivers/network/ndisuio/CMakeLists.txt b/drivers/network/ndisuio/CMakeLists.txt
index 7f847167b6f..2da825b3dd7 100644
--- a/drivers/network/ndisuio/CMakeLists.txt
+++ b/drivers/network/ndisuio/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     readwrite.c
     ndisuio.h)
 
-add_library(ndisuio SHARED ${SOURCE} ndisuio.rc)
+add_library(ndisuio MODULE ${SOURCE} ndisuio.rc)
 set_module_type(ndisuio kernelmodedriver)
 add_importlibs(ndisuio ndis ntoskrnl hal)
 add_pch(ndisuio ndisuio.h SOURCE)
diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt
index 756ffe7b6ee..0dd5a5271e0 100644
--- a/drivers/network/tcpip/CMakeLists.txt
+++ b/drivers/network/tcpip/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND SOURCE
     tcpip/wait.c
     include/precomp.h)
 
-add_library(tcpip SHARED
+add_library(tcpip MODULE
     ${SOURCE}
     tcpip.rc
     ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def)
diff --git a/drivers/network/tdi/CMakeLists.txt b/drivers/network/tdi/CMakeLists.txt
index 2ec7a04f520..b10ff4288e5 100644
--- a/drivers/network/tdi/CMakeLists.txt
+++ b/drivers/network/tdi/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
     tdi/stubs.c
     precomp.h)
 
-add_library(tdi SHARED
+add_library(tdi MODULE
     ${SOURCE}
     misc/tdi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/tdi.def)
diff --git a/drivers/parallel/parallel/CMakeLists.txt b/drivers/parallel/parallel/CMakeLists.txt
index e263fa16718..be90817b229 100644
--- a/drivers/parallel/parallel/CMakeLists.txt
+++ b/drivers/parallel/parallel/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-add_library(parallel SHARED parallel.c parallel.rc)
+add_library(parallel MODULE parallel.c parallel.rc)
 set_module_type(parallel kernelmodedriver)
 add_importlibs(parallel ntoskrnl hal)
diff --git a/drivers/parallel/parport/CMakeLists.txt b/drivers/parallel/parport/CMakeLists.txt
index 1b7b926b673..51d9e895772 100644
--- a/drivers/parallel/parport/CMakeLists.txt
+++ b/drivers/parallel/parport/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     parport.c
     parport.h)
 
-add_library(parport SHARED
+add_library(parport MODULE
     ${SOURCE}
     parport.rc)
 
diff --git a/drivers/processor/processr/CMakeLists.txt b/drivers/processor/processr/CMakeLists.txt
index e034231b056..9bbd366fa31 100644
--- a/drivers/processor/processr/CMakeLists.txt
+++ b/drivers/processor/processr/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     pnp.c
     processr.h)
 
-add_library(processr SHARED ${SOURCE} processr.rc)
+add_library(processr MODULE ${SOURCE} processr.rc)
 set_module_type(processr kernelmodedriver)
 add_importlibs(processr hal ntoskrnl)
 add_pch(processr processr.h SOURCE)
diff --git a/drivers/sac/driver/CMakeLists.txt b/drivers/sac/driver/CMakeLists.txt
index 3705134d37d..cf0eba8224c 100644
--- a/drivers/sac/driver/CMakeLists.txt
+++ b/drivers/sac/driver/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     vtutf8chan.c
     sacdrv.h)
 
-add_library(sacdrv SHARED ${SOURCE} sacdrv.rc)
+add_library(sacdrv MODULE ${SOURCE} sacdrv.rc)
 set_module_type(sacdrv kernelmodedriver)
 add_importlibs(sacdrv ntoskrnl hal)
 add_dependencies(sacdrv sacmsg)
diff --git a/drivers/serial/serenum/CMakeLists.txt b/drivers/serial/serenum/CMakeLists.txt
index edb57386ee2..4cef8e49ba2 100644
--- a/drivers/serial/serenum/CMakeLists.txt
+++ b/drivers/serial/serenum/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     serenum.c
     serenum.h)
 
-add_library(serenum SHARED
+add_library(serenum MODULE
     ${SOURCE}
     guid.c
     serenum.rc)
diff --git a/drivers/serial/serial/CMakeLists.txt b/drivers/serial/serial/CMakeLists.txt
index b423855f7de..257ad8469fe 100644
--- a/drivers/serial/serial/CMakeLists.txt
+++ b/drivers/serial/serial/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     serial.c
     serial.h)
 
-add_library(serial SHARED
+add_library(serial MODULE
     ${SOURCE}
     guid.c
     serial.rc)
diff --git a/drivers/setup/blue/CMakeLists.txt b/drivers/setup/blue/CMakeLists.txt
index 47710661034..8fde5d80256 100644
--- a/drivers/setup/blue/CMakeLists.txt
+++ b/drivers/setup/blue/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     font.c
     blue.h)
 
-add_library(blue SHARED ${SOURCE} blue.rc)
+add_library(blue MODULE ${SOURCE} blue.rc)
 set_module_type(blue kernelmodedriver)
 add_importlibs(blue ntoskrnl hal)
 add_pch(blue blue.h SOURCE)
diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt
index cd2a01bca63..c764fdfc07c 100644
--- a/drivers/storage/class/cdrom/CMakeLists.txt
+++ b/drivers/storage/class/cdrom/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     findscsi.c
     precomp.h)
 
-add_library(cdrom SHARED ${SOURCE} cdrom.rc)
+add_library(cdrom MODULE ${SOURCE} cdrom.rc)
 set_module_type(cdrom kernelmodedriver)
 add_importlibs(cdrom class2 scsiport ntoskrnl hal)
 add_pch(cdrom precomp.h SOURCE)
diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt b/drivers/storage/class/cdrom_new/CMakeLists.txt
index 35c5b14ca5a..34171764575 100644
--- a/drivers/storage/class/cdrom_new/CMakeLists.txt
+++ b/drivers/storage/class/cdrom_new/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     sec.c
     cdrom.h)
 
-add_library(cdrom_new SHARED ${SOURCE})
+add_library(cdrom_new MODULE ${SOURCE})
 target_link_libraries(cdrom_new libcntpr wdmguid)
 
 if(USE_CLANG_CL OR (NOT MSVC))
diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt
index fa298def3b4..c1a33a04644 100644
--- a/drivers/storage/class/class2/CMakeLists.txt
+++ b/drivers/storage/class/class2/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     class2.rc
     ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
 
-add_library(class2 SHARED ${SOURCE})
+add_library(class2 MODULE ${SOURCE})
 set_module_type(class2 kernelmodedriver)
 add_importlibs(class2 scsiport ntoskrnl hal)
 add_cd_file(TARGET class2 DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt
index 0f33c2bc883..70fdda9fb8d 100644
--- a/drivers/storage/class/disk/CMakeLists.txt
+++ b/drivers/storage/class/disk/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 include_directories(..)
-add_library(disk SHARED disk.c disk.rc)
+add_library(disk MODULE disk.c disk.rc)
 set_module_type(disk kernelmodedriver)
 add_importlibs(disk class2 scsiport ntoskrnl hal)
 add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt
index df08fa82084..82136b8f02a 100644
--- a/drivers/storage/class/disk_new/CMakeLists.txt
+++ b/drivers/storage/class/disk_new/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     pnp.c
     disk.h)
 
-add_library(disk_new SHARED ${SOURCE} disk.rc)
+add_library(disk_new MODULE ${SOURCE} disk.rc)
 target_link_libraries(disk_new libcntpr wdmguid)
 
 if(USE_CLANG_CL OR (NOT MSVC))
diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt
index aac700cbbff..aa068bc7a18 100644
--- a/drivers/storage/class/ramdisk/CMakeLists.txt
+++ b/drivers/storage/class/ramdisk/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 include_directories(..)
-add_library(ramdisk SHARED ramdisk.c ramdisk.rc)
+add_library(ramdisk MODULE ramdisk.c ramdisk.rc)
 set_module_type(ramdisk kernelmodedriver)
 add_importlibs(ramdisk ntoskrnl hal)
 add_cd_file(TARGET ramdisk DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/classpnp/CMakeLists.txt
index a5df7f68c74..c5f576fbd2c 100644
--- a/drivers/storage/classpnp/CMakeLists.txt
+++ b/drivers/storage/classpnp/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND SOURCE
     xferpkt.c
     classp.h)
 
-add_library(classpnp SHARED
+add_library(classpnp MODULE
     ${SOURCE}
     guid.c
     class.rc
diff --git a/drivers/storage/fdc/fdc/CMakeLists.txt b/drivers/storage/fdc/fdc/CMakeLists.txt
index 0871c0eeb61..a9c6211e912 100644
--- a/drivers/storage/fdc/fdc/CMakeLists.txt
+++ b/drivers/storage/fdc/fdc/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     pdo.c
     fdc.h)
 
-add_library(fdc SHARED ${SOURCE} fdc.rc)
+add_library(fdc MODULE ${SOURCE} fdc.rc)
 set_module_type(fdc kernelmodedriver)
 add_importlibs(fdc hal ntoskrnl)
 add_pch(fdc fdc.h SOURCE)
diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt
index 2c4d798df07..c1dd6a29dc7 100644
--- a/drivers/storage/floppy/CMakeLists.txt
+++ b/drivers/storage/floppy/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     readwrite.c
     precomp.h)
 
-add_library(floppy SHARED ${SOURCE} floppy.rc)
+add_library(floppy MODULE ${SOURCE} floppy.rc)
 target_link_libraries(floppy csq)
 add_pch(floppy precomp.h SOURCE)
 set_module_type(floppy kernelmodedriver)
diff --git a/drivers/storage/floppy_new/CMakeLists.txt b/drivers/storage/floppy_new/CMakeLists.txt
index 154e553c326..f52dba85b1a 100644
--- a/drivers/storage/floppy_new/CMakeLists.txt
+++ b/drivers/storage/floppy_new/CMakeLists.txt
@@ -2,7 +2,7 @@ list(APPEND SOURCE
     guid.c
     floppy.c)
 
-add_library(floppy SHARED ${SOURCE} floppy.rc)
+add_library(floppy MODULE ${SOURCE} floppy.rc)
 set_module_type(floppy kernelmodedriver)
 add_importlibs(floppy classpnp hal ntoskrnl)
 add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt
index 0e1902a09f4..5ab339c5299 100644
--- a/drivers/storage/ide/atapi/CMakeLists.txt
+++ b/drivers/storage/ide/atapi/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(atapi SHARED atapi.c atapi.rc)
+add_library(atapi MODULE atapi.c atapi.rc)
 target_link_libraries(atapi libcntpr)
 set_module_type(atapi kernelmodedriver)
 add_importlibs(atapi scsiport)
diff --git a/drivers/storage/ide/pciide/CMakeLists.txt b/drivers/storage/ide/pciide/CMakeLists.txt
index ebbe776f268..a0eab2c2069 100644
--- a/drivers/storage/ide/pciide/CMakeLists.txt
+++ b/drivers/storage/ide/pciide/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(pciide SHARED pciide.c pciide.rc)
+add_library(pciide MODULE pciide.c pciide.rc)
 set_module_type(pciide kernelmodedriver)
 add_importlibs(pciide pciidex ntoskrnl)
 add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt
index c31405b78a0..d8d1daa4f5f 100644
--- a/drivers/storage/ide/pciidex/CMakeLists.txt
+++ b/drivers/storage/ide/pciidex/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     pdo.c
     pciidex.h)
 
-add_library(pciidex SHARED
+add_library(pciidex MODULE
     ${SOURCE}
     pciidex.rc
     ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def)
diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt
index c7ffa34f43b..72e729ff506 100644
--- a/drivers/storage/ide/uniata/CMakeLists.txt
+++ b/drivers/storage/ide/uniata/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND SOURCE
     ros_glue/ros_glue.cpp
     stdafx.h)
 
-add_library(uniata SHARED ${SOURCE} idedma.rc)
+add_library(uniata MODULE ${SOURCE} idedma.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
     add_target_compile_flags(uniata "-Wno-narrowing")
diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt
index 7865fa4514c..b31178a6455 100644
--- a/drivers/storage/port/buslogic/CMakeLists.txt
+++ b/drivers/storage/port/buslogic/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(buslogic SHARED BusLogic958.c BusLogic958.rc)
+add_library(buslogic MODULE BusLogic958.c BusLogic958.rc)
 target_link_libraries(buslogic libcntpr)
 set_module_type(buslogic kernelmodedriver)
 add_importlibs(buslogic scsiport)
diff --git a/drivers/storage/port/storport/CMakeLists.txt b/drivers/storage/port/storport/CMakeLists.txt
index 25b35a555d0..7931a526de9 100644
--- a/drivers/storage/port/storport/CMakeLists.txt
+++ b/drivers/storage/port/storport/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     stubs.c
     precomp.h)
 
-add_library(storport SHARED
+add_library(storport MODULE
     ${SOURCE}
     guid.c
     storport.rc
diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt
index 339e84faeac..0fa44c3f0b1 100644
--- a/drivers/storage/scsiport/CMakeLists.txt
+++ b/drivers/storage/scsiport/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     stubs.c
     precomp.h)
 
-add_library(scsiport SHARED
+add_library(scsiport MODULE
     ${SOURCE}
     scsiport.rc
     ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def)
diff --git a/drivers/storage/storahci/CMakeLists.txt b/drivers/storage/storahci/CMakeLists.txt
index 039ed8d0c4e..343f096d1d4 100644
--- a/drivers/storage/storahci/CMakeLists.txt
+++ b/drivers/storage/storahci/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-DDEBUG)
 list(APPEND SOURCE
     storahci.c)
 
-add_library(storahci SHARED ${SOURCE} storahci.rc)
+add_library(storahci MODULE ${SOURCE} storahci.rc)
 
 set_module_type(storahci kernelmodedriver)
 add_importlibs(storahci storport ntoskrnl hal)
diff --git a/drivers/usb/usbaudio/CMakeLists.txt b/drivers/usb/usbaudio/CMakeLists.txt
index 9aaf4abb21a..2262caa6066 100644
--- a/drivers/usb/usbaudio/CMakeLists.txt
+++ b/drivers/usb/usbaudio/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     pin.c
     guid.c)
 
-add_library(usbaudio SHARED
+add_library(usbaudio MODULE
     ${SOURCE}
     usbaudio.rc)
 
diff --git a/drivers/usb/usbccgp/CMakeLists.txt b/drivers/usb/usbccgp/CMakeLists.txt
index 92a8ae0a7cf..30e2089e957 100644
--- a/drivers/usb/usbccgp/CMakeLists.txt
+++ b/drivers/usb/usbccgp/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     usbccgp.c
     usbccgp.h)
 
-add_library(usbccgp SHARED
+add_library(usbccgp MODULE
     ${SOURCE}
     guid.c
     usbccgp.rc)
diff --git a/drivers/usb/usbd/CMakeLists.txt b/drivers/usb/usbd/CMakeLists.txt
index aaccade8a3b..054f7a87686 100644
--- a/drivers/usb/usbd/CMakeLists.txt
+++ b/drivers/usb/usbd/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(usbd.sys usbd.spec ADD_IMPORTLIB)
 
-add_library(usbd SHARED
+add_library(usbd MODULE
     usbd.c
     usbd.rc
     ${CMAKE_CURRENT_BINARY_DIR}/usbd.def)
diff --git a/drivers/usb/usbehci/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt
index 33498366a46..f515915899e 100644
--- a/drivers/usb/usbehci/CMakeLists.txt
+++ b/drivers/usb/usbehci/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     hardware.cpp
     usbehci.h)
 
-add_library(usbehci SHARED
+add_library(usbehci MODULE
     ${SOURCE}
     guid.cpp
     usbehci.rc)
diff --git a/drivers/usb/usbehci_new/CMakeLists.txt b/drivers/usb/usbehci_new/CMakeLists.txt
index f9105afc3ab..91222064d9f 100644
--- a/drivers/usb/usbehci_new/CMakeLists.txt
+++ b/drivers/usb/usbehci_new/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     usbehci.c
     usbehci.h)
 
-add_library(usbehci SHARED
+add_library(usbehci MODULE
     ${SOURCE}
     guid.c
     usbehci.rc)
diff --git a/drivers/usb/usbhub/CMakeLists.txt b/drivers/usb/usbhub/CMakeLists.txt
index db05f9f1cc1..d7d060c8588 100644
--- a/drivers/usb/usbhub/CMakeLists.txt
+++ b/drivers/usb/usbhub/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     usbhub.c
     usbhub.h)
 
-add_library(usbhub SHARED
+add_library(usbhub MODULE
     ${SOURCE}
     guid.c
     usbhub.rc)
diff --git a/drivers/usb/usbhub_new/CMakeLists.txt b/drivers/usb/usbhub_new/CMakeLists.txt
index a1355dfa500..35b109e19d5 100644
--- a/drivers/usb/usbhub_new/CMakeLists.txt
+++ b/drivers/usb/usbhub_new/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     usbhub.c
     usbhub.h)
 
-add_library(usbhub SHARED
+add_library(usbhub MODULE
     ${SOURCE}
     guid.c
     usbhub.rc)
diff --git a/drivers/usb/usbohci/CMakeLists.txt b/drivers/usb/usbohci/CMakeLists.txt
index 7dee1ce133a..b8586088ad2 100644
--- a/drivers/usb/usbohci/CMakeLists.txt
+++ b/drivers/usb/usbohci/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     hardware.cpp
     usbohci.h)
 
-add_library(usbohci SHARED
+add_library(usbohci MODULE
     ${SOURCE}
     guid.cpp
     usbohci.rc)
diff --git a/drivers/usb/usbohci_new/CMakeLists.txt b/drivers/usb/usbohci_new/CMakeLists.txt
index ea7634b1486..aa97c9cb864 100644
--- a/drivers/usb/usbohci_new/CMakeLists.txt
+++ b/drivers/usb/usbohci_new/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND SOURCE
     usbohci.c
     usbohci.h)
 
-add_library(usbohci SHARED
+add_library(usbohci MODULE
     ${SOURCE}
     guid.c
     usbohci.rc)
diff --git a/drivers/usb/usbport/CMakeLists.txt b/drivers/usb/usbport/CMakeLists.txt
index 6f0d1884fdd..4598381a191 100644
--- a/drivers/usb/usbport/CMakeLists.txt
+++ b/drivers/usb/usbport/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
     usbport.c
     usbport.h)
 
-add_library(usbport SHARED
+add_library(usbport MODULE
     ${SOURCE}
     guid.c
     usbport.rc
diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt
index 3bb2eed0f25..82e445f0424 100644
--- a/drivers/usb/usbstor/CMakeLists.txt
+++ b/drivers/usb/usbstor/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     usbstor.c
     usbstor.h)
 
-add_library(usbstor SHARED
+add_library(usbstor MODULE
     ${SOURCE}
     guid.c
     usbstor.rc)
diff --git a/drivers/usb/usbstor_new/CMakeLists.txt b/drivers/usb/usbstor_new/CMakeLists.txt
index 3bb2eed0f25..82e445f0424 100644
--- a/drivers/usb/usbstor_new/CMakeLists.txt
+++ b/drivers/usb/usbstor_new/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     usbstor.c
     usbstor.h)
 
-add_library(usbstor SHARED
+add_library(usbstor MODULE
     ${SOURCE}
     guid.c
     usbstor.rc)
diff --git a/drivers/usb/usbuhci/CMakeLists.txt b/drivers/usb/usbuhci/CMakeLists.txt
index 1b1d74d4f59..c288a0138ab 100644
--- a/drivers/usb/usbuhci/CMakeLists.txt
+++ b/drivers/usb/usbuhci/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     hardware.cpp
     usbuhci.h)
 
-add_library(usbuhci SHARED
+add_library(usbuhci MODULE
     ${SOURCE}
     guid.cpp
     usbuhci.rc)
diff --git a/drivers/usb/usbuhci_new/CMakeLists.txt b/drivers/usb/usbuhci_new/CMakeLists.txt
index b46c724fff5..744113fa134 100644
--- a/drivers/usb/usbuhci_new/CMakeLists.txt
+++ b/drivers/usb/usbuhci_new/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND SOURCE
     usbuhci.c
     usbuhci.h)
 
-add_library(usbuhci SHARED
+add_library(usbuhci MODULE
     ${SOURCE}
     guid.c
     usbuhci.rc)
diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
index 85660a9e334..b438197e941 100644
--- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
+++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
@@ -49,7 +49,7 @@ list(APPEND SOURCE
     version.cpp
     private.hpp)
 
-add_library(portcls SHARED
+add_library(portcls MODULE
     ${SOURCE}
     guid.cpp
     portcls.rc
diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt
index 6518ddb7caf..f992fa463e3 100644
--- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt
+++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     minwave.cpp
     precomp.h)
 
-add_library(cmipci SHARED
+add_library(cmipci MODULE
     ${SOURCE}
     guid.cpp
     cmipci.rc)
diff --git a/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt
index a781d848ba3..2ee32c73ac0 100644
--- a/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt
+++ b/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set_cpp()
 
-add_library(cmicpl SHARED
+add_library(cmicpl MODULE
     cmicpl.cpp
     cmicpl.rc)
 
diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
index a393407c729..848addc86e8 100644
--- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt
+++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     drmk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/drmk.def)
 
-add_library(drmk SHARED ${SOURCE})
+add_library(drmk MODULE ${SOURCE})
 set_module_type(drmk kernelmodedriver ENTRYPOINT 0)
 add_importlibs(drmk ntoskrnl)
 add_cd_file(TARGET drmk DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
index 26b84adfa63..6d6b8fc55fb 100644
--- a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
+++ b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     pin.c
     kmixer.h)
 
-add_library(kmixer SHARED ${SOURCE})
+add_library(kmixer MODULE ${SOURCE})
 set_module_type(kmixer kernelmodedriver)
 target_link_libraries(kmixer libcntpr libsamplerate)
 add_pch(kmixer kmixer.h SOURCE)
diff --git a/drivers/wdm/audio/hdaudbus/CMakeLists.txt b/drivers/wdm/audio/hdaudbus/CMakeLists.txt
index 1b7c02e6e70..952dd7242e8 100644
--- a/drivers/wdm/audio/hdaudbus/CMakeLists.txt
+++ b/drivers/wdm/audio/hdaudbus/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     pdo.cpp
     businterface.cpp)
 
-add_library(hdaudbus SHARED ${SOURCE})
+add_library(hdaudbus MODULE ${SOURCE})
 set_module_type(hdaudbus kernelmodedriver)
 target_link_libraries(hdaudbus libcntpr ${PSEH_LIB})
 add_importlibs(hdaudbus ntoskrnl hal)
diff --git a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
index c7948c78169..c088ebf6460 100644
--- a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
+++ b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     sup.c
     wdmaud.h)
 
-add_library(wdmaud SHARED ${SOURCE} wdmaud.rc)
+add_library(wdmaud MODULE ${SOURCE} wdmaud.rc)
 set_module_type(wdmaud kernelmodedriver)
 target_link_libraries(wdmaud mmixer libcntpr)
 add_pch(wdmaud wdmaud.h SOURCE)
diff --git a/drivers/wdm/audio/sysaudio/CMakeLists.txt b/drivers/wdm/audio/sysaudio/CMakeLists.txt
index 32931d3a20a..1ebc939a7da 100644
--- a/drivers/wdm/audio/sysaudio/CMakeLists.txt
+++ b/drivers/wdm/audio/sysaudio/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     pin.c
     sysaudio.h)
 
-add_library(sysaudio SHARED ${SOURCE} sysaudio.rc)
+add_library(sysaudio MODULE ${SOURCE} sysaudio.rc)
 set_module_type(sysaudio kernelmodedriver)
 target_link_libraries(sysaudio libcntpr)
 add_importlibs(sysaudio ntoskrnl ks hal)
diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt
index 8d6212634d4..06d49f4eb57 100644
--- a/drivers/wmi/CMakeLists.txt
+++ b/drivers/wmi/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     wmilib.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def)
 
-add_library(wmilib SHARED ${SOURCE})
+add_library(wmilib MODULE ${SOURCE})
 set_module_type(wmilib kernelmodedriver ENTRYPOINT 0)
 add_importlibs(wmilib ntoskrnl)
 add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/hal/halarm/CMakeLists.txt b/hal/halarm/CMakeLists.txt
index 90ef16416b9..6f02e5b88fd 100644
--- a/hal/halarm/CMakeLists.txt
+++ b/hal/halarm/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCES
     omap3/halinit_up.c
     omap3/halup.rc)
 
-add_library(hal SHARED
+add_library(hal MODULE
     ${SOURCES})
 
 set_module_type(hal kerneldll ENTRYPOINT 0)
diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt
index 458e5378374..831131494ec 100644
--- a/hal/halx86/CMakeLists.txt
+++ b/hal/halx86/CMakeLists.txt
@@ -18,14 +18,14 @@ function(add_hal _halname)
         foreach(_component ${_haldata_COMPONENTS})
             list(APPEND _haldata_SOURCES "$<TARGET_OBJECTS:lib_hal_${_component}>")
         endforeach()
-        add_library(${_halname} SHARED
+        add_library(${_halname} MODULE
             ${_haldata_SOURCES}
             ${CMAKE_CURRENT_BINARY_DIR}/hal.def)
     else()
         foreach(_component ${_haldata_COMPONENTS})
             list(APPEND _haldata_LIBS "lib_hal_${_component}")
         endforeach()
-        add_library(${_halname} SHARED
+        add_library(${_halname} MODULE
             ${_haldata_SOURCES}
             ${CMAKE_CURRENT_BINARY_DIR}/hal.def)
         target_link_libraries(${_halname} ${_haldata_LIBS})
diff --git a/media/themes/blackshade.msstyles/CMakeLists.txt b/media/themes/blackshade.msstyles/CMakeLists.txt
index 17cffe0279b..bf23f284874 100644
--- a/media/themes/blackshade.msstyles/CMakeLists.txt
+++ b/media/themes/blackshade.msstyles/CMakeLists.txt
@@ -18,6 +18,6 @@ foreach(_file ${TEXTFILES})
 endforeach()
 
 set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}")
-add_library(blackshade.msstyles SHARED blackshade.rc)
+add_library(blackshade.msstyles MODULE blackshade.rc)
 set_module_type(blackshade.msstyles module)
 set_target_properties(blackshade.msstyles PROPERTIES SUFFIX "")
\ No newline at end of file
diff --git a/media/themes/lautus.msstyles/CMakeLists.txt b/media/themes/lautus.msstyles/CMakeLists.txt
index 4c267de99bb..01d26935a14 100644
--- a/media/themes/lautus.msstyles/CMakeLists.txt
+++ b/media/themes/lautus.msstyles/CMakeLists.txt
@@ -18,7 +18,7 @@ foreach(_file ${TEXTFILES})
 endforeach()
 
 set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}")
-add_library(lautus.msstyles SHARED lautus.rc)
+add_library(lautus.msstyles MODULE lautus.rc)
 set_module_type(lautus.msstyles module)
 set_target_properties(lautus.msstyles PROPERTIES SUFFIX "")
 add_cd_file(TARGET lautus.msstyles DESTINATION reactos/Resources/Themes/Lautus FOR all)
diff --git a/media/themes/modern.msstyles/CMakeLists.txt b/media/themes/modern.msstyles/CMakeLists.txt
index 10587c7d96a..a7fbebb13bd 100644
--- a/media/themes/modern.msstyles/CMakeLists.txt
+++ b/media/themes/modern.msstyles/CMakeLists.txt
@@ -21,7 +21,7 @@ foreach(_file ${TEXTFILES})
 endforeach()
 
 set_source_files_properties(modern.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}")
-add_library(modern.msstyles SHARED modern.rc)
+add_library(modern.msstyles MODULE modern.rc)
 set_module_type(modern.msstyles module)
 set_target_properties(modern.msstyles PROPERTIES SUFFIX "")
 add_cd_file(TARGET modern.msstyles DESTINATION reactos/Resources/Themes/Modern FOR all)
diff --git a/modules/rosapps/applications/explorer-old/notifyhook/CMakeLists.txt b/modules/rosapps/applications/explorer-old/notifyhook/CMakeLists.txt
index 935fc1d574a..91adc0c06d3 100644
--- a/modules/rosapps/applications/explorer-old/notifyhook/CMakeLists.txt
+++ b/modules/rosapps/applications/explorer-old/notifyhook/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     notifyhook.rc
     ${CMAKE_CURRENT_BINARY_DIR}/notifyhook.def)
 
-add_library(notifyhook SHARED ${SOURCE})
+add_library(notifyhook MODULE ${SOURCE})
 
 set_module_type(notifyhook win32dll)
 
diff --git a/modules/rosapps/drivers/green/CMakeLists.txt b/modules/rosapps/drivers/green/CMakeLists.txt
index 7c76830e83a..00a6d5e2198 100644
--- a/modules/rosapps/drivers/green/CMakeLists.txt
+++ b/modules/rosapps/drivers/green/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     screen.c
     green.h)
 
-add_library(green SHARED ${SOURCE} green.rc)
+add_library(green MODULE ${SOURCE} green.rc)
 add_pch(green green.h SOURCE)
 set_module_type(green kernelmodedriver)
 add_importlibs(green ntoskrnl hal)
diff --git a/modules/rosapps/drivers/vcdrom/CMakeLists.txt b/modules/rosapps/drivers/vcdrom/CMakeLists.txt
index 01df5be03c2..56d66ce428c 100644
--- a/modules/rosapps/drivers/vcdrom/CMakeLists.txt
+++ b/modules/rosapps/drivers/vcdrom/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(vcdrom SHARED vcdrom.c vcdrom.rc)
+add_library(vcdrom MODULE vcdrom.c vcdrom.rc)
 set_module_type(vcdrom kernelmodedriver)
 target_link_libraries(vcdrom ${PSEH_LIB})
 add_importlibs(vcdrom ntoskrnl hal)
diff --git a/modules/rosapps/drivers/vfd/CMakeLists.txt b/modules/rosapps/drivers/vfd/CMakeLists.txt
index 1c234239b06..560ad37d1ad 100644
--- a/modules/rosapps/drivers/vfd/CMakeLists.txt
+++ b/modules/rosapps/drivers/vfd/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     vfdrdwr.c)
 
 include_directories(${REACTOS_SOURCE_DIR}/modules/rosapps/include/vfd)
-add_library(vfddrv SHARED ${SOURCE} vfddrv.rc)
+add_library(vfddrv MODULE ${SOURCE} vfddrv.rc)
 set_module_type(vfddrv kernelmodedriver)
 add_importlibs(vfddrv ntoskrnl hal)
 set_target_properties(vfddrv PROPERTIES OUTPUT_NAME "vfd")
diff --git a/modules/rosapps/lib/vfdlib/CMakeLists.txt b/modules/rosapps/lib/vfdlib/CMakeLists.txt
index 07244f80459..9dcf9329424 100644
--- a/modules/rosapps/lib/vfdlib/CMakeLists.txt
+++ b/modules/rosapps/lib/vfdlib/CMakeLists.txt
@@ -23,7 +23,7 @@ if(DBG)
     add_definitions(-D_DEBUG)
 endif()
 
-add_library(vfd SHARED
+add_library(vfd MODULE
     ${SOURCE}
     vfdlib.rc
     ${CMAKE_CURRENT_BINARY_DIR}/vfd.def)
diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake
index cb387c63447..49c965dbac5 100644
--- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake
+++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake
@@ -1382,7 +1382,7 @@ endif()
 #add_rostests_file(TARGET static_crt_apitest)
 
 #spec2def(static_crt_dll_startup.dll dll_startup.spec)
-#add_library(static_crt_dll_startup SHARED
+#add_library(static_crt_dll_startup MODULE
 #    dll_startup.cpp
 #    ${CMAKE_CURRENT_BINARY_DIR}/static_crt_dll_startup.def)
 #target_link_libraries(static_crt_dll_startup crt)
@@ -1398,7 +1398,7 @@ add_importlibs(msvcrt_crt_apitest msvcrt kernel32 ntdll)
 add_rostests_file(TARGET msvcrt_crt_apitest)
 
 spec2def(msvcrt_crt_dll_startup.dll dll_startup.spec)
-add_library(msvcrt_crt_dll_startup SHARED
+add_library(msvcrt_crt_dll_startup MODULE
     dll_startup.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_crt_dll_startup.def)
 set_module_type(msvcrt_crt_dll_startup win32dll)
diff --git a/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt b/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt
index 85e00fa254d..f074d2be718 100644
--- a/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt
+++ b/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt
@@ -11,12 +11,12 @@ list(APPEND SOURCE2
     ${CMAKE_CURRENT_BINARY_DIR}/redirtest_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/redirtest.def)
 
-add_library(redirtest1 SHARED ${SOURCE1})
+add_library(redirtest1 MODULE ${SOURCE1})
 set_module_type(redirtest1 win32dll)
 add_importlibs(redirtest1 msvcrt kernel32 ntdll)
 add_rostests_file(TARGET redirtest1 RENAME kernel32test_versioned.dll)
 
-add_library(redirtest2 SHARED ${SOURCE2})
+add_library(redirtest2 MODULE ${SOURCE2})
 set_module_type(redirtest2 win32dll)
 add_importlibs(redirtest2 msvcrt kernel32 ntdll)
 add_rostests_file(TARGET redirtest2 SUBDIR testdata RENAME kernel32test_versioned.dll)
diff --git a/modules/rostests/apitests/localspl/dll/CMakeLists.txt b/modules/rostests/apitests/localspl/dll/CMakeLists.txt
index 4c518ee1b5e..77d7eac49f9 100644
--- a/modules/rostests/apitests/localspl/dll/CMakeLists.txt
+++ b/modules/rostests/apitests/localspl/dll/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     fpSetJob.c
     main.c)
 
-add_library(localspl_apitest.dll SHARED ${SOURCE})
+add_library(localspl_apitest.dll MODULE ${SOURCE})
 target_link_libraries(localspl_apitest.dll wine ${PSEH_LIB})
 set_module_type(localspl_apitest.dll win32dll)
 add_importlibs(localspl_apitest.dll spoolss advapi32 msvcrt kernel32 ntdll)
diff --git a/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt b/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt
index 75436635e8a..a687e504137 100644
--- a/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt
+++ b/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(load_notifications SHARED load_notifications.c)
+add_library(load_notifications MODULE load_notifications.c)
 set_module_type(load_notifications win32dll ENTRYPOINT DllMain 12)
 add_importlibs(load_notifications kernel32 ntdll)
 add_dependencies(load_notifications psdk)
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
index 66c3ec8cd26..021fba309c2 100644
--- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(win32u_2k3sp2.dll win32u_2k3sp2.spec ADD_IMPORTLIB)
 add_asm_files(win32u_2k3sp2_asm sys-stubs.S)
 
-add_library(win32u_2k3sp2 SHARED
+add_library(win32u_2k3sp2 MODULE
     main.c
     ${win32u_2k3sp2_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def)
diff --git a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
index bdc681aec2e..99f1c534ed0 100644
--- a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(win32u_2ksp4.dll win32u_2ksp4.spec)
 add_asm_files(win32u_2ksp4_asm win32u_2ksp4.S)
 
-add_library(win32u_2ksp4 SHARED 
+add_library(win32u_2ksp4 MODULE 
     main.c 
     ${win32ku_2ksp4_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/win32u_2ksp4.def)
diff --git a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
index 15e8d2a2e5d..e8a8c03cf24 100644
--- a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/win32ss)
 spec2def(win32u.dll win32u_ros.spec ADD_IMPORTLIB)
 add_asm_files(win32u_ros_asm sys-stubs.S)
 
-add_library(win32u SHARED 
+add_library(win32u MODULE 
     main.c
     ${win32u_ros_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/win32u.def)
diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
index 10360658041..38737886d0c 100644
--- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(win32u_vista.spec win32u_vista.spec ADD_IMPORTLIB)
 add_asm_files(win32u_vista_asm win32u_vista.S)
 
-add_library(win32u_vista SHARED
+add_library(win32u_vista MODULE
     main.c
     ${win32u_vista_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def)
diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
index 0c3b536c751..6a84838435d 100644
--- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
@@ -2,7 +2,7 @@
 spec2def(win32u_xpsp2.dll win32u_xpsp2.spec ADD_IMPORTLIB)
 add_asm_files(win32u_xpsp2_asm sys-stubs.S)
 
-add_library(win32u_xpsp2 SHARED 
+add_library(win32u_xpsp2 MODULE 
     main.c
     ${win32u_xpsp2_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def)
diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt
index c12751eaa0f..ddfde9600da 100644
--- a/modules/rostests/kmtests/CMakeLists.txt
+++ b/modules/rostests/kmtests/CMakeLists.txt
@@ -100,7 +100,7 @@ list(APPEND KMTEST_DRV_SOURCE
 
     kmtest_drv/kmtest_drv.rc)
 
-add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE})
+add_library(kmtest_drv MODULE ${KMTEST_DRV_SOURCE})
 set_module_type(kmtest_drv kernelmodedriver)
 target_link_libraries(kmtest_drv kmtest_printf chkstk memcmp ntoskrnl_vista ${PSEH_LIB})
 add_importlibs(kmtest_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/example/CMakeLists.txt b/modules/rostests/kmtests/example/CMakeLists.txt
index e39ee3dcaea..a1a9b51db2b 100644
--- a/modules/rostests/kmtests/example/CMakeLists.txt
+++ b/modules/rostests/kmtests/example/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND EXAMPLE_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     Example_drv.c)
 
-add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE})
+add_library(example_drv MODULE ${EXAMPLE_DRV_SOURCE})
 set_module_type(example_drv kernelmodedriver)
 target_link_libraries(example_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(example_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt
index 435293967e2..cc700c52465 100644
--- a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt
+++ b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND FLTMGR_TEST_DRV_SOURCE
     ../../kmtest_drv/kmtest_fsminifilter.c
     fltmgr_create.c)
 
-add_library(fltmgr_create SHARED ${FLTMGR_TEST_DRV_SOURCE})
+add_library(fltmgr_create MODULE ${FLTMGR_TEST_DRV_SOURCE})
 set_module_type(fltmgr_create kernelmodedriver)
 target_link_libraries(fltmgr_create kmtest_printf ${PSEH_LIB})
 add_importlibs(fltmgr_create fltmgr ntoskrnl hal)
diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt
index f93e516be8e..1f41dd938c7 100644
--- a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt
+++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND FLTMGR_TEST_DRV_SOURCE
     ../../kmtest_drv/kmtest_fsminifilter.c
     fltmgr_load.c)
 
-add_library(FltMgrLoad_drv SHARED ${FLTMGR_TEST_DRV_SOURCE})
+add_library(FltMgrLoad_drv MODULE ${FLTMGR_TEST_DRV_SOURCE})
 set_module_type(FltMgrLoad_drv kernelmodedriver)
 target_link_libraries(FltMgrLoad_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(FltMgrLoad_drv fltmgr ntoskrnl hal)
diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt
index 2857a32bd61..5faa8bf7a06 100644
--- a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt
+++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND FLTMGR_TEST_DRV_SOURCE
     ../../kmtest_drv/kmtest_fsminifilter.c
     fltmgr_register.c)
 
-add_library(fltmgrreg_drv SHARED ${FLTMGR_TEST_DRV_SOURCE})
+add_library(fltmgrreg_drv MODULE ${FLTMGR_TEST_DRV_SOURCE})
 set_module_type(fltmgrreg_drv kernelmodedriver)
 target_link_libraries(fltmgrreg_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(fltmgrreg_drv fltmgr ntoskrnl hal)
diff --git a/modules/rostests/kmtests/hidparse/CMakeLists.txt b/modules/rostests/kmtests/hidparse/CMakeLists.txt
index 299ca5b1f14..91064640adf 100644
--- a/modules/rostests/kmtests/hidparse/CMakeLists.txt
+++ b/modules/rostests/kmtests/hidparse/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND HIDP_DRV_SOURCE
     HidP_drv.c
     HidPDescription.c)
 
-add_library(hidp_drv SHARED ${HIDP_DRV_SOURCE})
+add_library(hidp_drv MODULE ${HIDP_DRV_SOURCE})
 set_module_type(hidp_drv kernelmodedriver)
 target_link_libraries(hidp_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(hidp_drv hidparse ntoskrnl hal)
diff --git a/modules/rostests/kmtests/kernel32/CMakeLists.txt b/modules/rostests/kmtests/kernel32/CMakeLists.txt
index e93c8e55608..6dd07ed60ca 100644
--- a/modules/rostests/kmtests/kernel32/CMakeLists.txt
+++ b/modules/rostests/kmtests/kernel32/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND KERNEL32_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     kernel32_drv.c)
 
-add_library(kernel32_drv SHARED ${KERNEL32_DRV_SOURCE})
+add_library(kernel32_drv MODULE ${KERNEL32_DRV_SOURCE})
 set_module_type(kernel32_drv kernelmodedriver)
 target_link_libraries(kernel32_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(kernel32_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt
index 8815f5c8979..60912ad1ccb 100644
--- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt
+++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND CCCOPYREAD_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     CcCopyRead_drv.c)
 
-add_library(cccopyread_drv SHARED ${CCCOPYREAD_DRV_SOURCE})
+add_library(cccopyread_drv MODULE ${CCCOPYREAD_DRV_SOURCE})
 set_module_type(cccopyread_drv kernelmodedriver)
 target_link_libraries(cccopyread_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(cccopyread_drv ntoskrnl hal)
@@ -23,7 +23,7 @@ list(APPEND CCMAPDATA_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     CcMapData_drv.c)
 
-add_library(ccmapdata_drv SHARED ${CCMAPDATA_DRV_SOURCE})
+add_library(ccmapdata_drv MODULE ${CCMAPDATA_DRV_SOURCE})
 set_module_type(ccmapdata_drv kernelmodedriver)
 target_link_libraries(ccmapdata_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(ccmapdata_drv ntoskrnl hal)
@@ -38,7 +38,7 @@ list(APPEND CCPINMAPPEDDATA_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     CcPinMappedData_drv.c)
 
-add_library(ccpinmappeddata_drv SHARED ${CCPINMAPPEDDATA_DRV_SOURCE})
+add_library(ccpinmappeddata_drv MODULE ${CCPINMAPPEDDATA_DRV_SOURCE})
 set_module_type(ccpinmappeddata_drv kernelmodedriver)
 target_link_libraries(ccpinmappeddata_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(ccpinmappeddata_drv ntoskrnl hal)
@@ -53,7 +53,7 @@ list(APPEND CCPINREAD_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     CcPinRead_drv.c)
 
-add_library(ccpinread_drv SHARED ${CCPINREAD_DRV_SOURCE})
+add_library(ccpinread_drv MODULE ${CCPINREAD_DRV_SOURCE})
 set_module_type(ccpinread_drv kernelmodedriver)
 target_link_libraries(ccpinread_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(ccpinread_drv ntoskrnl hal)
@@ -68,7 +68,7 @@ list(APPEND CCSETFILESIZES_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     CcSetFileSizes_drv.c)
 
-add_library(ccsetfilesizes_drv SHARED ${CCSETFILESIZES_DRV_SOURCE})
+add_library(ccsetfilesizes_drv MODULE ${CCSETFILESIZES_DRV_SOURCE})
 set_module_type(ccsetfilesizes_drv kernelmodedriver)
 target_link_libraries(ccsetfilesizes_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(ccsetfilesizes_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/ntos_io/CMakeLists.txt b/modules/rostests/kmtests/ntos_io/CMakeLists.txt
index 76edbd5bf91..f1c142efcc2 100644
--- a/modules/rostests/kmtests/ntos_io/CMakeLists.txt
+++ b/modules/rostests/kmtests/ntos_io/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND IOCREATEFILE_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     IoCreateFile_drv.c)
 
-add_library(iocreatefile_drv SHARED ${IOCREATEFILE_DRV_SOURCE})
+add_library(iocreatefile_drv MODULE ${IOCREATEFILE_DRV_SOURCE})
 set_module_type(iocreatefile_drv kernelmodedriver)
 target_link_libraries(iocreatefile_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iocreatefile_drv ntoskrnl hal)
@@ -23,7 +23,7 @@ list(APPEND IODEVICEOBJECT_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     IoDeviceObject_drv.c)
 
-add_library(iodeviceobject_drv SHARED ${IODEVICEOBJECT_DRV_SOURCE})
+add_library(iodeviceobject_drv MODULE ${IODEVICEOBJECT_DRV_SOURCE})
 set_module_type(iodeviceobject_drv kernelmodedriver)
 target_link_libraries(iodeviceobject_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iodeviceobject_drv ntoskrnl hal)
@@ -38,7 +38,7 @@ list(APPEND IOHELPER_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     IoHelper_drv.c)
 
-add_library(iohelper_drv SHARED ${IOHELPER_DRV_SOURCE})
+add_library(iohelper_drv MODULE ${IOHELPER_DRV_SOURCE})
 set_module_type(iohelper_drv kernelmodedriver)
 target_link_libraries(iohelper_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iohelper_drv ntoskrnl hal)
@@ -53,7 +53,7 @@ list(APPEND IOREADWRITE_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     IoReadWrite_drv.c)
 
-add_library(ioreadwrite_drv SHARED ${IOREADWRITE_DRV_SOURCE})
+add_library(ioreadwrite_drv MODULE ${IOREADWRITE_DRV_SOURCE})
 set_module_type(ioreadwrite_drv kernelmodedriver)
 target_link_libraries(ioreadwrite_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(ioreadwrite_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/ntos_mm/CMakeLists.txt b/modules/rostests/kmtests/ntos_mm/CMakeLists.txt
index f83bdeea533..6610bba053a 100644
--- a/modules/rostests/kmtests/ntos_mm/CMakeLists.txt
+++ b/modules/rostests/kmtests/ntos_mm/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND NTCREATESECTION_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     NtCreateSection_drv.c)
 
-add_library(ntcreatesection_drv SHARED ${NTCREATESECTION_DRV_SOURCE})
+add_library(ntcreatesection_drv MODULE ${NTCREATESECTION_DRV_SOURCE})
 set_module_type(ntcreatesection_drv kernelmodedriver)
 target_link_libraries(ntcreatesection_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(ntcreatesection_drv ntoskrnl hal)
@@ -23,7 +23,7 @@ list(APPEND MMMAPLOCKEDPAGESSPECIFYCACHE_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     MmMapLockedPagesSpecifyCache_drv.c)
 
-add_library(mmmaplockedpagesspecifycache_drv SHARED ${MMMAPLOCKEDPAGESSPECIFYCACHE_DRV_SOURCE})
+add_library(mmmaplockedpagesspecifycache_drv MODULE ${MMMAPLOCKEDPAGESSPECIFYCACHE_DRV_SOURCE})
 set_module_type(mmmaplockedpagesspecifycache_drv kernelmodedriver)
 target_link_libraries(mmmaplockedpagesspecifycache_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(mmmaplockedpagesspecifycache_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/ntos_po/CMakeLists.txt b/modules/rostests/kmtests/ntos_po/CMakeLists.txt
index c5a6fef4af2..26258ad6160 100644
--- a/modules/rostests/kmtests/ntos_po/CMakeLists.txt
+++ b/modules/rostests/kmtests/ntos_po/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND POIRP_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     PoIrp_drv.c)
 
-add_library(poirp_drv SHARED ${POIRP_DRV_SOURCE})
+add_library(poirp_drv MODULE ${POIRP_DRV_SOURCE})
 set_module_type(poirp_drv kernelmodedriver)
 target_link_libraries(poirp_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(poirp_drv ntoskrnl hal)
diff --git a/modules/rostests/kmtests/tcpip/CMakeLists.txt b/modules/rostests/kmtests/tcpip/CMakeLists.txt
index 4fa55c2e075..be094fa0ebe 100644
--- a/modules/rostests/kmtests/tcpip/CMakeLists.txt
+++ b/modules/rostests/kmtests/tcpip/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND TCPIP_TEST_DRV_SOURCE
     tdi.c
     TcpIp_drv.c)
 
-add_library(tcpip_drv SHARED ${TCPIP_TEST_DRV_SOURCE})
+add_library(tcpip_drv MODULE ${TCPIP_TEST_DRV_SOURCE})
 set_module_type(tcpip_drv kernelmodedriver)
 target_link_libraries(tcpip_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(tcpip_drv ntoskrnl hal)
diff --git a/modules/rostests/tests/dllexport/CMakeLists.txt b/modules/rostests/tests/dllexport/CMakeLists.txt
index 76c883af9a8..741477d2c6e 100644
--- a/modules/rostests/tests/dllexport/CMakeLists.txt
+++ b/modules/rostests/tests/dllexport/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(dllexport_test_dll2.dll dllexport_test_dll2.spec ADD_IMPORTLIB)
 
 set(baseaddress_dllexport_test_dll1 0x1000000)
 
-add_library(dllexport_test_dll1 SHARED
+add_library(dllexport_test_dll1 MODULE
     dllexport_test_dll1.c
     ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def)
 
@@ -13,7 +13,7 @@ add_importlibs(dllexport_test_dll1 dllexport_test_dll2)
 
 set(baseaddress_dllexport_test_dll2 0x2000000)
 
-add_library(dllexport_test_dll2 SHARED
+add_library(dllexport_test_dll2 MODULE
     dllexport_test_dll2.c
     ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def)
 
@@ -30,7 +30,7 @@ endif()
 # framedyn is skipped in the clang-cl build
 if(NOT USE_CLANG_CL)
 
-add_library(dllimport_test SHARED dllimport_framedyn.cpp)
+add_library(dllimport_test MODULE dllimport_framedyn.cpp)
 set_module_type(dllimport_test module)
 add_importlibs(dllimport_test framedyn)
 
diff --git a/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt b/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt
index ff617c646ae..66a9e54760c 100644
--- a/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt
+++ b/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## link /dll /noentry /SUBSYSTEM:CONSOLE",5.0" /out:$(SolutionDir)$(Configuration)\MyEventProvider.dll $(IntDir)MyEventProvider.res
 
 add_message_headers(UNICODE MyEventProvider.mc)
-add_library(MyEventProvider_dll SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc)
+add_library(MyEventProvider_dll MODULE ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc)
 add_dependencies(MyEventProvider_dll MyEventProvider)
 set_module_type(MyEventProvider_dll module UNICODE)
 set_target_properties(MyEventProvider_dll PROPERTIES OUTPUT_NAME "MyEventProvider")
diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt
index 12632b0a04d..07729567c43 100644
--- a/modules/rostests/winetests/msi/CMakeLists.txt
+++ b/modules/rostests/winetests/msi/CMakeLists.txt
@@ -9,7 +9,7 @@ if(MSVC_IDE)
 endif()
 
 spec2def(custom.dll custom.spec)
-add_library(custom SHARED custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def)
+add_library(custom MODULE custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def)
 target_link_libraries(custom uuid)
 set_module_type(custom win32dll)
 add_importlibs(custom msi ole32 msvcrt kernel32)
diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index 547e8f32691..70d146d97ab 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -83,7 +83,7 @@ endmacro()
 function(add_dependency_node _node)
     if(GENERATE_DEPENDENCY_GRAPH)
         get_target_property(_type ${_node} TYPE)
-        if(_type MATCHES SHARED_LIBRARY OR ${_node} MATCHES ntoskrnl)
+        if(_type MATCHES SHARED_LIBRARY|MODULE_LIBRARY OR ${_node} MATCHES ntoskrnl)
             file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml "    <node id=\"${_node}\"/>\n")
         endif()
      endif()
@@ -92,7 +92,7 @@ endfunction()
 function(add_dependency_edge _source _target)
     if(GENERATE_DEPENDENCY_GRAPH)
         get_target_property(_type ${_source} TYPE)
-        if(_type MATCHES SHARED_LIBRARY)
+        if(_type MATCHES SHARED_LIBRARY|MODULE_LIBRARY)
             file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml "    <edge source=\"${_source}\" target=\"${_target}\"/>\n")
         endif()
     endif()
diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake
index bf6cb1cc58d..5eee683307f 100644
--- a/sdk/cmake/gcc.cmake
+++ b/sdk/cmake/gcc.cmake
@@ -252,8 +252,13 @@ else()
         "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
 endif()
 
+set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY})
+set(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
+set(CMAKE_RC_CREATE_SHARED_MODULE ${CMAKE_RC_CREATE_SHARED_LIBRARY})
+
 set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup")
 
 if((NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT CMAKE_BUILD_TYPE STREQUAL "Release"))
     # FIXME: Set this once Clang toolchain works with it
diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake
index 43fbd0dfbde..6eec2b15bcd 100644
--- a/sdk/cmake/msvc.cmake
+++ b/sdk/cmake/msvc.cmake
@@ -26,6 +26,7 @@ add_compile_flags("/GF")
 # Enable function level linking and comdat folding
 add_compile_flags("/Gy")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /OPT:REF /OPT:ICF")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF")
 
 if(ARCH STREQUAL "i386")
@@ -159,6 +160,8 @@ string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_L
 string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}")
 string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}")
 string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
+string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}")
+string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
 
 if(CMAKE_DISABLE_NINJA_DEPSLOG)
     set(cl_includes_flag "")
@@ -223,6 +226,8 @@ endif()
 
 set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})
 set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})
+set(CMAKE_RC_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE})
+set(CMAKE_ASM_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE})
 set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
 
 if(PCH)
diff --git a/sdk/include/asm/CMakeLists.txt b/sdk/include/asm/CMakeLists.txt
index 5c4f01f6ba5..dd3ad312565 100644
--- a/sdk/include/asm/CMakeLists.txt
+++ b/sdk/include/asm/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(genincdata SHARED genincdata.c)
+add_library(genincdata MODULE genincdata.c)
 
 set_entrypoint(genincdata 0)
 add_dependencies(genincdata bugcodes psdk xdk)
diff --git a/sdk/lib/3rdparty/bzip2/CMakeLists.txt b/sdk/lib/3rdparty/bzip2/CMakeLists.txt
index e65eba0084b..d30189d7d1b 100644
--- a/sdk/lib/3rdparty/bzip2/CMakeLists.txt
+++ b/sdk/lib/3rdparty/bzip2/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     dllmain.c
     bzlib_private.h)
 
-add_library(bzip2 SHARED
+add_library(bzip2 MODULE
     ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/unbzip2.def)
 
diff --git a/subsystems/mvdm/pifmgr/CMakeLists.txt b/subsystems/mvdm/pifmgr/CMakeLists.txt
index c3d8976521c..31b82ca784c 100644
--- a/subsystems/mvdm/pifmgr/CMakeLists.txt
+++ b/subsystems/mvdm/pifmgr/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 file(GLOB pifmgr_rc_deps "res/*.*" "res_alt/*.*")
 add_rc_deps(pifmgr.rc ${pifmgr_rc_deps})
-add_library(pifmgr SHARED pifmgr.rc)
+add_library(pifmgr MODULE pifmgr.rc)
 set_module_type(pifmgr module UNICODE)
 add_cd_file(TARGET pifmgr DESTINATION reactos/system32 FOR all)
diff --git a/subsystems/mvdm/samples/testvdd/CMakeLists.txt b/subsystems/mvdm/samples/testvdd/CMakeLists.txt
index 78ed1585166..c813da97c1d 100644
--- a/subsystems/mvdm/samples/testvdd/CMakeLists.txt
+++ b/subsystems/mvdm/samples/testvdd/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     testvdd.rc
     ${CMAKE_CURRENT_BINARY_DIR}/testvdd.def)
 
-add_library(testvdd SHARED ${SOURCE})
+add_library(testvdd MODULE ${SOURCE})
 #set_module_type(testvdd win32dll UNICODE ENTRYPOINT VDDInitialize)
 set_module_type(testvdd win32dll UNICODE)
 
diff --git a/subsystems/mvdm/vdmdbg/CMakeLists.txt b/subsystems/mvdm/vdmdbg/CMakeLists.txt
index cef101a4b36..1cb6ffe6946 100644
--- a/subsystems/mvdm/vdmdbg/CMakeLists.txt
+++ b/subsystems/mvdm/vdmdbg/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     vdmdbg.c
     ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def)
 
-add_library(vdmdbg SHARED ${SOURCE})
+add_library(vdmdbg MODULE ${SOURCE})
 set_module_type(vdmdbg win32dll UNICODE)
 add_importlibs(vdmdbg msvcrt kernel32 ntdll)
 add_cd_file(TARGET vdmdbg DESTINATION reactos/system32 FOR all)
diff --git a/subsystems/win/basesrv/CMakeLists.txt b/subsystems/win/basesrv/CMakeLists.txt
index e4082dd3892..36df1b3c70b 100644
--- a/subsystems/win/basesrv/CMakeLists.txt
+++ b/subsystems/win/basesrv/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     nls.c
     basesrv.h)
 
-add_library(basesrv SHARED
+add_library(basesrv MODULE
     ${SOURCE}
     basesrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/basesrv.def)
diff --git a/subsystems/win32/csrsrv/CMakeLists.txt b/subsystems/win32/csrsrv/CMakeLists.txt
index 98519d5e6f1..fc7dae1bb40 100644
--- a/subsystems/win32/csrsrv/CMakeLists.txt
+++ b/subsystems/win32/csrsrv/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     wait.c
     srv.h)
 
-add_library(csrsrv SHARED
+add_library(csrsrv MODULE
     ${SOURCE}
     csrsrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def)
diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake
index 5bc72d90efb..70c5ba73078 100644
--- a/toolchain-clang.cmake
+++ b/toolchain-clang.cmake
@@ -62,3 +62,4 @@ set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")
 set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries")
 
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")
+set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")
diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake
index f6ce3c2d746..e1487b3225c 100644
--- a/toolchain-gcc.cmake
+++ b/toolchain-gcc.cmake
@@ -66,6 +66,7 @@ set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")
 set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries")
 
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")
+set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")
 
 set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-gcc.cmake")
 
diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt
index ced54039fc4..e3be784a27f 100644
--- a/win32ss/CMakeLists.txt
+++ b/win32ss/CMakeLists.txt
@@ -225,7 +225,7 @@ endif()
 
 add_asm_files(win32k_asm ${ASM_SOURCE})
 
-add_library(win32k SHARED
+add_library(win32k MODULE
     ${SOURCE}
     gdi/ntgdi/brush.cpp
     ${win32k_asm}
diff --git a/win32ss/drivers/displays/framebuf/CMakeLists.txt b/win32ss/drivers/displays/framebuf/CMakeLists.txt
index 57eeae1ef02..6b084b1c3dd 100644
--- a/win32ss/drivers/displays/framebuf/CMakeLists.txt
+++ b/win32ss/drivers/displays/framebuf/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     surface.c
     framebuf.h)
 
-add_library(framebuf SHARED
+add_library(framebuf MODULE
     ${SOURCE}
     framebuf.rc)
 
diff --git a/win32ss/drivers/displays/framebuf_new/CMakeLists.txt b/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
index e0cbdfa7167..13f52bd7055 100644
--- a/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
+++ b/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     screen.c
     driver.h)
 
-add_library(framebuf_new SHARED
+add_library(framebuf_new MODULE
     ${SOURCE}
     framebuf_new.rc)
 
diff --git a/win32ss/drivers/displays/vga/CMakeLists.txt b/win32ss/drivers/displays/vga/CMakeLists.txt
index 9e2c79824e8..9b59047da00 100644
--- a/win32ss/drivers/displays/vga/CMakeLists.txt
+++ b/win32ss/drivers/displays/vga/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
     vgavideo/vgavideo.c
     vgaddi.h)
 
-add_library(vgaddi SHARED
+add_library(vgaddi MODULE
     ${SOURCE}
     vgaddi.rc)
 
diff --git a/win32ss/drivers/displays/vga_new/CMakeLists.txt b/win32ss/drivers/displays/vga_new/CMakeLists.txt
index b2cbd5586ce..f18952e0606 100644
--- a/win32ss/drivers/displays/vga_new/CMakeLists.txt
+++ b/win32ss/drivers/displays/vga_new/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     palette.c
     screen.c)
 
-add_library(vgaddi SHARED
+add_library(vgaddi MODULE
     ${SOURCE}
     vga_new.rc)
 
diff --git a/win32ss/drivers/font/bmfd/CMakeLists.txt b/win32ss/drivers/font/bmfd/CMakeLists.txt
index 3a66bd8bef9..e20b27da0aa 100644
--- a/win32ss/drivers/font/bmfd/CMakeLists.txt
+++ b/win32ss/drivers/font/bmfd/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     glyph.c
     bmfd.h)
 
-add_library(bmfd SHARED ${SOURCE})
+add_library(bmfd MODULE ${SOURCE})
 set_module_type(bmfd kerneldll ENTRYPOINT BmfdEnableDriver 12)
 target_link_libraries(bmfd libcntpr)
 add_importlibs(bmfd win32k)
diff --git a/win32ss/drivers/font/ftfd/CMakeLists.txt b/win32ss/drivers/font/ftfd/CMakeLists.txt
index f2dfb12cd90..2a5c1959e1e 100644
--- a/win32ss/drivers/font/ftfd/CMakeLists.txt
+++ b/win32ss/drivers/font/ftfd/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     rosglue.c
     ftfd.h)
 
-add_library(ftfd SHARED
+add_library(ftfd MODULE
     ${SOURCE}
     sprintf.c
     freetype.rc
diff --git a/win32ss/drivers/miniport/vbe/CMakeLists.txt b/win32ss/drivers/miniport/vbe/CMakeLists.txt
index 223bb2e354f..fe2b836fd48 100644
--- a/win32ss/drivers/miniport/vbe/CMakeLists.txt
+++ b/win32ss/drivers/miniport/vbe/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND SOURCE
     vbemp.c
     vbemp.h)
 
-add_library(vbemp SHARED ${SOURCE} vbemp.rc)
+add_library(vbemp MODULE ${SOURCE} vbemp.rc)
 set_module_type(vbemp kernelmodedriver)
 add_importlibs(vbemp videoprt)
 add_pch(vbemp vbemp.h SOURCE)
diff --git a/win32ss/drivers/miniport/vga/CMakeLists.txt b/win32ss/drivers/miniport/vga/CMakeLists.txt
index 63059f07ce6..13ac7b516d4 100644
--- a/win32ss/drivers/miniport/vga/CMakeLists.txt
+++ b/win32ss/drivers/miniport/vga/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND SOURCE
     vgamp.c
     vgamp.h)
 
-add_library(vgamp SHARED ${SOURCE} vgamp.rc)
+add_library(vgamp MODULE ${SOURCE} vgamp.rc)
 set_module_type(vgamp kernelmodedriver)
 add_importlibs(vgamp videoprt)
 add_pch(vgamp vgamp.h SOURCE)
diff --git a/win32ss/drivers/miniport/vga_new/CMakeLists.txt b/win32ss/drivers/miniport/vga_new/CMakeLists.txt
index 0918fa6446f..b278c71e87e 100644
--- a/win32ss/drivers/miniport/vga_new/CMakeLists.txt
+++ b/win32ss/drivers/miniport/vga_new/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     vbe.c
     vga.h)
 
-add_library(vga SHARED
+add_library(vga MODULE
     ${SOURCE}
     vga.rc)
 
diff --git a/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt b/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
index dd1f3d99fea..2ed12d5cd8b 100644
--- a/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
+++ b/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-add_library(vmx_svga SHARED vmx_svga.c vmx_svga.rc)
+add_library(vmx_svga MODULE vmx_svga.c vmx_svga.rc)
 set_module_type(vmx_svga kernelmodedriver)
 add_importlibs(vmx_svga ntoskrnl videoprt)
diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
index b42841a53ad..02ffb3e05ca 100644
--- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
+++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-add_library(xboxvmp SHARED xboxvmp.c xboxvmp.rc)
+add_library(xboxvmp MODULE xboxvmp.c xboxvmp.rc)
 set_module_type(xboxvmp kernelmodedriver)
 add_importlibs(xboxvmp ntoskrnl videoprt)
diff --git a/win32ss/drivers/videoprt/CMakeLists.txt b/win32ss/drivers/videoprt/CMakeLists.txt
index 35271178159..664f8cb7c62 100644
--- a/win32ss/drivers/videoprt/CMakeLists.txt
+++ b/win32ss/drivers/videoprt/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     videoprt.c
     videoprt.h)
 
-add_library(videoprt SHARED
+add_library(videoprt MODULE
     ${SOURCE}
     guid.c
     videoprt.rc
diff --git a/win32ss/drivers/watchdog/CMakeLists.txt b/win32ss/drivers/watchdog/CMakeLists.txt
index 5ef5e5cea15..89fb064de8a 100644
--- a/win32ss/drivers/watchdog/CMakeLists.txt
+++ b/win32ss/drivers/watchdog/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 spec2def(watchdog.sys watchdog.spec)
 
-add_library(watchdog SHARED
+add_library(watchdog MODULE
     watchdog.c
     ${CMAKE_CURRENT_BINARY_DIR}/watchdog.def)
 
diff --git a/win32ss/gdi/gdi32/CMakeLists.txt b/win32ss/gdi/gdi32/CMakeLists.txt
index 936babbb982..e1f1644cbd6 100644
--- a/win32ss/gdi/gdi32/CMakeLists.txt
+++ b/win32ss/gdi/gdi32/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SOURCE
     objects/path.c
     include/precomp.h)
 
-add_library(gdi32 SHARED
+add_library(gdi32 MODULE
     ${SOURCE}
     gdi32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def)
diff --git a/win32ss/printing/base/spoolss/CMakeLists.txt b/win32ss/printing/base/spoolss/CMakeLists.txt
index 12d6649e63f..47084f6d588 100644
--- a/win32ss/printing/base/spoolss/CMakeLists.txt
+++ b/win32ss/printing/base/spoolss/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     printprocessors.c
     tools.c)
 
-add_library(spoolss SHARED
+add_library(spoolss MODULE
     ${SOURCE}
     spoolss.rc
     ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c
diff --git a/win32ss/printing/base/winspool/CMakeLists.txt b/win32ss/printing/base/winspool/CMakeLists.txt
index aea2d85f3de..9081819dd24 100644
--- a/win32ss/printing/base/winspool/CMakeLists.txt
+++ b/win32ss/printing/base/winspool/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     printproviders.c
     ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c)
 
-add_library(winspool SHARED
+add_library(winspool MODULE
     ${SOURCE}
     winspool.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c
diff --git a/win32ss/printing/monitors/localmon/CMakeLists.txt b/win32ss/printing/monitors/localmon/CMakeLists.txt
index dc83cc014e5..34fbc345ddd 100644
--- a/win32ss/printing/monitors/localmon/CMakeLists.txt
+++ b/win32ss/printing/monitors/localmon/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     tools.c
     xcv.c)
 
-add_library(localmon SHARED
+add_library(localmon MODULE
     ${SOURCE}
     localmon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localmon.def)
diff --git a/win32ss/printing/monitors/localmon/ui/CMakeLists.txt b/win32ss/printing/monitors/localmon/ui/CMakeLists.txt
index beed196baf9..cc70d7ec59c 100644
--- a/win32ss/printing/monitors/localmon/ui/CMakeLists.txt
+++ b/win32ss/printing/monitors/localmon/ui/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     localui.c
     ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
 
-add_library(localui SHARED ${SOURCE} localui.rc)
+add_library(localui MODULE ${SOURCE} localui.rc)
 set_module_type(localui win32dll)
 target_link_libraries(localui wine)
 add_importlibs(localui winspool user32 msvcrt kernel32 ntdll)
diff --git a/win32ss/printing/processors/winprint/CMakeLists.txt b/win32ss/printing/processors/winprint/CMakeLists.txt
index 713a5a91db7..49e53a8b9b6 100644
--- a/win32ss/printing/processors/winprint/CMakeLists.txt
+++ b/win32ss/printing/processors/winprint/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     raw.c
     precomp.h)
 
-add_library(winprint SHARED
+add_library(winprint MODULE
     ${SOURCE}
     winprint.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winprint.def)
diff --git a/win32ss/printing/providers/localspl/CMakeLists.txt b/win32ss/printing/providers/localspl/CMakeLists.txt
index a5608db4063..bd6f5e3ca94 100644
--- a/win32ss/printing/providers/localspl/CMakeLists.txt
+++ b/win32ss/printing/providers/localspl/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
     printprocessors.c
     tools.c)
 
-add_library(localspl SHARED
+add_library(localspl MODULE
     ${SOURCE}
     localspl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c
diff --git a/win32ss/reactx/dxapi/CMakeLists.txt b/win32ss/reactx/dxapi/CMakeLists.txt
index b74e811f916..fef43bc688f 100644
--- a/win32ss/reactx/dxapi/CMakeLists.txt
+++ b/win32ss/reactx/dxapi/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_definitions(-D_DXAPI_)
 spec2def(dxapi.sys dxapi.spec)
 
-add_library(dxapi SHARED
+add_library(dxapi MODULE
     main.c
     dxapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def)
diff --git a/win32ss/reactx/dxg/CMakeLists.txt b/win32ss/reactx/dxg/CMakeLists.txt
index f89951f6ec0..b83056b7f14 100644
--- a/win32ss/reactx/dxg/CMakeLists.txt
+++ b/win32ss/reactx/dxg/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
 include_directories(
     ${REACTOS_SOURCE_DIR}/win32ss/include)
 
-add_library(dxg SHARED
+add_library(dxg MODULE
     ${SOURCE}
     dxg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dxg.def)
diff --git a/win32ss/reactx/dxgthk/CMakeLists.txt b/win32ss/reactx/dxgthk/CMakeLists.txt
index 1a9f01eb503..edcca6cb1a9 100644
--- a/win32ss/reactx/dxgthk/CMakeLists.txt
+++ b/win32ss/reactx/dxgthk/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
     dxgthk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def)
 
-add_library(dxgthk SHARED ${SOURCE})
+add_library(dxgthk MODULE ${SOURCE})
 set_module_type(dxgthk kernelmodedriver)
 add_importlibs(dxgthk win32k)
 add_cd_file(TARGET dxgthk DESTINATION reactos/system32/drivers FOR all)
diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt
index b048231fb01..0d38852d684 100644
--- a/win32ss/user/user32/CMakeLists.txt
+++ b/win32ss/user/user32/CMakeLists.txt
@@ -72,7 +72,7 @@ endif()
 
 add_asm_files(user32_asm ${ASM_SOURCE})
 
-add_library(user32 SHARED
+add_library(user32 MODULE
     ${SOURCE}
     ${user32_asm}
     user32.rc
diff --git a/win32ss/user/winsrv/CMakeLists.txt b/win32ss/user/winsrv/CMakeLists.txt
index ddb8cc6720c..a04ad47fabd 100644
--- a/win32ss/user/winsrv/CMakeLists.txt
+++ b/win32ss/user/winsrv/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     winsrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winsrv.def)
 
-add_library(winsrv SHARED ${SOURCE})
+add_library(winsrv MODULE ${SOURCE})
 set_module_type(winsrv win32dll UNICODE ENTRYPOINT DllMain 12)
 #############################################
 ## HACK FOR MSVC COMPILATION WITH win32dll ##