diff --git a/reactos/dll/keyboard/kbda1/kbda1.def b/reactos/dll/keyboard/kbda1/kbda1.def
deleted file mode 100644
index 8bc15d20854..00000000000
--- a/reactos/dll/keyboard/kbda1/kbda1.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbda1.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbda1/kbda1.rbuild b/reactos/dll/keyboard/kbda1/kbda1.rbuild
index 9313180bb3f..f4535a84a1d 100644
--- a/reactos/dll/keyboard/kbda1/kbda1.rbuild
+++ b/reactos/dll/keyboard/kbda1/kbda1.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda1.dll" allowwarnings="true">
-	<importlibrary definition="kbda1.def" />
+	<importlibrary definition="kbda1.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda1.c</file>
 	<file>kbda1.rc</file>
+	<file>kbda1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbda1/kbda1.spec b/reactos/dll/keyboard/kbda1/kbda1.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbda1/kbda1.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbda2/kbda2.def b/reactos/dll/keyboard/kbda2/kbda2.def
deleted file mode 100644
index 87fc02ac6f3..00000000000
--- a/reactos/dll/keyboard/kbda2/kbda2.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbda2.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbda2/kbda2.rbuild b/reactos/dll/keyboard/kbda2/kbda2.rbuild
index 97dc1f5a08b..13c311dae83 100644
--- a/reactos/dll/keyboard/kbda2/kbda2.rbuild
+++ b/reactos/dll/keyboard/kbda2/kbda2.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda2.dll" allowwarnings="true">
-	<importlibrary definition="kbda2.def" />
+	<importlibrary definition="kbda2.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda2.c</file>
 	<file>kbda2.rc</file>
+	<file>kbda2.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbda2/kbda2.spec b/reactos/dll/keyboard/kbda2/kbda2.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbda2/kbda2.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbda3/kbda3.def b/reactos/dll/keyboard/kbda3/kbda3.def
deleted file mode 100644
index 2307d7d0c97..00000000000
--- a/reactos/dll/keyboard/kbda3/kbda3.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbda3.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbda3/kbda3.rbuild b/reactos/dll/keyboard/kbda3/kbda3.rbuild
index 1eb53a9cabf..b3d213c52aa 100644
--- a/reactos/dll/keyboard/kbda3/kbda3.rbuild
+++ b/reactos/dll/keyboard/kbda3/kbda3.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda3.dll" allowwarnings="true">
-	<importlibrary definition="kbda3.def" />
+	<importlibrary definition="kbda3.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbda3.c</file>
 	<file>kbda3.rc</file>
+	<file>kbda3.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbda3/kbda3.spec b/reactos/dll/keyboard/kbda3/kbda3.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbda3/kbda3.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdal/kbdal.def b/reactos/dll/keyboard/kbdal/kbdal.def
deleted file mode 100644
index 355652b15e6..00000000000
--- a/reactos/dll/keyboard/kbdal/kbdal.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdal.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdal/kbdal.rbuild b/reactos/dll/keyboard/kbdal/kbdal.rbuild
index 63bfe56e911..e45eb3d8862 100644
--- a/reactos/dll/keyboard/kbdal/kbdal.rbuild
+++ b/reactos/dll/keyboard/kbdal/kbdal.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true">
-	<importlibrary definition="kbdal.def" />
+	<importlibrary definition="kbdal.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdal.c</file>
 	<file>kbdal.rc</file>
+	<file>kbdal.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdal/kbdal.spec b/reactos/dll/keyboard/kbdal/kbdal.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdal/kbdal.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.def b/reactos/dll/keyboard/kbdarme/kbdarme.def
deleted file mode 100644
index c56d24b9308..00000000000
--- a/reactos/dll/keyboard/kbdarme/kbdarme.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdarme.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
index d3e67d0c184..008efd44374 100644
--- a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarme" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarme.dll" allowwarnings="true">
-	<importlibrary definition="kbdarme.def" />
+	<importlibrary definition="kbdarme.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdarme.c</file>
 	<file>kbdarme.rc</file>
+	<file>kbdarme.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.spec b/reactos/dll/keyboard/kbdarme/kbdarme.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.def b/reactos/dll/keyboard/kbdarmw/kbdarmw.def
deleted file mode 100644
index 4676a69a6dc..00000000000
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdarmw.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
index 95f0ec39d78..37383830f23 100644
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarmw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarmw.dll" allowwarnings="true">
-	<importlibrary definition="kbdarmw.def" />
+	<importlibrary definition="kbdarmw.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdarmw.c</file>
 	<file>kbdarmw.rc</file>
+	<file>kbdarmw.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.spec b/reactos/dll/keyboard/kbdarmw/kbdarmw.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.def b/reactos/dll/keyboard/kbdaze/kbdaze.def
deleted file mode 100644
index f4c189d5fbb..00000000000
--- a/reactos/dll/keyboard/kbdaze/kbdaze.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdaze.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
index 8c0e518a9dd..fdeeb8af0e0 100644
--- a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
+++ b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdaze" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdaze.dll" allowwarnings="true">
-	<importlibrary definition="kbdaze.def" />
+	<importlibrary definition="kbdaze.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdaze.c</file>
 	<file>kbdaze.rc</file>
+	<file>kbdaze.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.spec b/reactos/dll/keyboard/kbdaze/kbdaze.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdaze/kbdaze.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.def b/reactos/dll/keyboard/kbdazel/kbdazel.def
deleted file mode 100644
index bcfe3e493dd..00000000000
--- a/reactos/dll/keyboard/kbdazel/kbdazel.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdazel.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
index b10de660563..3011162513c 100644
--- a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
+++ b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdazel" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdazel.dll" allowwarnings="true">
-	<importlibrary definition="kbdazel.def" />
+	<importlibrary definition="kbdazel.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdazel.c</file>
 	<file>kbdazel.rc</file>
+	<file>kbdazel.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.spec b/reactos/dll/keyboard/kbdazel/kbdazel.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdazel/kbdazel.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.def b/reactos/dll/keyboard/kbdbe/kbdbe.def
deleted file mode 100644
index ea0271f832a..00000000000
--- a/reactos/dll/keyboard/kbdbe/kbdbe.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdbe.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
index 6bc1bc70e29..d17d60ce6ca 100644
--- a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true">
-	<importlibrary definition="kbdbe.def" />
+	<importlibrary definition="kbdbe.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbe.c</file>
 	<file>kbdbe.rc</file>
+	<file>kbdbe.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.spec b/reactos/dll/keyboard/kbdbe/kbdbe.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.def b/reactos/dll/keyboard/kbdbga/kbdbga.def
deleted file mode 100644
index 4858a5fb570..00000000000
--- a/reactos/dll/keyboard/kbdbga/kbdbga.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdbga.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
index 1dc758883c6..70aabd09dd2 100644
--- a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
@@ -1,9 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbga" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true">
-	<importlibrary definition="kbdbga.def" />
+	<importlibrary definition="kbdbga.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbga.c</file>
 	<file>kbdbga.rc</file>
