diff --git a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec
index 22209490162..5cf62867e40 100644
--- a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec
+++ b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec
@@ -1,10 +1,10 @@
-@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW
-@ stdcall CharLowerW(wstr) user32.CharLowerW
-@ stdcall CharNextW(wstr) user32.CharNextW
-@ stdcall CharPrevW(wstr wstr) user32.CharPrevW
-@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW
-@ stdcall CharUpperW(wstr) user32.CharUpperW
-@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW
-@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW
-@ stdcall IsCharLowerW(long) user32.IsCharLowerW
-@ stdcall IsCharUpperW(long) user32.IsCharUpperW
+@ stdcall CharLowerBuffW(wstr long) kernelbase.CharLowerBuffW
+@ stdcall CharLowerW(wstr) kernelbase.CharLowerW
+@ stdcall CharNextW(wstr) kernelbase.CharNextW
+@ stdcall CharPrevW(wstr wstr) kernelbase.CharPrevW
+@ stdcall CharUpperBuffW(wstr long) kernelbase.CharUpperBuffW
+@ stdcall CharUpperW(wstr) kernelbase.CharUpperW
+@ stdcall IsCharAlphaNumericW(long) kernelbase.IsCharAlphaNumericW
+@ stdcall IsCharAlphaW(long) kernelbase.IsCharAlphaW
+@ stdcall IsCharLowerW(long) kernelbase.IsCharLowerW
+@ stdcall IsCharUpperW(long) kernelbase.IsCharUpperW
diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec
index 2c58a160f13..ac8e1d07399 100644
--- a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec
+++ b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec
@@ -1,12 +1,12 @@
-@ stdcall CharLowerA(str) user32.CharLowerA
-@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA
-@ stdcall CharNextA(str) user32.CharNextA
-@ stdcall CharNextExA(long str long) user32.CharNextExA
-@ stdcall CharPrevA(str str) user32.CharPrevA
-@ stdcall CharPrevExA(long str str long) user32.CharPrevExA
-@ stdcall CharUpperA(str) user32.CharUpperA
-@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA
-@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA
-@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA
-@ stdcall IsCharLowerA(long) user32.IsCharLowerA
-@ stdcall IsCharUpperA(long) user32.IsCharUpperA
+@ stdcall CharLowerA(str) kernelbase.CharLowerA
+@ stdcall CharLowerBuffA(str long) kernelbase.CharLowerBuffA
+@ stdcall CharNextA(str) kernelbase.CharNextA
+@ stdcall CharNextExA(long str long) kernelbase.CharNextExA
+@ stdcall CharPrevA(str str) kernelbase.CharPrevA
+@ stdcall CharPrevExA(long str str long) kernelbase.CharPrevExA
+@ stdcall CharUpperA(str) kernelbase.CharUpperA
+@ stdcall CharUpperBuffA(str long) kernelbase.CharUpperBuffA
+@ stdcall IsCharAlphaA(long) kernelbase.IsCharAlphaA
+@ stdcall IsCharAlphaNumericA(long) kernelbase.IsCharAlphaNumericA
+@ stdcall IsCharLowerA(long) kernelbase.IsCharLowerA
+@ stdcall IsCharUpperA(long) kernelbase.IsCharUpperA
diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec
index a60736e055d..c944882a64b 100644
--- a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec
+++ b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec
@@ -1,2 +1,2 @@
-@ stdcall LoadStringA(long long ptr long) user32.LoadStringA
-@ stdcall LoadStringW(long long ptr long) user32.LoadStringW
+@ stdcall LoadStringA(long long ptr long) kernelbase.LoadStringA
+@ stdcall LoadStringW(long long ptr long) kernelbase.LoadStringW
diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec
index 182d964b9ca..9d716d596e1 100644
--- a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec
+++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec
@@ -1,22 +1,22 @@
-@ stdcall CharLowerA(str) user32.CharLowerA
-@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA
-@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW
-@ stdcall CharLowerW(wstr) user32.CharLowerW
-@ stdcall CharNextA(str) user32.CharNextA
-@ stdcall CharNextExA(long str long) user32.CharNextExA
-@ stdcall CharNextW(wstr) user32.CharNextW
-@ stdcall CharPrevA(str str) user32.CharPrevA
-@ stdcall CharPrevExA(long str str long) user32.CharPrevExA
-@ stdcall CharPrevW(wstr wstr) user32.CharPrevW
-@ stdcall CharUpperA(str) user32.CharUpperA
-@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA
-@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW
-@ stdcall CharUpperW(wstr) user32.CharUpperW
-@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA
-@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA
-@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW
-@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW
-@ stdcall IsCharLowerA(long) user32.IsCharLowerA
-@ stdcall IsCharLowerW(long) user32.IsCharLowerW
-@ stdcall IsCharUpperA(long) user32.IsCharUpperA
-@ stdcall IsCharUpperW(long) user32.IsCharUpperW
+@ stdcall CharLowerA(str) kernelbase.CharLowerA
+@ stdcall CharLowerBuffA(str long) kernelbase.CharLowerBuffA
+@ stdcall CharLowerBuffW(wstr long) kernelbase.CharLowerBuffW
+@ stdcall CharLowerW(wstr) kernelbase.CharLowerW
+@ stdcall CharNextA(str) kernelbase.CharNextA
+@ stdcall CharNextExA(long str long) kernelbase.CharNextExA
+@ stdcall CharNextW(wstr) kernelbase.CharNextW
+@ stdcall CharPrevA(str str) kernelbase.CharPrevA
+@ stdcall CharPrevExA(long str str long) kernelbase.CharPrevExA
+@ stdcall CharPrevW(wstr wstr) kernelbase.CharPrevW
+@ stdcall CharUpperA(str) kernelbase.CharUpperA
+@ stdcall CharUpperBuffA(str long) kernelbase.CharUpperBuffA
+@ stdcall CharUpperBuffW(wstr long) kernelbase.CharUpperBuffW
+@ stdcall CharUpperW(wstr) kernelbase.CharUpperW
+@ stdcall IsCharAlphaA(long) kernelbase.IsCharAlphaA
+@ stdcall IsCharAlphaNumericA(long) kernelbase.IsCharAlphaNumericA
+@ stdcall IsCharAlphaNumericW(long) kernelbase.IsCharAlphaNumericW
+@ stdcall IsCharAlphaW(long) kernelbase.IsCharAlphaW
+@ stdcall IsCharLowerA(long) kernelbase.IsCharLowerA
+@ stdcall IsCharLowerW(long) kernelbase.IsCharLowerW
+@ stdcall IsCharUpperA(long) kernelbase.IsCharUpperA
+@ stdcall IsCharUpperW(long) kernelbase.IsCharUpperW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 56e746d256d..915241e2797 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -286,6 +286,9 @@ my @dll_groups =
   "api-ms-win-core-shlwapi-obsolete-l1-2-0",
   "api-ms-win-core-sidebyside-l1-1-0",
   "api-ms-win-core-string-l1-1-0",
