diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 798327b379d..4737656a6d6 100644
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -429,6 +429,18 @@ function(set_module_type MODULE TYPE)
         set(__subsystem console)
     elseif(${TYPE} STREQUAL win32gui)
         set(__subsystem windows)
+    elseif(${TYPE} STREQUAL kbdlayout)
+        set_entrypoint(${MODULE} 0)
+        set_image_base(${MODULE} 0x5FFF0000)
+        set_subsystem(${MODULE} native)
+        if (MSVC)
+            # Merge the .text and .rdata section into the .data section
+            add_target_link_flags(${MODULE} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data")
+        else()
+            # Use a custom linker script
+            add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+            add_dependencies(${MODULE} "${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+        endif()
     elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
             OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))
         message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}")
diff --git a/reactos/dll/keyboard/kbda1/CMakeLists.txt b/reactos/dll/keyboard/kbda1/CMakeLists.txt
index 09a6bf03494..4f3aefeaec3 100644
--- a/reactos/dll/keyboard/kbda1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbda1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbda1.dll kbda1.spec)
 
 add_library(kbda1 SHARED kbda1.c kbda1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda1.def)
 
-set_entrypoint(kbda1 0)
+set_module_type(kbda1 kbdlayout)
 
 add_dependencies(kbda1 psdk)
 
diff --git a/reactos/dll/keyboard/kbda2/CMakeLists.txt b/reactos/dll/keyboard/kbda2/CMakeLists.txt
index 8f784b08118..21233aeef17 100644
--- a/reactos/dll/keyboard/kbda2/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbda2/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbda2.dll kbda2.spec)
 
 add_library(kbda2 SHARED kbda2.c kbda2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda2.def)
 
-set_entrypoint(kbda2 0)
+set_module_type(kbda2 kbdlayout)
 
 add_dependencies(kbda2 psdk)
 
diff --git a/reactos/dll/keyboard/kbda3/CMakeLists.txt b/reactos/dll/keyboard/kbda3/CMakeLists.txt
index 30e0d84ab9e..9054d9bbc3d 100644
--- a/reactos/dll/keyboard/kbda3/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbda3/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbda3.dll kbda3.spec)
 
 add_library(kbda3 SHARED kbda3.c kbda3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda3.def)
 
-set_entrypoint(kbda3 0)
+set_module_type(kbda3 kbdlayout)
 
 add_dependencies(kbda3 psdk)
 
diff --git a/reactos/dll/keyboard/kbdal/CMakeLists.txt b/reactos/dll/keyboard/kbdal/CMakeLists.txt
index 59a2116dd1a..34b1a76af9f 100644
--- a/reactos/dll/keyboard/kbdal/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdal/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdal.dll kbdal.spec)
 
 add_library(kbdal SHARED kbdal.c kbdal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdal.def)
 
-set_entrypoint(kbdal 0)
+set_module_type(kbdal kbdlayout)
 
 add_dependencies(kbdal psdk)
 
diff --git a/reactos/dll/keyboard/kbdarme/CMakeLists.txt b/reactos/dll/keyboard/kbdarme/CMakeLists.txt
index 035020ad44d..3cd149cd7a8 100644
--- a/reactos/dll/keyboard/kbdarme/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdarme/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdarme.dll kbdarme.spec)
 
 add_library(kbdarme SHARED kbdarme.c kbdarme.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarme.def)
 
-set_entrypoint(kbdarme 0)
+set_module_type(kbdarme kbdlayout)
 
 add_dependencies(kbdarme psdk)
 
diff --git a/reactos/dll/keyboard/kbdarmw/CMakeLists.txt b/reactos/dll/keyboard/kbdarmw/CMakeLists.txt
index 4f52189b797..25a9739e01b 100644
--- a/reactos/dll/keyboard/kbdarmw/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdarmw/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdarmw.dll kbdarmw.spec)
 
 add_library(kbdarmw SHARED kbdarmw.c kbdarmw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarmw.def)
 
-set_entrypoint(kbdarmw 0)
+set_module_type(kbdarmw kbdlayout)
 
 add_dependencies(kbdarmw psdk)
 
diff --git a/reactos/dll/keyboard/kbdaze/CMakeLists.txt b/reactos/dll/keyboard/kbdaze/CMakeLists.txt
index 4f3f4fea775..f8fae7cb492 100644
--- a/reactos/dll/keyboard/kbdaze/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdaze/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdaze.dll kbdaze.spec)
 
 add_library(kbdaze SHARED kbdaze.c kbdaze.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdaze.def)
 
-set_entrypoint(kbdaze 0)
+set_module_type(kbdaze kbdlayout)
 
 add_dependencies(kbdaze psdk)
 
diff --git a/reactos/dll/keyboard/kbdazel/CMakeLists.txt b/reactos/dll/keyboard/kbdazel/CMakeLists.txt
index 0944e992d08..177f252424c 100644
--- a/reactos/dll/keyboard/kbdazel/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdazel/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdazel.dll kbdazel.spec)
 
 add_library(kbdazel SHARED kbdazel.c kbdazel.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdazel.def)
 
-set_entrypoint(kbdazel 0)
+set_module_type(kbdazel kbdlayout)
 
 add_dependencies(kbdazel psdk)
 
diff --git a/reactos/dll/keyboard/kbdbe/CMakeLists.txt b/reactos/dll/keyboard/kbdbe/CMakeLists.txt
index 5d1c6a370ef..fc05d3f61b5 100644
--- a/reactos/dll/keyboard/kbdbe/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdbe/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdbe.dll kbdbe.spec)
 
 add_library(kbdbe SHARED kbdbe.c kbdbe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbe.def)
 
-set_entrypoint(kbdbe 0)
+set_module_type(kbdbe kbdlayout)
 
 add_dependencies(kbdbe psdk)
 