-</module>
\ No newline at end of file
+	<file>kbdbga.spec</file>
+</module>
diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.spec b/reactos/dll/keyboard/kbdbga/kbdbga.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.def b/reactos/dll/keyboard/kbdbgm/kbdbgm.def
deleted file mode 100644
index 79314113131..00000000000
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdbgm.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
index 1eb705ceaa1..1bad67104e9 100644
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
@@ -1,9 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgm" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true">
-	<importlibrary definition="kbdbgm.def" />
+	<importlibrary definition="kbdbgm.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbgm.c</file>
 	<file>kbdbgm.rc</file>
+	<file>kbdbgm.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.spec b/reactos/dll/keyboard/kbdbgm/kbdbgm.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.def b/reactos/dll/keyboard/kbdbgt/kbdbgt.def
deleted file mode 100644
index 4519422ee14..00000000000
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdbgt.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
index 4dbc6c42bf3..43d911488c9 100644
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
@@ -1,9 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true">
-	<importlibrary definition="kbdbgt.def" />
+	<importlibrary definition="kbdbgt.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbgt.c</file>
 	<file>kbdbgt.rc</file>
-</module>
\ No newline at end of file
+	<file>kbdbgt.spec</file>
+</module>
diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.spec b/reactos/dll/keyboard/kbdbgt/kbdbgt.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.def b/reactos/dll/keyboard/kbdblr/kbdblr.def
deleted file mode 100644
index 982da6f0d04..00000000000
--- a/reactos/dll/keyboard/kbdblr/kbdblr.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdblr.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
index e9a4b2f5fd1..51303bb3408 100644
--- a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
+++ b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdblr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdblr.dll" allowwarnings="true">
-	<importlibrary definition="kbdblr.def" />
+	<importlibrary definition="kbdblr.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdblr.c</file>
 	<file>kbdblr.rc</file>
+	<file>kbdblr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.spec b/reactos/dll/keyboard/kbdblr/kbdblr.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdblr/kbdblr.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.def b/reactos/dll/keyboard/kbdbr/kbdbr.def
deleted file mode 100644
index 689997ab55f..00000000000
--- a/reactos/dll/keyboard/kbdbr/kbdbr.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdbr.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
index a38a8caa49b..e0a2d6d7bb2 100644
--- a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
+++ b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbr.dll" allowwarnings="true">
-	<importlibrary definition="kbdbr.def" />
+	<importlibrary definition="kbdbr.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbr.c</file>
 	<file>kbdbr.rc</file>
+	<file>kbdbr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.spec b/reactos/dll/keyboard/kbdbr/kbdbr.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdbr/kbdbr.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.def b/reactos/dll/keyboard/kbdbur/kbdbur.def
deleted file mode 100644
index 3bf311d6b7d..00000000000
--- a/reactos/dll/keyboard/kbdbur/kbdbur.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdbur.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
index 4d9c588410f..81efd760fcb 100644
--- a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true">
-	<importlibrary definition="kbdbur.def" />
+	<importlibrary definition="kbdbur.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdbur.c</file>
 	<file>kbdbur.rc</file>
+	<file>kbdbur.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.spec b/reactos/dll/keyboard/kbdbur/kbdbur.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.def b/reactos/dll/keyboard/kbdcan/kbdcan.def
deleted file mode 100644
index 3f0ed6f0168..00000000000
--- a/reactos/dll/keyboard/kbdcan/kbdcan.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdcan.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
index 48bd041cbc3..9857e8f2f3b 100644
--- a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
+++ b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcan" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcan.dll" allowwarnings="true">
-	<importlibrary definition="kbdcan.def" />
+	<importlibrary definition="kbdcan.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcan.c</file>
 	<file>kbdcan.rc</file>
+	<file>kbdcan.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.spec b/reactos/dll/keyboard/kbdcan/kbdcan.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdcan/kbdcan.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.def b/reactos/dll/keyboard/kbdcr/kbdcr.def
deleted file mode 100644
index 2f63ec4826c..00000000000
--- a/reactos/dll/keyboard/kbdcr/kbdcr.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdcr.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
index 5ed8bb001ec..f709a9eb03c 100644
--- a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
+++ b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcr.dll" allowwarnings="true">
-	<importlibrary definition="kbdcr.def" />
+	<importlibrary definition="kbdcr.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcr.c</file>
 	<file>kbdcr.rc</file>
+	<file>kbdcr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.spec b/reactos/dll/keyboard/kbdcr/kbdcr.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdcr/kbdcr.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.def b/reactos/dll/keyboard/kbdcz1/kbdcz1.def
deleted file mode 100644
index 1a9a6c20957..00000000000
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdcz1.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
index ed6e50ae887..c9d22a60f84 100644
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
@@ -1,8 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcz1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true">
-	<importlibrary definition="kbdcz1.def" />
+	<importlibrary definition="kbdcz1.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdcz1.c</file>
 	<file>kbdcz1.rc</file>
+	<file>kbdcz1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.spec b/reactos/dll/keyboard/kbdcz1/kbdcz1.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdda/kbdda.def b/reactos/dll/keyboard/kbdda/kbdda.def
deleted file mode 100644
index 27d0cf710c0..00000000000
--- a/reactos/dll/keyboard/kbdda/kbdda.def
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY kbdda.dll
-EXPORTS
-KbdLayerDescriptor@0
diff --git a/reactos/dll/keyboard/kbdda/kbdda.rbuild b/reactos/dll/keyboard/kbdda/kbdda.rbuild
index 158320d2718..b3582afa281 100644
--- a/reactos/dll/keyboard/kbdda/kbdda.rbuild
+++ b/reactos/dll/keyboard/kbdda/kbdda.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdda" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true">
-	<importlibrary definition="kbdda.def" />
+	<importlibrary definition="kbdda.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdda.c</file>
 	<file>kbdda.rc</file>
+	<file>kbdda.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdda/kbdda.spec b/reactos/dll/keyboard/kbdda/kbdda.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdda/kbdda.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbddv/kbddv.def b/reactos/dll/keyboard/kbddv/kbddv.def
deleted file mode 100644
index c5c76997bc9..00000000000
--- a/reactos/dll/keyboard/kbddv/kbddv.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbddv.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbddv/kbddv.rbuild b/reactos/dll/keyboard/kbddv/kbddv.rbuild
index dadbcada6ed..89a765ca6a0 100644
--- a/reactos/dll/keyboard/kbddv/kbddv.rbuild
+++ b/reactos/dll/keyboard/kbddv/kbddv.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbddv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true">
-	<importlibrary definition="kbddv.def" />
+	<importlibrary definition="kbddv.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbddv.c</file>
 	<file>kbddv.rc</file>