+  "api-ms-win-core-string-l2-1-0",
+  "api-ms-win-core-stringansi-l1-1-0",
+  "api-ms-win-core-stringloader-l1-1-1",
   "api-ms-win-core-synch-ansi-l1-1-0",
   "api-ms-win-core-synch-l1-1-0",
   "api-ms-win-core-synch-l1-2-0",
@@ -309,6 +312,7 @@ my @dll_groups =
   "api-ms-win-downlevel-advapi32-l1-1-0",
   "api-ms-win-downlevel-normaliz-l1-1-0",
   "api-ms-win-downlevel-shlwapi-l1-1-0",
+  "api-ms-win-downlevel-user32-l1-1-0",
   "api-ms-win-eventing-classicprovider-l1-1-0",
   "api-ms-win-eventing-provider-l1-1-0",
   "api-ms-win-security-base-l1-1-0",
@@ -391,10 +395,6 @@ my @dll_groups =
  ],
  [
   "user32",
-  "api-ms-win-core-string-l2-1-0",
-  "api-ms-win-core-stringansi-l1-1-0",
-  "api-ms-win-core-stringloader-l1-1-1",
-  "api-ms-win-downlevel-user32-l1-1-0",
   "api-ms-win-ntuser-dc-access-l1-1-0",
   "api-ms-win-ntuser-rectangle-l1-1-0",
   "api-ms-win-ntuser-sysparams-l1-1-0",