diff --git a/reactos/dll/keyboard/kbdbga/CMakeLists.txt b/reactos/dll/keyboard/kbdbga/CMakeLists.txt
index c009a41a2b5..0b3866d37ee 100644
--- a/reactos/dll/keyboard/kbdbga/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdbga/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdbga.dll kbdbga.spec)
 
 add_library(kbdbga SHARED kbdbga.c kbdbga.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbga.def)
 
-set_entrypoint(kbdbga 0)
+set_module_type(kbdbga kbdlayout)
 
 add_dependencies(kbdbga psdk)
 
diff --git a/reactos/dll/keyboard/kbdbgm/CMakeLists.txt b/reactos/dll/keyboard/kbdbgm/CMakeLists.txt
index 67820d98d7b..a22331f2c10 100644
--- a/reactos/dll/keyboard/kbdbgm/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdbgm/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdbgm.dll kbdbgm.spec)
 
 add_library(kbdbgm SHARED kbdbgm.c kbdbgm.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgm.def)
 
-set_entrypoint(kbdbgm 0)
+set_module_type(kbdbgm kbdlayout)
 
 add_dependencies(kbdbgm psdk)
 
diff --git a/reactos/dll/keyboard/kbdbgt/CMakeLists.txt b/reactos/dll/keyboard/kbdbgt/CMakeLists.txt
index 74a9f45511a..8801f65d090 100644
--- a/reactos/dll/keyboard/kbdbgt/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdbgt/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdbgt.dll kbdbgt.spec)
 
 add_library(kbdbgt SHARED kbdbgt.c kbdbgt.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgt.def)
 
-set_entrypoint(kbdbgt 0)
+set_module_type(kbdbgt kbdlayout)
 
 add_dependencies(kbdbgt psdk)
 
diff --git a/reactos/dll/keyboard/kbdblr/CMakeLists.txt b/reactos/dll/keyboard/kbdblr/CMakeLists.txt
index 0a2941d54e2..48ee15546ca 100644
--- a/reactos/dll/keyboard/kbdblr/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdblr/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdblr.dll kbdblr.spec)
 
 add_library(kbdblr SHARED kbdblr.c kbdblr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdblr.def)
 
-set_entrypoint(kbdblr 0)
+set_module_type(kbdblr kbdlayout)
 
 add_dependencies(kbdblr psdk)
 
diff --git a/reactos/dll/keyboard/kbdbr/CMakeLists.txt b/reactos/dll/keyboard/kbdbr/CMakeLists.txt
index f8ea3619f07..0bc694b0ad2 100644
--- a/reactos/dll/keyboard/kbdbr/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdbr/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdbr.dll kbdbr.spec)
 
 add_library(kbdbr SHARED kbdbr.c kbdbr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbr.def)
 
-set_entrypoint(kbdbr 0)
+set_module_type(kbdbr kbdlayout)
 
 add_dependencies(kbdbr psdk)
 
diff --git a/reactos/dll/keyboard/kbdbur/CMakeLists.txt b/reactos/dll/keyboard/kbdbur/CMakeLists.txt
index 9800c1358f2..ba45e4cb51b 100644
--- a/reactos/dll/keyboard/kbdbur/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdbur/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdbur.dll kbdbur.spec)
 
 add_library(kbdbur SHARED kbdbur.c kbdbur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbur.def)
 
-set_entrypoint(kbdbur 0)
+set_module_type(kbdbur kbdlayout)
 
 add_dependencies(kbdbur psdk)
 
diff --git a/reactos/dll/keyboard/kbdcan/CMakeLists.txt b/reactos/dll/keyboard/kbdcan/CMakeLists.txt
index 7c244ba201f..8e444139e52 100644
--- a/reactos/dll/keyboard/kbdcan/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdcan/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdcan.dll kbdcan.spec)
 
 add_library(kbdcan SHARED kbdcan.c kbdcan.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcan.def)
 
-set_entrypoint(kbdcan 0)
+set_module_type(kbdcan kbdlayout)
 
 add_dependencies(kbdcan psdk)
 
diff --git a/reactos/dll/keyboard/kbdcr/CMakeLists.txt b/reactos/dll/keyboard/kbdcr/CMakeLists.txt
index f69e7eaf0f5..a8ac224dbe8 100644
--- a/reactos/dll/keyboard/kbdcr/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdcr/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdcr.dll kbdcr.spec)
 
 add_library(kbdcr SHARED kbdcr.c kbdcr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcr.def)
 
-set_entrypoint(kbdcr 0)
+set_module_type(kbdcr kbdlayout)
 
 add_dependencies(kbdcr psdk)
 
diff --git a/reactos/dll/keyboard/kbdcz/CMakeLists.txt b/reactos/dll/keyboard/kbdcz/CMakeLists.txt
index 6321509342e..e235e3816c0 100644
--- a/reactos/dll/keyboard/kbdcz/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdcz/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdcz.dll kbdcz.spec)
 
 add_library(kbdcz SHARED kbdcz.c kbdcz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz.def)
 
-set_entrypoint(kbdcz 0)
+set_module_type(kbdcz kbdlayout)
 
 add_dependencies(kbdcz psdk)
 
diff --git a/reactos/dll/keyboard/kbdcz1/CMakeLists.txt b/reactos/dll/keyboard/kbdcz1/CMakeLists.txt
index 1e99681acea..5d094ebb43a 100644
--- a/reactos/dll/keyboard/kbdcz1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdcz1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdcz1.dll kbdcz1.spec)
 
 add_library(kbdcz1 SHARED kbdcz1.c kbdcz1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz1.def)
 
-set_entrypoint(kbdcz1 0)
+set_module_type(kbdcz1 kbdlayout)
 
 add_dependencies(kbdcz1 psdk)
 
diff --git a/reactos/dll/keyboard/kbdda/CMakeLists.txt b/reactos/dll/keyboard/kbdda/CMakeLists.txt
index 98d9b5bc607..043e20b027f 100644
--- a/reactos/dll/keyboard/kbdda/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdda/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdda.dll kbdda.spec)
 
 add_library(kbdda SHARED kbdda.c kbdda.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdda.def)
 