+	<file>kbddv.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbddv/kbddv.spec b/reactos/dll/keyboard/kbddv/kbddv.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbddv/kbddv.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdes/kbdes.def b/reactos/dll/keyboard/kbdes/kbdes.def
deleted file mode 100644
index e475fe442c0..00000000000
--- a/reactos/dll/keyboard/kbdes/kbdes.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY kbdes.dll
-
-EXPORTS
-KbdLayerDescriptor@0
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdes/kbdes.rbuild b/reactos/dll/keyboard/kbdes/kbdes.rbuild
index b1f41d18836..45cfdf8cd34 100644
--- a/reactos/dll/keyboard/kbdes/kbdes.rbuild
+++ b/reactos/dll/keyboard/kbdes/kbdes.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdes" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true">
-	<importlibrary definition="kbdes.def" />
+	<importlibrary definition="kbdes.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdes.c</file>
 	<file>kbdes.rc</file>
+	<file>kbdes.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdes/kbdes.spec b/reactos/dll/keyboard/kbdes/kbdes.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdes/kbdes.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdest/kbdest.def b/reactos/dll/keyboard/kbdest/kbdest.def
deleted file mode 100644
index b3eae444615..00000000000
--- a/reactos/dll/keyboard/kbdest/kbdest.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdest.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdest/kbdest.rbuild b/reactos/dll/keyboard/kbdest/kbdest.rbuild
index 1af9e6986ac..39c3b196b6b 100644
--- a/reactos/dll/keyboard/kbdest/kbdest.rbuild
+++ b/reactos/dll/keyboard/kbdest/kbdest.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdest" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdest.dll" allowwarnings="true">
-	<importlibrary definition="kbdest.def" />
+	<importlibrary definition="kbdest.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdest.c</file>
 	<file>kbdest.rc</file>
+	<file>kbdest.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdest/kbdest.spec b/reactos/dll/keyboard/kbdest/kbdest.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdest/kbdest.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.def b/reactos/dll/keyboard/kbdfc/kbdfc.def
deleted file mode 100644
index 6e55ed40d9b..00000000000
--- a/reactos/dll/keyboard/kbdfc/kbdfc.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdfc.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
index 1830f18e6c0..7d20ce4c4b1 100644
--- a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
+++ b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfc.dll" allowwarnings="true">
-	<importlibrary definition="kbdfc.def" />
+	<importlibrary definition="kbdfc.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfc.c</file>
 	<file>kbdfc.rc</file>
+	<file>kbdfc.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.spec b/reactos/dll/keyboard/kbdfc/kbdfc.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdfc/kbdfc.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.def b/reactos/dll/keyboard/kbdfi/kbdfi.def
deleted file mode 100644
index 4ad11b5df1b..00000000000
--- a/reactos/dll/keyboard/kbdfi/kbdfi.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdfi.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
index cb801859e28..8def34916a1 100644
--- a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfi" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfi.dll" allowwarnings="true">
-	<importlibrary definition="kbdfi.def" />
+	<importlibrary definition="kbdfi.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfi.c</file>
 	<file>kbdfi.rc</file>
+	<file>kbdfi.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.spec b/reactos/dll/keyboard/kbdfi/kbdfi.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.def b/reactos/dll/keyboard/kbdfr/kbdfr.def
deleted file mode 100644
index a880573f8ca..00000000000
--- a/reactos/dll/keyboard/kbdfr/kbdfr.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdfr.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
index dfd9e99d638..3b9251409c1 100644
--- a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true">
-	<importlibrary definition="kbdfr.def" />
+	<importlibrary definition="kbdfr.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdfr.c</file>
 	<file>kbdfr.rc</file>
+	<file>kbdfr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.spec b/reactos/dll/keyboard/kbdfr/kbdfr.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.def b/reactos/dll/keyboard/kbdgeo/kbdgeo.def
deleted file mode 100644
index d32ef61a8d2..00000000000
--- a/reactos/dll/keyboard/kbdgeo/kbdgeo.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdgeo.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
index 73ea7494b0b..cf930f80c1b 100644
--- a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
+++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgeo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgeo.dll" allowwarnings="true">
-	<importlibrary definition="kbdgeo.def" />
+	<importlibrary definition="kbdgeo.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgeo.c</file>
 	<file>kbdgeo.rc</file>
+	<file>kbdgeo.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.spec b/reactos/dll/keyboard/kbdgeo/kbdgeo.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.def b/reactos/dll/keyboard/kbdgerg/kbdgerg.def
deleted file mode 100644
index fcc567eec63..00000000000
--- a/reactos/dll/keyboard/kbdgerg/kbdgerg.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdgerg.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
index edb55b8c96b..5f282da5e46 100644
--- a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
+++ b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgerg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgerg.dll" allowwarnings="true">
-	<importlibrary definition="kbdgerg.def" />
+	<importlibrary definition="kbdgerg.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgerg.c</file>
 	<file>kbdgerg.rc</file>
+	<file>kbdgerg.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.spec b/reactos/dll/keyboard/kbdgerg/kbdgerg.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdgerg/kbdgerg.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.def b/reactos/dll/keyboard/kbdgneo/kbdgneo.def
deleted file mode 100644
index 56245f911c4..00000000000
--- a/reactos/dll/keyboard/kbdgneo/kbdgneo.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdgneo.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
index 8356048e75d..44403a40538 100644
--- a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
+++ b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgneo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgneo.dll" allowwarnings="true">
-	<importlibrary definition="kbdgneo.def" />
+	<importlibrary definition="kbdgneo.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgneo.c</file>
 	<file>kbdgneo.rc</file>
+	<file>kbdgneo.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.spec b/reactos/dll/keyboard/kbdgneo/kbdgneo.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdgneo/kbdgneo.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.def b/reactos/dll/keyboard/kbdgr/kbdgr.def
deleted file mode 100644
index 7dc7cadfdad..00000000000
--- a/reactos/dll/keyboard/kbdgr/kbdgr.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdgr.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
index defc5c6591b..d992f6ec3e7 100644
--- a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
+++ b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true">
-	<importlibrary definition="kbdgr.def" />
+	<importlibrary definition="kbdgr.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgr.c</file>
 	<file>kbdgr.rc</file>
+	<file>kbdgr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.spec b/reactos/dll/keyboard/kbdgr/kbdgr.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdgr/kbdgr.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.def b/reactos/dll/keyboard/kbdgrist/kbdgrist.def
deleted file mode 100644
index 75a113eeab9..00000000000
--- a/reactos/dll/keyboard/kbdgrist/kbdgrist.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdgrist.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
index 9e01bd02996..5f228231848 100644
--- a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
+++ b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgrist" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgrist.dll" allowwarnings="true">
-	<importlibrary definition="kbdgrist.def" />
+	<importlibrary definition="kbdgrist.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdgrist.c</file>
 	<file>kbdgrist.rc</file>