-set_entrypoint(kbdda 0)
+set_module_type(kbdda kbdlayout)
 
 add_dependencies(kbdda psdk)
 
diff --git a/reactos/dll/keyboard/kbddv/CMakeLists.txt b/reactos/dll/keyboard/kbddv/CMakeLists.txt
index 04e6c0c0b0f..11696fb6b98 100644
--- a/reactos/dll/keyboard/kbddv/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbddv/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbddv.dll kbddv.spec)
 
 add_library(kbddv SHARED kbddv.c kbddv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbddv.def)
 
-set_entrypoint(kbddv 0)
+set_module_type(kbddv kbdlayout)
 
 add_dependencies(kbddv psdk)
 
diff --git a/reactos/dll/keyboard/kbdes/CMakeLists.txt b/reactos/dll/keyboard/kbdes/CMakeLists.txt
index 499266a7885..7f97296e531 100644
--- a/reactos/dll/keyboard/kbdes/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdes/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdes.dll kbdes.spec)
 
 add_library(kbdes SHARED kbdes.c kbdes.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdes.def)
 
-set_entrypoint(kbdes 0)
+set_module_type(kbdes kbdlayout)
 
 add_dependencies(kbdes psdk)
 
diff --git a/reactos/dll/keyboard/kbdest/CMakeLists.txt b/reactos/dll/keyboard/kbdest/CMakeLists.txt
index 58c6199aca7..6f7c39bb22d 100644
--- a/reactos/dll/keyboard/kbdest/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdest/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdest.dll kbdest.spec)
 
 add_library(kbdest SHARED kbdest.c kbdest.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdest.def)
 
-set_entrypoint(kbdest 0)
+set_module_type(kbdest kbdlayout)
 
 add_dependencies(kbdest psdk)
 
diff --git a/reactos/dll/keyboard/kbdfc/CMakeLists.txt b/reactos/dll/keyboard/kbdfc/CMakeLists.txt
index ce7a5cf3770..7d40d4e0d70 100644
--- a/reactos/dll/keyboard/kbdfc/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdfc/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdfc.dll kbdfc.spec)
 
 add_library(kbdfc SHARED kbdfc.c kbdfc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfc.def)
 
-set_entrypoint(kbdfc 0)
+set_module_type(kbdfc kbdlayout)
 
 add_dependencies(kbdfc psdk)
 
diff --git a/reactos/dll/keyboard/kbdfi/CMakeLists.txt b/reactos/dll/keyboard/kbdfi/CMakeLists.txt
index 3b922e5a524..01b8d4b7467 100644
--- a/reactos/dll/keyboard/kbdfi/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdfi/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdfi.dll kbdfi.spec)
 
 add_library(kbdfi SHARED kbdfi.c kbdfi.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfi.def)
 
-set_entrypoint(kbdfi 0)
+set_module_type(kbdfi kbdlayout)
 
 add_dependencies(kbdfi psdk)
 
diff --git a/reactos/dll/keyboard/kbdfr/CMakeLists.txt b/reactos/dll/keyboard/kbdfr/CMakeLists.txt
index 85b13850923..1a32d4694b8 100644
--- a/reactos/dll/keyboard/kbdfr/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdfr/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdfr.dll kbdfr.spec)
 
 add_library(kbdfr SHARED kbdfr.c kbdfr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def)
 
-set_entrypoint(kbdfr 0)
+set_module_type(kbdfr kbdlayout)
 
 add_dependencies(kbdfr psdk)
 
diff --git a/reactos/dll/keyboard/kbdgeo/CMakeLists.txt b/reactos/dll/keyboard/kbdgeo/CMakeLists.txt
index 965855edf27..cdd7e7f7a66 100644
--- a/reactos/dll/keyboard/kbdgeo/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdgeo/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdgeo.dll kbdgeo.spec)
 
 add_library(kbdgeo SHARED kbdgeo.c kbdgeo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgeo.def)
 
-set_entrypoint(kbdgeo 0)
+set_module_type(kbdgeo kbdlayout)
 
 add_dependencies(kbdgeo psdk)
 
diff --git a/reactos/dll/keyboard/kbdgerg/CMakeLists.txt b/reactos/dll/keyboard/kbdgerg/CMakeLists.txt
index db17d6930fe..6db4e12511c 100644
--- a/reactos/dll/keyboard/kbdgerg/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdgerg/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdgerg.dll kbdgerg.spec)
 
 add_library(kbdgerg SHARED kbdgerg.c kbdgerg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgerg.def)
 
-set_entrypoint(kbdgerg 0)
+set_module_type(kbdgerg kbdlayout)
 
 add_dependencies(kbdgerg psdk)
 
diff --git a/reactos/dll/keyboard/kbdgneo/CMakeLists.txt b/reactos/dll/keyboard/kbdgneo/CMakeLists.txt
index 3227429ea93..9fcff4eee1b 100644
--- a/reactos/dll/keyboard/kbdgneo/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdgneo/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdgneo.dll kbdgneo.spec)
 
 add_library(kbdgneo SHARED kbdgneo.c kbdgneo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgneo.def)
 
-set_entrypoint(kbdgneo 0)
+set_module_type(kbdgneo kbdlayout)
 
 add_dependencies(kbdgneo psdk)
 
diff --git a/reactos/dll/keyboard/kbdgr/CMakeLists.txt b/reactos/dll/keyboard/kbdgr/CMakeLists.txt
index c488873b654..fcb9f97f585 100644
--- a/reactos/dll/keyboard/kbdgr/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdgr/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdgr.dll kbdgr.spec)
 
 add_library(kbdgr SHARED kbdgr.c kbdgr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgr.def)
 
-set_entrypoint(kbdgr 0)
+set_module_type(kbdgr kbdlayout)
 
 add_dependencies(kbdgr psdk)
 