+	<file>kbdgrist.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.spec b/reactos/dll/keyboard/kbdgrist/kbdgrist.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdgrist/kbdgrist.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.def b/reactos/dll/keyboard/kbdhe/kbdhe.def
deleted file mode 100644
index 53beb921709..00000000000
--- a/reactos/dll/keyboard/kbdhe/kbdhe.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdhe.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
index 167be200609..8dfa25cde1f 100644
--- a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true">
-	<importlibrary definition="kbdhe.def" />
+	<importlibrary definition="kbdhe.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdhe.c</file>
 	<file>kbdhe.rc</file>
-</module>
\ No newline at end of file
+	<file>kbdhe.spec</file>
+</module>
diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.spec b/reactos/dll/keyboard/kbdhe/kbdhe.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.def b/reactos/dll/keyboard/kbdheb/kbdheb.def
deleted file mode 100644
index 763d231df8e..00000000000
--- a/reactos/dll/keyboard/kbdheb/kbdheb.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdheb.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
index 6dbb9de501d..f163665fc92 100644
--- a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdheb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true">
-	<importlibrary definition="kbdheb.def" />
+	<importlibrary definition="kbdheb.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdheb.c</file>
 	<file>kbdheb.rc</file>
-</module>
\ No newline at end of file
+	<file>kbdheb.spec</file>
+</module>
diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.spec b/reactos/dll/keyboard/kbdheb/kbdheb.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.def b/reactos/dll/keyboard/kbdhu/kbdhu.def
deleted file mode 100644
index ff47310dfc4..00000000000
--- a/reactos/dll/keyboard/kbdhu/kbdhu.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdhu.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
index 89cb4f9f111..33d5a8ae5fa 100644
--- a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhu" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhu.dll" allowwarnings="true">
-	<importlibrary definition="kbdhu.def" />
+	<importlibrary definition="kbdhu.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdhu.c</file>
 	<file>kbdhu.rc</file>
+	<file>kbdhu.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.spec b/reactos/dll/keyboard/kbdhu/kbdhu.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdic/kbdic.def b/reactos/dll/keyboard/kbdic/kbdic.def
deleted file mode 100644
index 8dc0ec5bd0e..00000000000
--- a/reactos/dll/keyboard/kbdic/kbdic.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdic.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdic/kbdic.rbuild b/reactos/dll/keyboard/kbdic/kbdic.rbuild
index 9dd1f98aacf..ca14176da38 100644
--- a/reactos/dll/keyboard/kbdic/kbdic.rbuild
+++ b/reactos/dll/keyboard/kbdic/kbdic.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdic" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdic.dll" allowwarnings="true">
-	<importlibrary definition="kbdic.def" />
+	<importlibrary definition="kbdic.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdic.c</file>
 	<file>kbdic.rc</file>
+	<file>kbdic.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdic/kbdic.spec b/reactos/dll/keyboard/kbdic/kbdic.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdic/kbdic.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.def b/reactos/dll/keyboard/kbdinasa/kbdinasa.def
deleted file mode 100644
index 83539cf11df..00000000000
--- a/reactos/dll/keyboard/kbdinasa/kbdinasa.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdinasa.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
index 4e2d3508f03..eb093ceb3e8 100644
--- a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
+++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinasa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinasa.dll" allowwarnings="true">
-	<importlibrary definition="kbdinasa.def" />
+	<importlibrary definition="kbdinasa.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinasa.c</file>
 	<file>kbdinasa.rc</file>
+	<file>kbdinasa.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.spec b/reactos/dll/keyboard/kbdinasa/kbdinasa.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.def b/reactos/dll/keyboard/kbdinben/kbdinben.def
deleted file mode 100644
index accfe832a9a..00000000000
--- a/reactos/dll/keyboard/kbdinben/kbdinben.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdinben.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
index 80eef9e429b..418fbe7e0ae 100644
--- a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
+++ b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinben" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinben.dll" allowwarnings="true">
-	<importlibrary definition="kbdinben.def" />
+	<importlibrary definition="kbdinben.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinben.c</file>
 	<file>kbdinben.rc</file>
+	<file>kbdinben.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.spec b/reactos/dll/keyboard/kbdinben/kbdinben.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdinben/kbdinben.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.def b/reactos/dll/keyboard/kbdindev/kbdindev.def
deleted file mode 100644
index 411f47f0f50..00000000000
--- a/reactos/dll/keyboard/kbdindev/kbdindev.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdindev.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
index 7d9601e7401..67c41f377f3 100644
--- a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
+++ b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdindev" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdindev.dll" allowwarnings="true">
-	<importlibrary definition="kbdindev.def" />
+	<importlibrary definition="kbdindev.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdindev.c</file>
 	<file>kbdindev.rc</file>
+	<file>kbdindev.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.spec b/reactos/dll/keyboard/kbdindev/kbdindev.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdindev/kbdindev.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.def b/reactos/dll/keyboard/kbdinguj/kbdinguj.def
deleted file mode 100644
index 818755d1c79..00000000000
--- a/reactos/dll/keyboard/kbdinguj/kbdinguj.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdinguj.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
index d9825e4f2bf..aca7a777e64 100644
--- a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
+++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinguj" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinguj.dll" allowwarnings="true">
-	<importlibrary definition="kbdinguj.def" />
+	<importlibrary definition="kbdinguj.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinguj.c</file>
 	<file>kbdinguj.rc</file>
+	<file>kbdinguj.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.spec b/reactos/dll/keyboard/kbdinguj/kbdinguj.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.def b/reactos/dll/keyboard/kbdinmal/kbdinmal.def
deleted file mode 100644
index 38f6b588943..00000000000
--- a/reactos/dll/keyboard/kbdinmal/kbdinmal.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdinmal.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
index 08dcfd66a05..4d4f50b79fb 100644
--- a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
+++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinmal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinmal.dll" allowwarnings="true">
-	<importlibrary definition="kbdinmal.def" />
+	<importlibrary definition="kbdinmal.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdinmal.c</file>
 	<file>kbdinmal.rc</file>
+	<file>kbdinmal.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.spec b/reactos/dll/keyboard/kbdinmal/kbdinmal.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdir/kbdir.def b/reactos/dll/keyboard/kbdir/kbdir.def
deleted file mode 100644
index 182d0ef4a8a..00000000000
--- a/reactos/dll/keyboard/kbdir/kbdir.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdir.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdir/kbdir.rbuild b/reactos/dll/keyboard/kbdir/kbdir.rbuild
index 970766de56e..4d35719d649 100644
--- a/reactos/dll/keyboard/kbdir/kbdir.rbuild
+++ b/reactos/dll/keyboard/kbdir/kbdir.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdir" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdir.dll" allowwarnings="true">
-	<importlibrary definition="kbdir.def" />
+	<importlibrary definition="kbdir.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdir.c</file>
 	<file>kbdir.rc</file>
+	<file>kbdir.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdir/kbdir.spec b/reactos/dll/keyboard/kbdir/kbdir.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdir/kbdir.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdit/kbdit.def b/reactos/dll/keyboard/kbdit/kbdit.def
deleted file mode 100644
index 502a2eb8c09..00000000000
--- a/reactos/dll/keyboard/kbdit/kbdit.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY kbdit.dll
-
-EXPORTS
-KbdLayerDescriptor@0
diff --git a/reactos/dll/keyboard/kbdit/kbdit.rbuild b/reactos/dll/keyboard/kbdit/kbdit.rbuild
index 949d2e7786d..eeca81895ee 100644
--- a/reactos/dll/keyboard/kbdit/kbdit.rbuild
+++ b/reactos/dll/keyboard/kbdit/kbdit.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdit" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdit.dll" allowwarnings="true">
-	<importlibrary definition="kbdit.def" />
+	<importlibrary definition="kbdit.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdit.c</file>
 	<file>kbdit.rc</file>
+	<file>kbdit.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdit/kbdit.spec b/reactos/dll/keyboard/kbdit/kbdit.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdit/kbdit.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdja/kbdja.def b/reactos/dll/keyboard/kbdja/kbdja.def
deleted file mode 100644
index 6a67344ff6c..00000000000
--- a/reactos/dll/keyboard/kbdja/kbdja.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdja.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdja/kbdja.rbuild b/reactos/dll/keyboard/kbdja/kbdja.rbuild
index a1397301245..3453ab78d76 100644
--- a/reactos/dll/keyboard/kbdja/kbdja.rbuild
+++ b/reactos/dll/keyboard/kbdja/kbdja.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdja" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdja.dll" allowwarnings="true">
-	<importlibrary definition="kbdja.def" />
+	<importlibrary definition="kbdja.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdja.c</file>
 	<file>kbdja.rc</file>
+	<file>kbdja.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdja/kbdja.spec b/reactos/dll/keyboard/kbdja/kbdja.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdja/kbdja.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.def b/reactos/dll/keyboard/kbdkaz/kbdkaz.def
deleted file mode 100644
index 39d5df95ba3..00000000000
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdkaz.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
index fade6ac3aa8..646a0738040 100644
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdkaz" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdkaz.dll" allowwarnings="true">
-	<importlibrary definition="kbdkaz.def" />
+	<importlibrary definition="kbdkaz.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdkaz.c</file>
 	<file>kbdkaz.rc</file>
+	<file>kbdkaz.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.spec b/reactos/dll/keyboard/kbdkaz/kbdkaz.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdko/kbdko.def b/reactos/dll/keyboard/kbdko/kbdko.def
deleted file mode 100644
index cff55c480be..00000000000
--- a/reactos/dll/keyboard/kbdko/kbdko.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdko.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdko/kbdko.rbuild b/reactos/dll/keyboard/kbdko/kbdko.rbuild
index 195c2465803..f6ad227e060 100644
--- a/reactos/dll/keyboard/kbdko/kbdko.rbuild
+++ b/reactos/dll/keyboard/kbdko/kbdko.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdko" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdko.dll" allowwarnings="true">
-	<importlibrary definition="kbdko.def" />
+	<importlibrary definition="kbdko.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdko.c</file>
 	<file>kbdko.rc</file>
+	<file>kbdko.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdko/kbdko.spec b/reactos/dll/keyboard/kbdko/kbdko.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdko/kbdko.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdla/kbdla.def b/reactos/dll/keyboard/kbdla/kbdla.def
deleted file mode 100644
index 6f99c63510b..00000000000
--- a/reactos/dll/keyboard/kbdla/kbdla.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdla.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdla/kbdla.rbuild b/reactos/dll/keyboard/kbdla/kbdla.rbuild
index 8c0d35a99d5..f6eff54f57c 100644
--- a/reactos/dll/keyboard/kbdla/kbdla.rbuild
+++ b/reactos/dll/keyboard/kbdla/kbdla.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdla" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdla.dll" allowwarnings="true">
-	<importlibrary definition="kbdla.def" />
+	<importlibrary definition="kbdla.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdla.c</file>
 	<file>kbdla.rc</file>
+	<file>kbdla.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdla/kbdla.spec b/reactos/dll/keyboard/kbdla/kbdla.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdla/kbdla.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.def b/reactos/dll/keyboard/kbdlt/kbdlt.def
deleted file mode 100644
index 8076cd6bb01..00000000000
--- a/reactos/dll/keyboard/kbdlt/kbdlt.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdlt.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
index c24958fd8b8..682e2fcb547 100644
--- a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
@@ -1,8 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlt.dll" allowwarnings="true">
-	<importlibrary definition="kbdlt.def" />
+	<importlibrary definition="kbdlt.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdlt.c</file>
 	<file>kbdlt.rc</file>
+	<file>kbdlt.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.spec b/reactos/dll/keyboard/kbdlt/kbdlt.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.def b/reactos/dll/keyboard/kbdlv/kbdlv.def
deleted file mode 100644
index 22c07722923..00000000000
--- a/reactos/dll/keyboard/kbdlv/kbdlv.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdlv.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
index 1ef428e3145..9d099e8dc9f 100644
--- a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
+++ b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlv.dll" allowwarnings="true">
-	<importlibrary definition="kbdlv.def" />
+	<importlibrary definition="kbdlv.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdlv.c</file>
 	<file>kbdlv.rc</file>
+	<file>kbdlv.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.spec b/reactos/dll/keyboard/kbdlv/kbdlv.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdlv/kbdlv.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.def b/reactos/dll/keyboard/kbdmac/kbdmac.def
deleted file mode 100644
index 020260e6796..00000000000
--- a/reactos/dll/keyboard/kbdmac/kbdmac.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdmac.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
index 3aeb55c9716..ed855b1ed3c 100644
--- a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
+++ b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdmac" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdmac.dll" allowwarnings="true">
-	<importlibrary definition="kbdmac.def" />
+	<importlibrary definition="kbdmac.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdmac.c</file>
 	<file>kbdmac.rc</file>