diff --git a/reactos/dll/keyboard/kbdgrist/CMakeLists.txt b/reactos/dll/keyboard/kbdgrist/CMakeLists.txt
index 19ffbd7a056..2d3e4cc32bd 100644
--- a/reactos/dll/keyboard/kbdgrist/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdgrist/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdgrist.dll kbdgrist.spec)
 
 add_library(kbdgrist SHARED kbdgrist.c kbdgrist.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgrist.def)
 
-set_entrypoint(kbdgrist 0)
+set_module_type(kbdgrist kbdlayout)
 
 add_dependencies(kbdgrist psdk)
 
diff --git a/reactos/dll/keyboard/kbdhe/CMakeLists.txt b/reactos/dll/keyboard/kbdhe/CMakeLists.txt
index b9af2891de7..f3242875ae8 100644
--- a/reactos/dll/keyboard/kbdhe/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdhe/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdhe.dll kbdhe.spec)
 
 add_library(kbdhe SHARED kbdhe.c kbdhe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhe.def)
 
-set_entrypoint(kbdhe 0)
+set_module_type(kbdhe kbdlayout)
 
 add_dependencies(kbdhe psdk)
 
diff --git a/reactos/dll/keyboard/kbdheb/CMakeLists.txt b/reactos/dll/keyboard/kbdheb/CMakeLists.txt
index 59e64bc2c30..c82b89d30e7 100644
--- a/reactos/dll/keyboard/kbdheb/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdheb/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdheb.dll kbdheb.spec)
 
 add_library(kbdheb SHARED kbdheb.c kbdheb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdheb.def)
 
-set_entrypoint(kbdheb 0)
+set_module_type(kbdheb kbdlayout)
 
 add_dependencies(kbdheb psdk)
 
diff --git a/reactos/dll/keyboard/kbdhu/CMakeLists.txt b/reactos/dll/keyboard/kbdhu/CMakeLists.txt
index a78195adbb9..b458f97f510 100644
--- a/reactos/dll/keyboard/kbdhu/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdhu/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdhu.dll kbdhu.spec)
 
 add_library(kbdhu SHARED kbdhu.c kbdhu.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhu.def)
 
-set_entrypoint(kbdhu 0)
+set_module_type(kbdhu kbdlayout)
 
 add_dependencies(kbdhu psdk)
 
diff --git a/reactos/dll/keyboard/kbdic/CMakeLists.txt b/reactos/dll/keyboard/kbdic/CMakeLists.txt
index 3d910a2a429..7155646aab9 100644
--- a/reactos/dll/keyboard/kbdic/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdic/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdic.dll kbdic.spec)
 
 add_library(kbdic SHARED kbdic.c kbdic.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdic.def)
 
-set_entrypoint(kbdic 0)
+set_module_type(kbdic kbdlayout)
 
 add_dependencies(kbdic psdk)
 
diff --git a/reactos/dll/keyboard/kbdinasa/CMakeLists.txt b/reactos/dll/keyboard/kbdinasa/CMakeLists.txt
index bd975973b68..69cfdba4a15 100644
--- a/reactos/dll/keyboard/kbdinasa/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdinasa/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdinasa.dll kbdinasa.spec)
 
 add_library(kbdinasa SHARED kbdinasa.c kbdinasa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinasa.def)
 
-set_entrypoint(kbdinasa 0)
+set_module_type(kbdinasa kbdlayout)
 
 add_dependencies(kbdinasa psdk)
 
diff --git a/reactos/dll/keyboard/kbdinben/CMakeLists.txt b/reactos/dll/keyboard/kbdinben/CMakeLists.txt
index 9579cf1f6f0..154095cb152 100644
--- a/reactos/dll/keyboard/kbdinben/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdinben/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdinben.dll kbdinben.spec)
 
 add_library(kbdinben SHARED kbdinben.c kbdinben.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinben.def)
 
-set_entrypoint(kbdinben 0)
+set_module_type(kbdinben kbdlayout)
 
 add_dependencies(kbdinben psdk)
 
diff --git a/reactos/dll/keyboard/kbdindev/CMakeLists.txt b/reactos/dll/keyboard/kbdindev/CMakeLists.txt
index 624f7859457..7f4a72025c0 100644
--- a/reactos/dll/keyboard/kbdindev/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdindev/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdindev.dll kbdindev.spec)
 
 add_library(kbdindev SHARED kbdindev.c kbdindev.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdindev.def)
 
-set_entrypoint(kbdindev 0)
+set_module_type(kbdindev kbdlayout)
 
 add_dependencies(kbdindev psdk)
 
diff --git a/reactos/dll/keyboard/kbdinguj/CMakeLists.txt b/reactos/dll/keyboard/kbdinguj/CMakeLists.txt
index e10c4d17540..6ed105955ae 100644
--- a/reactos/dll/keyboard/kbdinguj/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdinguj/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdinguj.dll kbdinguj.spec)
 
 add_library(kbdinguj SHARED kbdinguj.c kbdinguj.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinguj.def)
 
-set_entrypoint(kbdinguj 0)
+set_module_type(kbdinguj kbdlayout)
 
 add_dependencies(kbdinguj psdk)
 
diff --git a/reactos/dll/keyboard/kbdinmal/CMakeLists.txt b/reactos/dll/keyboard/kbdinmal/CMakeLists.txt
index 5bbfb8a68dc..629f729696a 100644
--- a/reactos/dll/keyboard/kbdinmal/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdinmal/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdinmal.dll kbdinmal.spec)
 
 add_library(kbdinmal SHARED kbdinmal.c kbdinmal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinmal.def)
 
-set_entrypoint(kbdinmal 0)
+set_module_type(kbdinmal kbdlayout)
 
 add_dependencies(kbdinmal psdk)
 