+	<file>kbdmac.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.spec b/reactos/dll/keyboard/kbdmac/kbdmac.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdmac/kbdmac.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdne/kbdne.def b/reactos/dll/keyboard/kbdne/kbdne.def
deleted file mode 100644
index 443b275ca2e..00000000000
--- a/reactos/dll/keyboard/kbdne/kbdne.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdne.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdne/kbdne.rbuild b/reactos/dll/keyboard/kbdne/kbdne.rbuild
index 304736f25e5..926c5b01d61 100644
--- a/reactos/dll/keyboard/kbdne/kbdne.rbuild
+++ b/reactos/dll/keyboard/kbdne/kbdne.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdne" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdne.dll" allowwarnings="true">
-	<importlibrary definition="kbdne.def" />
+	<importlibrary definition="kbdne.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdne.c</file>
 	<file>kbdne.rc</file>
+	<file>kbdne.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdne/kbdne.spec b/reactos/dll/keyboard/kbdne/kbdne.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdne/kbdne.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdno/kbdno.def b/reactos/dll/keyboard/kbdno/kbdno.def
deleted file mode 100644
index 0e90fbc0428..00000000000
--- a/reactos/dll/keyboard/kbdno/kbdno.def
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY kbdno.dll
-EXPORTS
-KbdLayerDescriptor@0
diff --git a/reactos/dll/keyboard/kbdno/kbdno.rbuild b/reactos/dll/keyboard/kbdno/kbdno.rbuild
index da0ee5982b6..8c53f1afb43 100644
--- a/reactos/dll/keyboard/kbdno/kbdno.rbuild
+++ b/reactos/dll/keyboard/kbdno/kbdno.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdno" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true">
-	<importlibrary definition="kbdno.def" />
+	<importlibrary definition="kbdno.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdno.c</file>
 	<file>kbdno.rc</file>
+	<file>kbdno.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdno/kbdno.spec b/reactos/dll/keyboard/kbdno/kbdno.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdno/kbdno.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.def b/reactos/dll/keyboard/kbdpl1/kbdpl1.def
deleted file mode 100644
index eb8b6eeb5be..00000000000
--- a/reactos/dll/keyboard/kbdpl1/kbdpl1.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdpl1.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
index 175a0ba6484..c67bec16713 100644
--- a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
+++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true">
-	<importlibrary definition="kbdpl1.def" />
+	<importlibrary definition="kbdpl1.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdpl1.c</file>
 	<file>kbdpl1.rc</file>
+	<file>kbdpl1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.spec b/reactos/dll/keyboard/kbdpl1/kbdpl1.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.def b/reactos/dll/keyboard/kbdpo/kbdpo.def
deleted file mode 100644
index 3d2b976bdcd..00000000000
--- a/reactos/dll/keyboard/kbdpo/kbdpo.def
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY kbdpo.dll
-EXPORTS
-KbdLayerDescriptor@0
diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
index c325b8536cb..2610aff858f 100644
--- a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpo.dll" allowwarnings="true">
-	<importlibrary definition="kbdpo.def" />
+	<importlibrary definition="kbdpo.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdpo.c</file>
 	<file>kbdpo.rc</file>
+	<file>kbdpo.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.spec b/reactos/dll/keyboard/kbdpo/kbdpo.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdro/kbdro.def b/reactos/dll/keyboard/kbdro/kbdro.def
deleted file mode 100644
index fa55b031e4a..00000000000
--- a/reactos/dll/keyboard/kbdro/kbdro.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdro.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdro/kbdro.rbuild b/reactos/dll/keyboard/kbdro/kbdro.rbuild
index 05b23d6cf23..15fee3807ef 100644
--- a/reactos/dll/keyboard/kbdro/kbdro.rbuild
+++ b/reactos/dll/keyboard/kbdro/kbdro.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdro" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true">
-	<importlibrary definition="kbdro.def" />
+	<importlibrary definition="kbdro.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdro.c</file>
 	<file>kbdro.rc</file>
+	<file>kbdro.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdro/kbdro.spec b/reactos/dll/keyboard/kbdro/kbdro.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdro/kbdro.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdru/kbdru.def b/reactos/dll/keyboard/kbdru/kbdru.def
deleted file mode 100644
index 6f2972c8b00..00000000000
--- a/reactos/dll/keyboard/kbdru/kbdru.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdru.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdru/kbdru.rbuild b/reactos/dll/keyboard/kbdru/kbdru.rbuild
index d35756e1dc5..7d84ce5d932 100644
--- a/reactos/dll/keyboard/kbdru/kbdru.rbuild
+++ b/reactos/dll/keyboard/kbdru/kbdru.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true">
-	<importlibrary definition="kbdru.def" />
+	<importlibrary definition="kbdru.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdru.c</file>
 	<file>kbdru.rc</file>
+	<file>kbdru.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdru/kbdru.spec b/reactos/dll/keyboard/kbdru/kbdru.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdru/kbdru.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.def b/reactos/dll/keyboard/kbdru1/kbdru1.def
deleted file mode 100644
index 6f4776c3980..00000000000
--- a/reactos/dll/keyboard/kbdru1/kbdru1.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdru1.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
index ef96031a21a..104e57ba165 100644
--- a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
+++ b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true">
-	<importlibrary definition="kbdru1.def" />
+	<importlibrary definition="kbdru1.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdru1.c</file>
 	<file>kbdru1.rc</file>
+	<file>kbdru1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.spec b/reactos/dll/keyboard/kbdru1/kbdru1.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdru1/kbdru1.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.def b/reactos/dll/keyboard/kbdsg/kbdsg.def
deleted file mode 100644
index 529859364c2..00000000000
--- a/reactos/dll/keyboard/kbdsg/kbdsg.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdsg.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
index 7b88c28d423..dfb5dcabe71 100644
--- a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
+++ b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true">
-	<importlibrary definition="kbdsg.def" />
+	<importlibrary definition="kbdsg.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsg.c</file>
 	<file>kbdsg.rc</file>
+	<file>kbdsg.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.spec b/reactos/dll/keyboard/kbdsg/kbdsg.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdsg/kbdsg.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.def b/reactos/dll/keyboard/kbdsk/kbdsk.def
deleted file mode 100644
index b0600ad2ee2..00000000000
--- a/reactos/dll/keyboard/kbdsk/kbdsk.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdsk.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
index 1ca92a58d2f..db0938767a2 100644
--- a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true">
-	<importlibrary definition="kbdsk.def" />
+	<importlibrary definition="kbdsk.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsk.c</file>
 	<file>kbdsk.rc</file>
+	<file>kbdsk.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.spec b/reactos/dll/keyboard/kbdsk/kbdsk.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.def b/reactos/dll/keyboard/kbdsk1/kbdsk1.def
deleted file mode 100644
index 2157030c0a9..00000000000
--- a/reactos/dll/keyboard/kbdsk1/kbdsk1.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdsk1.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
index 49fc7a46bdb..e639566fd9c 100644
--- a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
+++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true">
-	<importlibrary definition="kbdsk1.def" />
+	<importlibrary definition="kbdsk1.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsk1.c</file>
 	<file>kbdsk1.rc</file>