diff --git a/reactos/dll/keyboard/kbdir/CMakeLists.txt b/reactos/dll/keyboard/kbdir/CMakeLists.txt
index 49817b73386..780e6c2f78e 100644
--- a/reactos/dll/keyboard/kbdir/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdir/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdir.dll kbdir.spec)
 
 add_library(kbdir SHARED kbdir.c kbdir.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdir.def)
 
-set_entrypoint(kbdir 0)
+set_module_type(kbdir kbdlayout)
 
 add_dependencies(kbdir psdk)
 
diff --git a/reactos/dll/keyboard/kbdit/CMakeLists.txt b/reactos/dll/keyboard/kbdit/CMakeLists.txt
index 052f75b0c05..1ec7b4bb48d 100644
--- a/reactos/dll/keyboard/kbdit/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdit/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdit.dll kbdit.spec)
 
 add_library(kbdit SHARED kbdit.c kbdit.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdit.def)
 
-set_entrypoint(kbdit 0)
+set_module_type(kbdit kbdlayout)
 
 add_dependencies(kbdit psdk)
 
diff --git a/reactos/dll/keyboard/kbdja/CMakeLists.txt b/reactos/dll/keyboard/kbdja/CMakeLists.txt
index af982889ebf..8f3c65368a1 100644
--- a/reactos/dll/keyboard/kbdja/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdja/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdja.dll kbdja.spec)
 
 add_library(kbdja SHARED kbdja.c kbdja.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdja.def)
 
-set_entrypoint(kbdja 0)
+set_module_type(kbdja kbdlayout)
 
 add_dependencies(kbdja psdk)
 
diff --git a/reactos/dll/keyboard/kbdkaz/CMakeLists.txt b/reactos/dll/keyboard/kbdkaz/CMakeLists.txt
index 587a4acfc96..bafc2ed79da 100644
--- a/reactos/dll/keyboard/kbdkaz/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdkaz/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdkaz.dll kbdkaz.spec)
 
 add_library(kbdkaz SHARED kbdkaz.c kbdkaz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdkaz.def)
 
-set_entrypoint(kbdkaz 0)
+set_module_type(kbdkaz kbdlayout)
 
 add_dependencies(kbdkaz psdk)
 
diff --git a/reactos/dll/keyboard/kbdko/CMakeLists.txt b/reactos/dll/keyboard/kbdko/CMakeLists.txt
index d7525fd42d2..e3a1aec8e2e 100644
--- a/reactos/dll/keyboard/kbdko/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdko/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdko.dll kbdko.spec)
 
 add_library(kbdko SHARED kbdko.c kbdko.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdko.def)
 
-set_entrypoint(kbdko 0)
+set_module_type(kbdko kbdlayout)
 
 add_dependencies(kbdko psdk)
 
diff --git a/reactos/dll/keyboard/kbdla/CMakeLists.txt b/reactos/dll/keyboard/kbdla/CMakeLists.txt
index a34ab26e2c5..46fa88d7ccf 100644
--- a/reactos/dll/keyboard/kbdla/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdla/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdla.dll kbdla.spec)
 
 add_library(kbdla SHARED kbdla.c kbdla.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdla.def)
 
-set_entrypoint(kbdla 0)
+set_module_type(kbdla kbdlayout)
 
 add_dependencies(kbdla psdk)
 
diff --git a/reactos/dll/keyboard/kbdlt1/CMakeLists.txt b/reactos/dll/keyboard/kbdlt1/CMakeLists.txt
index 17cdce162d0..1356f5984c6 100644
--- a/reactos/dll/keyboard/kbdlt1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdlt1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdlt1.dll kbdlt1.spec)
 
 add_library(kbdlt1 SHARED kbdlt1.c kbdlt1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlt1.def)
 
-set_entrypoint(kbdlt1 0)
+set_module_type(kbdlt1 kbdlayout)
 
 add_dependencies(kbdlt1 psdk)
 
diff --git a/reactos/dll/keyboard/kbdlv/CMakeLists.txt b/reactos/dll/keyboard/kbdlv/CMakeLists.txt
index 31a5a3754d5..7f1b53f17f5 100644
--- a/reactos/dll/keyboard/kbdlv/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdlv/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdlv.dll kbdlv.spec)
 
 add_library(kbdlv SHARED kbdlv.c kbdlv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlv.def)
 
-set_entrypoint(kbdlv 0)
+set_module_type(kbdlv kbdlayout)
 
 add_dependencies(kbdlv psdk)
 
diff --git a/reactos/dll/keyboard/kbdmac/CMakeLists.txt b/reactos/dll/keyboard/kbdmac/CMakeLists.txt
index 0c96cc0ff3d..ef2c4412bf5 100644
--- a/reactos/dll/keyboard/kbdmac/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdmac/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdmac.dll kbdmac.spec)
 
 add_library(kbdmac SHARED kbdmac.c kbdmac.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdmac.def)
 
-set_entrypoint(kbdmac 0)
+set_module_type(kbdmac kbdlayout)
 
 add_dependencies(kbdmac psdk)
 
diff --git a/reactos/dll/keyboard/kbdne/CMakeLists.txt b/reactos/dll/keyboard/kbdne/CMakeLists.txt
index b9695b36e7d..93c4701b80c 100644
--- a/reactos/dll/keyboard/kbdne/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdne/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdne.dll kbdne.spec)
 
 add_library(kbdne SHARED kbdne.c kbdne.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdne.def)
 
-set_entrypoint(kbdne 0)
+set_module_type(kbdne kbdlayout)
 
 add_dependencies(kbdne psdk)
 
diff --git a/reactos/dll/keyboard/kbdno/CMakeLists.txt b/reactos/dll/keyboard/kbdno/CMakeLists.txt
index 7f971891fa8..8ecf1895217 100644
--- a/reactos/dll/keyboard/kbdno/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdno/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdno.dll kbdno.spec)
 
 add_library(kbdno SHARED kbdno.c kbdno.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdno.def)
 
-set_entrypoint(kbdno 0)
+set_module_type(kbdno kbdlayout)
 
 add_dependencies(kbdno psdk)
 