+	<file>kbdsk1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.spec b/reactos/dll/keyboard/kbdsk1/kbdsk1.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.def b/reactos/dll/keyboard/kbdsw/kbdsw.def
deleted file mode 100644
index 6f6c4e514e0..00000000000
--- a/reactos/dll/keyboard/kbdsw/kbdsw.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdsw.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
index 45570b4f788..70733e95c0a 100644
--- a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true">
-	<importlibrary definition="kbdsw.def" />
+	<importlibrary definition="kbdsw.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdsw.c</file>
 	<file>kbdsw.rc</file>
+	<file>kbdsw.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.spec b/reactos/dll/keyboard/kbdsw/kbdsw.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.def b/reactos/dll/keyboard/kbdtat/kbdtat.def
deleted file mode 100644
index 32dfbadd26e..00000000000
--- a/reactos/dll/keyboard/kbdtat/kbdtat.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdtat.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
index 72678738cb7..b158a4bed4d 100644
--- a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
+++ b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtat" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true">
-	<importlibrary definition="kbdtat.def" />
+	<importlibrary definition="kbdtat.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdtat.c</file>
 	<file>kbdtat.rc</file>
+	<file>kbdtat.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.spec b/reactos/dll/keyboard/kbdtat/kbdtat.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdtat/kbdtat.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.def b/reactos/dll/keyboard/kbdth0/kbdth0.def
deleted file mode 100644
index 9516ffc4327..00000000000
--- a/reactos/dll/keyboard/kbdth0/kbdth0.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdth0.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
index 45318db0432..57dac75db54 100644
--- a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
+++ b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kbdth0" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth0.dll" allowwarnings="true">
-	<importlibrary definition="kbdth0.def" />
+<module name="kbdth0" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth0.dll" allowwarnings="true">
+	<importlibrary definition="kbdth0.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth0.c</file>
 	<file>kbdth0.rc</file>
+	<file>kbdth0.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.spec b/reactos/dll/keyboard/kbdth0/kbdth0.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth0/kbdth0.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.def b/reactos/dll/keyboard/kbdth1/kbdth1.def
deleted file mode 100644
index 02ecd264f3d..00000000000
--- a/reactos/dll/keyboard/kbdth1/kbdth1.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdth1.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
index 1b76f6fc5c0..918ccaef910 100644
--- a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
+++ b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kbdth1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth1.dll" allowwarnings="true">
-	<importlibrary definition="kbdth1.def" />
+<module name="kbdth1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth1.dll" allowwarnings="true">
+	<importlibrary definition="kbdth1.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth1.c</file>
 	<file>kbdth1.rc</file>
+	<file>kbdth1.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.spec b/reactos/dll/keyboard/kbdth1/kbdth1.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth1/kbdth1.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.def b/reactos/dll/keyboard/kbdth2/kbdth2.def
deleted file mode 100644
index e04b8b8467d..00000000000
--- a/reactos/dll/keyboard/kbdth2/kbdth2.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdth2.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
index e578b76c89a..23028cde79c 100644
--- a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true">
-	<importlibrary definition="kbdth2.def" />
+	<importlibrary definition="kbdth2.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth2.c</file>
 	<file>kbdth2.rc</file>
+	<file>kbdth2.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.spec b/reactos/dll/keyboard/kbdth2/kbdth2.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.def b/reactos/dll/keyboard/kbdth3/kbdth3.def
deleted file mode 100644
index 8f3e4662a9b..00000000000
--- a/reactos/dll/keyboard/kbdth3/kbdth3.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdth3.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
index 13266791d42..8d4599d7fbf 100644
--- a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
+++ b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kbdth3" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth3.dll" allowwarnings="true">
-	<importlibrary definition="kbdth3.def" />
+<module name="kbdth3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth3.dll" allowwarnings="true">
+	<importlibrary definition="kbdth3.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdth3.c</file>
 	<file>kbdth3.rc</file>
+	<file>kbdth3.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.spec b/reactos/dll/keyboard/kbdth3/kbdth3.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth3/kbdth3.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.def b/reactos/dll/keyboard/kbdtuf/kbdtuf.def
deleted file mode 100644
index 6d1e5808f5e..00000000000
--- a/reactos/dll/keyboard/kbdtuf/kbdtuf.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdtuf.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
index d57200cc540..5b0064c6adf 100644
--- a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
+++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuf" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true">
-	<importlibrary definition="kbdtuf.def" />
+	<importlibrary definition="kbdtuf.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdtuf.c</file>
 	<file>kbdtuf.rc</file>
+	<file>kbdtuf.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.spec b/reactos/dll/keyboard/kbdtuf/kbdtuf.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.def b/reactos/dll/keyboard/kbdtuq/kbdtuq.def
deleted file mode 100644
index 9846b631a03..00000000000
--- a/reactos/dll/keyboard/kbdtuq/kbdtuq.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdtuq.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
index bf2c1f56157..1cc516fcce8 100644
--- a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
+++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuq" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true">
-	<importlibrary definition="kbdtuq.def" />
+	<importlibrary definition="kbdtuq.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdtuq.c</file>
 	<file>kbdtuq.rc</file>
+	<file>kbdtuq.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.spec b/reactos/dll/keyboard/kbdtuq/kbdtuq.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbduk/kbduk.def b/reactos/dll/keyboard/kbduk/kbduk.def
deleted file mode 100644
index 984901486b1..00000000000
--- a/reactos/dll/keyboard/kbduk/kbduk.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbduk.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbduk/kbduk.rbuild b/reactos/dll/keyboard/kbduk/kbduk.rbuild
index dd1c50acab7..50cc9b84b18 100644
--- a/reactos/dll/keyboard/kbduk/kbduk.rbuild
+++ b/reactos/dll/keyboard/kbduk/kbduk.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true">
-	<importlibrary definition="kbduk.def" />
+	<importlibrary definition="kbduk.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbduk.c</file>
 	<file>kbduk.rc</file>
+	<file>kbduk.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbduk/kbduk.spec b/reactos/dll/keyboard/kbduk/kbduk.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbduk/kbduk.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdur/kbdur.def b/reactos/dll/keyboard/kbdur/kbdur.def
deleted file mode 100644
index 717b43c4bb0..00000000000
--- a/reactos/dll/keyboard/kbdur/kbdur.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdur.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdur/kbdur.rbuild b/reactos/dll/keyboard/kbdur/kbdur.rbuild
index 47975b35eea..c38ab572c03 100644
--- a/reactos/dll/keyboard/kbdur/kbdur.rbuild
+++ b/reactos/dll/keyboard/kbdur/kbdur.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true">
-	<importlibrary definition="kbdur.def" />
+	<importlibrary definition="kbdur.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdur.c</file>
 	<file>kbdur.rc</file>