diff --git a/reactos/dll/keyboard/kbdpl/CMakeLists.txt b/reactos/dll/keyboard/kbdpl/CMakeLists.txt
index a11cd5314a9..1d5d330a6fa 100644
--- a/reactos/dll/keyboard/kbdpl/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdpl/CMakeLists.txt
@@ -3,7 +3,7 @@ spec2def(kbdpl.dll kbdpl.spec)
 
 add_library(kbdpl SHARED kbdpl.c kbdpl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl.def)
 
-set_entrypoint(kbdpl 0)
+set_module_type(kbdpl kbdlayout)
 
 add_dependencies(kbdpl psdk)
 
diff --git a/reactos/dll/keyboard/kbdpl1/CMakeLists.txt b/reactos/dll/keyboard/kbdpl1/CMakeLists.txt
index 2b482b47679..f4d30f5aa46 100644
--- a/reactos/dll/keyboard/kbdpl1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdpl1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdpl1.dll kbdpl1.spec)
 
 add_library(kbdpl1 SHARED kbdpl1.c kbdpl1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def)
 
-set_entrypoint(kbdpl1 0)
+set_module_type(kbdpl1 kbdlayout)
 
 add_dependencies(kbdpl1 psdk)
 
diff --git a/reactos/dll/keyboard/kbdpo/CMakeLists.txt b/reactos/dll/keyboard/kbdpo/CMakeLists.txt
index 496d776f9a7..bef781e263c 100644
--- a/reactos/dll/keyboard/kbdpo/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdpo/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdpo.dll kbdpo.spec)
 
 add_library(kbdpo SHARED kbdpo.c kbdpo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpo.def)
 
-set_entrypoint(kbdpo 0)
+set_module_type(kbdpo kbdlayout)
 
 add_dependencies(kbdpo psdk)
 
diff --git a/reactos/dll/keyboard/kbdro/CMakeLists.txt b/reactos/dll/keyboard/kbdro/CMakeLists.txt
index 2d1d3d87c1e..aa3c3dabd11 100644
--- a/reactos/dll/keyboard/kbdro/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdro/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdro.dll kbdro.spec)
 
 add_library(kbdro SHARED kbdro.c kbdro.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdro.def)
 
-set_entrypoint(kbdro 0)
+set_module_type(kbdro kbdlayout)
 
 add_dependencies(kbdro psdk)
 
diff --git a/reactos/dll/keyboard/kbdru/CMakeLists.txt b/reactos/dll/keyboard/kbdru/CMakeLists.txt
index 7c513274102..0e4250cd014 100644
--- a/reactos/dll/keyboard/kbdru/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdru/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdru.dll kbdru.spec)
 
 add_library(kbdru SHARED kbdru.c kbdru.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru.def)
 
-set_entrypoint(kbdru 0)
+set_module_type(kbdru kbdlayout)
 
 add_dependencies(kbdru psdk)
 
diff --git a/reactos/dll/keyboard/kbdru1/CMakeLists.txt b/reactos/dll/keyboard/kbdru1/CMakeLists.txt
index 62b1672938f..847a4391f76 100644
--- a/reactos/dll/keyboard/kbdru1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdru1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdru1.dll kbdru1.spec)
 
 add_library(kbdru1 SHARED kbdru1.c kbdru1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru1.def)
 
-set_entrypoint(kbdru1 0)
+set_module_type(kbdru1 kbdlayout)
 
 add_dependencies(kbdru1 psdk)
 
diff --git a/reactos/dll/keyboard/kbdsg/CMakeLists.txt b/reactos/dll/keyboard/kbdsg/CMakeLists.txt
index 2338afac9a6..3046bc5c1a1 100644
--- a/reactos/dll/keyboard/kbdsg/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdsg/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdsg.dll kbdsg.spec)
 
 add_library(kbdsg SHARED kbdsg.c kbdsg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsg.def)
 
-set_entrypoint(kbdsg 0)
+set_module_type(kbdsg kbdlayout)
 
 add_dependencies(kbdsg psdk)
 
diff --git a/reactos/dll/keyboard/kbdsk/CMakeLists.txt b/reactos/dll/keyboard/kbdsk/CMakeLists.txt
index 3445d1d98cb..d7d8e914d2f 100644
--- a/reactos/dll/keyboard/kbdsk/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdsk/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdsk.dll kbdsk.spec)
 
 add_library(kbdsk SHARED kbdsk.c kbdsk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk.def)
 
-set_entrypoint(kbdsk 0)
+set_module_type(kbdsk kbdlayout)
 
 add_dependencies(kbdsk psdk)
 
diff --git a/reactos/dll/keyboard/kbdsk1/CMakeLists.txt b/reactos/dll/keyboard/kbdsk1/CMakeLists.txt
index 1860bede0a1..ecd0da9b2cb 100644
--- a/reactos/dll/keyboard/kbdsk1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdsk1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdsk1.dll kbdsk1.spec)
 
 add_library(kbdsk1 SHARED kbdsk1.c kbdsk1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk1.def)
 
-set_entrypoint(kbdsk1 0)
+set_module_type(kbdsk1 kbdlayout)
 
 add_dependencies(kbdsk1 psdk)
 
diff --git a/reactos/dll/keyboard/kbdsw/CMakeLists.txt b/reactos/dll/keyboard/kbdsw/CMakeLists.txt
index 4bbda232c9b..2a03ad7ee38 100644
--- a/reactos/dll/keyboard/kbdsw/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdsw/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdsw.dll kbdsw.spec)
 
 add_library(kbdsw SHARED kbdsw.c kbdsw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsw.def)
 
-set_entrypoint(kbdsw 0)
+set_module_type(kbdsw kbdlayout)
 
 add_dependencies(kbdsw psdk)
 
diff --git a/reactos/dll/keyboard/kbdtat/CMakeLists.txt b/reactos/dll/keyboard/kbdtat/CMakeLists.txt
index 0ee6b976f01..d0eb34353d7 100644
--- a/reactos/dll/keyboard/kbdtat/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdtat/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdtat.dll kbdtat.spec)
 
 add_library(kbdtat SHARED kbdtat.c kbdtat.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtat.def)
 
-set_entrypoint(kbdtat 0)
+set_module_type(kbdtat kbdlayout)
 
 add_dependencies(kbdtat psdk)
 
diff --git a/reactos/dll/keyboard/kbdth0/CMakeLists.txt b/reactos/dll/keyboard/kbdth0/CMakeLists.txt
index 57b49fce51f..0e964860d47 100644
--- a/reactos/dll/keyboard/kbdth0/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdth0/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdth0.dll kbdth0.spec)
 
 add_library(kbdth0 SHARED kbdth0.c kbdth0.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth0.def)
 
-set_entrypoint(kbdth0 0)
+set_module_type(kbdth0 kbdlayout)
 
 add_dependencies(kbdth0 psdk)
 
diff --git a/reactos/dll/keyboard/kbdth1/CMakeLists.txt b/reactos/dll/keyboard/kbdth1/CMakeLists.txt
index 1ccaa3ec662..799384c49c1 100644
--- a/reactos/dll/keyboard/kbdth1/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdth1/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdth1.dll kbdth1.spec)
 
 add_library(kbdth1 SHARED kbdth1.c kbdth1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth1.def)
 
-set_entrypoint(kbdth1 0)
+set_module_type(kbdth1 kbdlayout)
 
 add_dependencies(kbdth1 psdk)
 
diff --git a/reactos/dll/keyboard/kbdth2/CMakeLists.txt b/reactos/dll/keyboard/kbdth2/CMakeLists.txt
index 54f7b675424..a81d8d10be3 100644
--- a/reactos/dll/keyboard/kbdth2/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdth2/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdth2.dll kbdth2.spec)
 
 add_library(kbdth2 SHARED kbdth2.c kbdth2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth2.def)
 
-set_entrypoint(kbdth2 0)
+set_module_type(kbdth2 kbdlayout)
 
 add_dependencies(kbdth2 psdk)
 
diff --git a/reactos/dll/keyboard/kbdth3/CMakeLists.txt b/reactos/dll/keyboard/kbdth3/CMakeLists.txt
index f40d878ed80..d9591a197cf 100644
--- a/reactos/dll/keyboard/kbdth3/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdth3/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdth3.dll kbdth3.spec)
 
 add_library(kbdth3 SHARED kbdth3.c kbdth3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth3.def)
 
-set_entrypoint(kbdth3 0)
+set_module_type(kbdth3 kbdlayout)
 
 add_dependencies(kbdth3 psdk)
 
diff --git a/reactos/dll/keyboard/kbdtuf/CMakeLists.txt b/reactos/dll/keyboard/kbdtuf/CMakeLists.txt
index 7203a80d578..2ca390f814a 100644
--- a/reactos/dll/keyboard/kbdtuf/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdtuf/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdtuf.dll kbdtuf.spec)
 
 add_library(kbdtuf SHARED kbdtuf.c kbdtuf.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuf.def)
 
-set_entrypoint(kbdtuf 0)
+set_module_type(kbdtuf kbdlayout)
 
 add_dependencies(kbdtuf psdk)
 
diff --git a/reactos/dll/keyboard/kbdtuq/CMakeLists.txt b/reactos/dll/keyboard/kbdtuq/CMakeLists.txt
index da03c035551..bbb9c81a2f2 100644
--- a/reactos/dll/keyboard/kbdtuq/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdtuq/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdtuq.dll kbdtuq.spec)
 
 add_library(kbdtuq SHARED kbdtuq.c kbdtuq.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuq.def)
 
-set_entrypoint(kbdtuq 0)
+set_module_type(kbdtuq kbdlayout)
 
 add_dependencies(kbdtuq psdk)
 
diff --git a/reactos/dll/keyboard/kbduk/CMakeLists.txt b/reactos/dll/keyboard/kbduk/CMakeLists.txt
index 6f92fcab0a2..217c70d8354 100644
--- a/reactos/dll/keyboard/kbduk/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbduk/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbduk.dll kbduk.spec)
 
 add_library(kbduk SHARED kbduk.c kbduk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduk.def)
 
-set_entrypoint(kbduk 0)
+set_module_type(kbduk kbdlayout)
 
 add_dependencies(kbduk psdk)
 
diff --git a/reactos/dll/keyboard/kbdur/CMakeLists.txt b/reactos/dll/keyboard/kbdur/CMakeLists.txt
index eb17d88e204..90de8728e72 100644
--- a/reactos/dll/keyboard/kbdur/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdur/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdur.dll kbdur.spec)
 
 add_library(kbdur SHARED kbdur.c kbdur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdur.def)
 
-set_entrypoint(kbdur 0)
+set_module_type(kbdur kbdlayout)
 
 add_dependencies(kbdur psdk)
 
diff --git a/reactos/dll/keyboard/kbdurs/CMakeLists.txt b/reactos/dll/keyboard/kbdurs/CMakeLists.txt
index 1ab666a813c..8a37c1b4c65 100644
--- a/reactos/dll/keyboard/kbdurs/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdurs/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdurs.dll kbdurs.spec)
 
 add_library(kbdurs SHARED kbdurs.c kbdurs.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdurs.def)
 
-set_entrypoint(kbdurs 0)
+set_module_type(kbdurs kbdlayout)
 
 add_dependencies(kbdurs psdk)
 