+	<file>kbdur.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdur/kbdur.spec b/reactos/dll/keyboard/kbdur/kbdur.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdur/kbdur.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.def b/reactos/dll/keyboard/kbdurs/kbdurs.def
deleted file mode 100644
index 587658d268a..00000000000
--- a/reactos/dll/keyboard/kbdurs/kbdurs.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdurs.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
index 08d7239f29a..91c94bdb1ef 100644
--- a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
+++ b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdurs" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true">
-	<importlibrary definition="kbdurs.def" />
+	<importlibrary definition="kbdurs.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdurs.c</file>
 	<file>kbdurs.rc</file>
+	<file>kbdurs.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.spec b/reactos/dll/keyboard/kbdurs/kbdurs.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdurs/kbdurs.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdus/kbdus.def b/reactos/dll/keyboard/kbdus/kbdus.def
deleted file mode 100644
index 309f9bc6188..00000000000
--- a/reactos/dll/keyboard/kbdus/kbdus.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdus.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdus/kbdus.rbuild b/reactos/dll/keyboard/kbdus/kbdus.rbuild
index 4e0e24fc27e..42c7ca0e090 100644
--- a/reactos/dll/keyboard/kbdus/kbdus.rbuild
+++ b/reactos/dll/keyboard/kbdus/kbdus.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdus" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true">
-	<importlibrary definition="kbdus.def" />
+	<importlibrary definition="kbdus.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdus.c</file>
 	<file>kbdus.rc</file>
+	<file>kbdus.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdus/kbdus.spec b/reactos/dll/keyboard/kbdus/kbdus.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdus/kbdus.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.def b/reactos/dll/keyboard/kbdusa/kbdusa.def
deleted file mode 100644
index 1d065d8260c..00000000000
--- a/reactos/dll/keyboard/kbdusa/kbdusa.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdusa.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
index ba81f601ace..c9dc1b90799 100644
--- a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
+++ b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusa.dll" allowwarnings="true">
-	<importlibrary definition="kbdusa.def" />
+	<importlibrary definition="kbdusa.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusa.c</file>
 	<file>kbdusa.rc</file>
+	<file>kbdusa.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.spec b/reactos/dll/keyboard/kbdusa/kbdusa.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdusa/kbdusa.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.def b/reactos/dll/keyboard/kbdusl/kbdusl.def
deleted file mode 100644
index 1d5b0a9303e..00000000000
--- a/reactos/dll/keyboard/kbdusl/kbdusl.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdusl.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
index 1b96f09024b..80de56da78a 100644
--- a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
+++ b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true">
-	<importlibrary definition="kbdusl.def" />
+	<importlibrary definition="kbdusl.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusl.c</file>
 	<file>kbdusl.rc</file>
+	<file>kbdusl.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.spec b/reactos/dll/keyboard/kbdusl/kbdusl.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdusl/kbdusl.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.def b/reactos/dll/keyboard/kbdusr/kbdusr.def
deleted file mode 100644
index a64407986e2..00000000000
--- a/reactos/dll/keyboard/kbdusr/kbdusr.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdusr.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
index e45630ad744..3fa2412a282 100644
--- a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
+++ b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true">
-	<importlibrary definition="kbdusr.def" />
+	<importlibrary definition="kbdusr.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusr.c</file>
 	<file>kbdusr.rc</file>
+	<file>kbdusr.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.spec b/reactos/dll/keyboard/kbdusr/kbdusr.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdusr/kbdusr.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.def b/reactos/dll/keyboard/kbdusx/kbdusx.def
deleted file mode 100644
index 0620d16f7db..00000000000
--- a/reactos/dll/keyboard/kbdusx/kbdusx.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdusx.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
index bab07196b9a..c2eb6e9bece 100644
--- a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
+++ b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusx" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true">
-	<importlibrary definition="kbdusx.def" />
+	<importlibrary definition="kbdusx.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdusx.c</file>
 	<file>kbdusx.rc</file>
+	<file>kbdusx.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.spec b/reactos/dll/keyboard/kbdusx/kbdusx.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdusx/kbdusx.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.def b/reactos/dll/keyboard/kbduzb/kbduzb.def
deleted file mode 100644
index d0ebc72497c..00000000000
--- a/reactos/dll/keyboard/kbduzb/kbduzb.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbduzb.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
index 24b1e7430ce..cf995a05315 100644
--- a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
+++ b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduzb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true">
-	<importlibrary definition="kbduzb.def" />
+	<importlibrary definition="kbduzb.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbduzb.c</file>
 	<file>kbduzb.rc</file>
+	<file>kbduzb.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.spec b/reactos/dll/keyboard/kbduzb/kbduzb.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbduzb/kbduzb.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.def b/reactos/dll/keyboard/kbdvntc/kbdvntc.def
deleted file mode 100644
index c5850fa73c0..00000000000
--- a/reactos/dll/keyboard/kbdvntc/kbdvntc.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdvntc.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
index 220e0aa1763..472e3f9ce11 100644
--- a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
+++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdvntc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true">
-	<importlibrary definition="kbdvntc.def" />
+	<importlibrary definition="kbdvntc.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdvntc.c</file>
 	<file>kbdvntc.rc</file>
+	<file>kbdvntc.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.spec b/reactos/dll/keyboard/kbdvntc/kbdvntc.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.def b/reactos/dll/keyboard/kbdycc/kbdycc.def
deleted file mode 100644
index 20e1dd29d00..00000000000
--- a/reactos/dll/keyboard/kbdycc/kbdycc.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdycc.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
index 55191d630af..bc81aa50ea5 100644
--- a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
+++ b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true">
-	<importlibrary definition="kbdycc.def" />
+	<importlibrary definition="kbdycc.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdycc.c</file>
 	<file>kbdycc.rc</file>
+	<file>kbdycc.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.spec b/reactos/dll/keyboard/kbdycc/kbdycc.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdycc/kbdycc.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file
diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.def b/reactos/dll/keyboard/kbdycl/kbdycl.def
deleted file mode 100644
index 147c20aaa57..00000000000
--- a/reactos/dll/keyboard/kbdycl/kbdycl.def
+++ /dev/null
@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdycl.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF
diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
index 2a26e60817f..4da9d79adb4 100644
--- a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
+++ b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true">
-	<importlibrary definition="kbdycl.def" />
+	<importlibrary definition="kbdycl.spec.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<file>kbdycl.c</file>
 	<file>kbdycl.rc</file>
+	<file>kbdycl.spec</file>
 </module>
diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.spec b/reactos/dll/keyboard/kbdycl/kbdycl.spec
new file mode 100644
index 00000000000..e1c7a26c1c4
--- /dev/null
+++ b/reactos/dll/keyboard/kbdycl/kbdycl.spec
@@ -0,0 +1 @@
+@ stdcall KbdLayerDescriptor()
\ No newline at end of file