diff --git a/reactos/dll/keyboard/kbdus/CMakeLists.txt b/reactos/dll/keyboard/kbdus/CMakeLists.txt
index 8eecc6db687..56d7b11b49a 100644
--- a/reactos/dll/keyboard/kbdus/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdus/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(kbdus.dll kbdus.spec)
 
 add_library(kbdus SHARED kbdus.c kbdus.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
 
-set_entrypoint(kbdus 0)
+set_module_type(kbdus kbdlayout)
 
 add_dependencies(kbdus psdk)
 
diff --git a/reactos/dll/keyboard/kbdusa/CMakeLists.txt b/reactos/dll/keyboard/kbdusa/CMakeLists.txt
index eb146859eef..2f87a3ef968 100644
--- a/reactos/dll/keyboard/kbdusa/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdusa/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdusa.dll kbdusa.spec)
 
 add_library(kbdusa SHARED kbdusa.c kbdusa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusa.def)
 
-set_entrypoint(kbdusa 0)
+set_module_type(kbdusa kbdlayout)
 
 add_dependencies(kbdusa psdk)
 
diff --git a/reactos/dll/keyboard/kbdusl/CMakeLists.txt b/reactos/dll/keyboard/kbdusl/CMakeLists.txt
index e459e894fc8..1734b170b2f 100644
--- a/reactos/dll/keyboard/kbdusl/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdusl/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdusl.dll kbdusl.spec)
 
 add_library(kbdusl SHARED kbdusl.c kbdusl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusl.def)
 
-set_entrypoint(kbdusl 0)
+set_module_type(kbdusl kbdlayout)
 
 add_dependencies(kbdusl psdk)
 
diff --git a/reactos/dll/keyboard/kbdusr/CMakeLists.txt b/reactos/dll/keyboard/kbdusr/CMakeLists.txt
index 8ae497238a7..cd33a55f4c2 100644
--- a/reactos/dll/keyboard/kbdusr/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdusr/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdusr.dll kbdusr.spec)
 
 add_library(kbdusr SHARED kbdusr.c kbdusr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusr.def)
 
-set_entrypoint(kbdusr 0)
+set_module_type(kbdusr kbdlayout)
 
 add_dependencies(kbdusr psdk)
 
diff --git a/reactos/dll/keyboard/kbdusx/CMakeLists.txt b/reactos/dll/keyboard/kbdusx/CMakeLists.txt
index 1994501979d..8d7871b4bc5 100644
--- a/reactos/dll/keyboard/kbdusx/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdusx/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdusx.dll kbdusx.spec)
 
 add_library(kbdusx SHARED kbdusx.c kbdusx.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusx.def)
 
-set_entrypoint(kbdusx 0)
+set_module_type(kbdusx kbdlayout)
 
 add_dependencies(kbdusx psdk)
 
diff --git a/reactos/dll/keyboard/kbduzb/CMakeLists.txt b/reactos/dll/keyboard/kbduzb/CMakeLists.txt
index 2ad14e5fcda..6b561a04445 100644
--- a/reactos/dll/keyboard/kbduzb/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbduzb/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbduzb.dll kbduzb.spec)
 
 add_library(kbduzb SHARED kbduzb.c kbduzb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduzb.def)
 
-set_entrypoint(kbduzb 0)
+set_module_type(kbduzb kbdlayout)
 
 add_dependencies(kbduzb psdk)
 
diff --git a/reactos/dll/keyboard/kbdvntc/CMakeLists.txt b/reactos/dll/keyboard/kbdvntc/CMakeLists.txt
index d180991f214..9b2ce1d4150 100644
--- a/reactos/dll/keyboard/kbdvntc/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdvntc/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdvntc.dll kbdvntc.spec)
 
 add_library(kbdvntc SHARED kbdvntc.c kbdvntc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdvntc.def)
 
-set_entrypoint(kbdvntc 0)
+set_module_type(kbdvntc kbdlayout)
 
 add_dependencies(kbdvntc psdk)
 
diff --git a/reactos/dll/keyboard/kbdycc/CMakeLists.txt b/reactos/dll/keyboard/kbdycc/CMakeLists.txt
index 2711771377a..2e0d34f5317 100644
--- a/reactos/dll/keyboard/kbdycc/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdycc/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdycc.dll kbdycc.spec)
 
 add_library(kbdycc SHARED kbdycc.c kbdycc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycc.def)
 
-set_entrypoint(kbdycc 0)
+set_module_type(kbdycc kbdlayout)
 
 add_dependencies(kbdycc psdk)
 
diff --git a/reactos/dll/keyboard/kbdycl/CMakeLists.txt b/reactos/dll/keyboard/kbdycl/CMakeLists.txt
index 5726970a10c..cb737232c13 100644
--- a/reactos/dll/keyboard/kbdycl/CMakeLists.txt
+++ b/reactos/dll/keyboard/kbdycl/CMakeLists.txt
@@ -5,7 +5,7 @@ spec2def(kbdycl.dll kbdycl.spec)
 
 add_library(kbdycl SHARED kbdycl.c kbdycl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycl.def)
 
-set_entrypoint(kbdycl 0)
+set_module_type(kbdycl kbdlayout)
 
 add_dependencies(kbdycl psdk)
 
diff --git a/reactos/kbdlayout.lds b/reactos/kbdlayout.lds
new file mode 100644
index 00000000000..d31fc73a890
--- /dev/null
+++ b/reactos/kbdlayout.lds
@@ -0,0 +1,35 @@
+SECTIONS
+{
+  .data __image_base__ + __section_alignment__ :
+  {
+    *(.data)
+    *(SORT(.data*))
+    *(.rdata)
+    *(SORT(.rdata*))
+    *(.text)
+    *(SORT(.text*))
+    *(.bss)
+    *(COMMON)
+  }
+
+  .rsrc BLOCK(__section_alignment__) :
+  {
+    *(.rsrc)
+    *(SORT(.rsrc$*))
+  }
+
+  .reloc BLOCK(__section_alignment__) :
+  {
+    *(.reloc)
+  }
+
+  .edata BLOCK(__section_alignment__) :
+  {
+    *(.edata)
+  }
+
+  /DISCARD/ :
+  {
+    *(*)
+  }
+}