diff --git a/tools/make_specfiles b/tools/make_specfiles
index 594e01396db..fb8c9f90377 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -118,13 +118,12 @@ my @dll_groups =
  [
   "advapi32",
   "api-ms-win-core-localregistry-l1-1-0",
-  "api-ms-win-downlevel-advapi32-l1-1-0",
-  "api-ms-win-downlevel-advapi32-l2-1-0",
-  "api-ms-win-security-base-l1-1-0",
   "api-ms-win-core-registry-l1-1-0",
   "api-ms-win-core-registry-l2-1-0",
   "api-ms-win-core-registry-l2-2-0",
   "api-ms-win-core-shutdown-l1-1-0",
+  "api-ms-win-downlevel-advapi32-l1-1-0",
+  "api-ms-win-downlevel-advapi32-l2-1-0",
   "api-ms-win-eventing-classicprovider-l1-1-0",
   "api-ms-win-eventing-consumer-l1-1-0",
   "api-ms-win-eventing-controller-l1-1-0",
@@ -133,6 +132,7 @@ my @dll_groups =
   "api-ms-win-eventlog-legacy-l1-1-0",
   "api-ms-win-perf-legacy-l1-1-0",
   "api-ms-win-security-audit-l1-1-1",
+  "api-ms-win-security-base-l1-1-0",
   "api-ms-win-security-base-l1-2-0",
   "api-ms-win-security-base-private-l1-1-1",
   "api-ms-win-security-credentials-l1-1-0",
@@ -208,10 +208,15 @@ my @dll_groups =
   "api-ms-win-appmodel-identity-l1-1-0",
   "api-ms-win-appmodel-runtime-l1-1-0",
   "api-ms-win-appmodel-runtime-l1-1-1",
-  "api-ms-win-downlevel-normaliz-l1-1-0",
   "api-ms-win-core-appcompat-l1-1-1",
   "api-ms-win-core-atoms-l1-1-0",
   "api-ms-win-core-comm-l1-1-0",
+  "api-ms-win-core-console-l1-1-0",
+  "api-ms-win-core-console-l1-2-0",
+  "api-ms-win-core-console-l2-1-0",
+  "api-ms-win-core-console-l3-2-0",
+  "api-ms-win-core-datetime-l1-1-0",
+  "api-ms-win-core-datetime-l1-1-1",
   "api-ms-win-core-debug-l1-1-0",
   "api-ms-win-core-debug-l1-1-1",
   "api-ms-win-core-delayload-l1-1-0",
@@ -220,40 +225,24 @@ my @dll_groups =
   "api-ms-win-core-errorhandling-l1-1-1",
   "api-ms-win-core-errorhandling-l1-1-2",
   "api-ms-win-core-errorhandling-l1-1-3",
-  "api-ms-win-core-interlocked-l1-1-0",
-  "api-ms-win-core-interlocked-l1-2-0",
-  "api-ms-win-core-misc-l1-1-0",
-  "api-ms-win-core-profile-l1-1-0",
-  "api-ms-win-core-realtime-l1-1-0",
-  "api-ms-win-core-realtime-l1-1-1",
-  "api-ms-win-core-sidebyside-l1-1-0",
-  "api-ms-win-core-string-l1-1-0",
-  "api-ms-win-core-string-obsolete-l1-1-0",
-  "api-ms-win-core-sysinfo-l1-1-0",
-  "api-ms-win-core-sysinfo-l1-2-0",
-  "api-ms-win-core-util-l1-1-0",
-  "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",
-  "api-ms-win-core-synch-l1-2-1",
-  "api-ms-win-core-console-l1-1-0",
-  "api-ms-win-core-console-l1-2-0",
-  "api-ms-win-core-console-l2-1-0",
-  "api-ms-win-core-console-l3-2-0",
+  "api-ms-win-core-fibers-l1-1-0",
+  "api-ms-win-core-fibers-l1-1-1",
+  "api-ms-win-core-file-ansi-l2-1-0",
+  "api-ms-win-core-file-fromapp-l1-1-0",
   "api-ms-win-core-file-l1-1-0",
-  "api-ms-win-core-file-l1-2-1",
   "api-ms-win-core-file-l1-2-0",
+  "api-ms-win-core-file-l1-2-1",
   "api-ms-win-core-file-l1-2-2",
   "api-ms-win-core-file-l2-1-0",
   "api-ms-win-core-file-l2-1-1",
   "api-ms-win-core-file-l2-1-2",
-  "api-ms-win-core-file-ansi-l2-1-0",
-  "api-ms-win-core-file-fromapp-l1-1-0",
   "api-ms-win-core-handle-l1-1-0",
   "api-ms-win-core-heap-l1-1-0",
   "api-ms-win-core-heap-l1-2-0",
   "api-ms-win-core-heap-l2-1-0",
   "api-ms-win-core-heap-obsolete-l1-1-0",
+  "api-ms-win-core-interlocked-l1-1-0",
+  "api-ms-win-core-interlocked-l1-2-0",
   "api-ms-win-core-io-l1-1-0",
   "api-ms-win-core-io-l1-1-1",
   "api-ms-win-core-job-l1-1-0",
@@ -269,6 +258,8 @@ my @dll_groups =
   "api-ms-win-core-libraryloader-l2-1-0",
   "api-ms-win-core-localization-l1-1-0",
   "api-ms-win-core-localization-l1-2-0",
+  "api-ms-win-core-localization-l1-2-1",
+  "api-ms-win-core-localization-l1-2-2",
   "api-ms-win-core-localization-l2-1-0",
   "api-ms-win-core-localization-obsolete-l1-1-0",
   "api-ms-win-core-localization-obsolete-l1-2-0",
@@ -279,36 +270,44 @@ my @dll_groups =
   "api-ms-win-core-memory-l1-1-2",
   "api-ms-win-core-memory-l1-1-3",
   "api-ms-win-core-memory-l1-1-4",
+  "api-ms-win-core-misc-l1-1-0",
   "api-ms-win-core-namespace-l1-1-0",
   "api-ms-win-core-normalization-l1-1-0",
   "api-ms-win-core-privateprofile-l1-1-1",
   "api-ms-win-core-processenvironment-l1-1-0",
   "api-ms-win-core-processenvironment-l1-2-0",
-  "api-ms-win-core-psapi-l1-1-0",
+  "api-ms-win-core-processtopology-l1-1-0",
+  "api-ms-win-core-processtopology-obsolete-l1-1-0",
+  "api-ms-win-core-profile-l1-1-0",
   "api-ms-win-core-psapi-ansi-l1-1-0",
+  "api-ms-win-core-psapi-l1-1-0",
   "api-ms-win-core-psapi-obsolete-l1-1-0",
+  "api-ms-win-core-realtime-l1-1-0",
+  "api-ms-win-core-realtime-l1-1-1",
+  "api-ms-win-core-sidebyside-l1-1-0",
+  "api-ms-win-core-string-l1-1-0",
+  "api-ms-win-core-string-obsolete-l1-1-0",
+  "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",
+  "api-ms-win-core-synch-l1-2-1",
+  "api-ms-win-core-sysinfo-l1-1-0",
+  "api-ms-win-core-sysinfo-l1-2-0",
+  "api-ms-win-core-sysinfo-l1-2-1",
   "api-ms-win-core-threadpool-l1-1-0",
   "api-ms-win-core-threadpool-l1-2-0",
   "api-ms-win-core-threadpool-legacy-l1-1-0",
   "api-ms-win-core-threadpool-private-l1-1-0",
   "api-ms-win-core-timezone-l1-1-0",
   "api-ms-win-core-toolhelp-l1-1-0",
-  "api-ms-win-core-sysinfo-l1-2-1",
-  "api-ms-win-core-fibers-l1-1-0",
-  "api-ms-win-core-fibers-l1-1-1",
-  "api-ms-win-core-localization-l1-2-1",
-  "api-ms-win-core-localization-l1-2-2",
-  "api-ms-win-core-datetime-l1-1-0",
-  "api-ms-win-core-datetime-l1-1-1",
+  "api-ms-win-core-util-l1-1-0",
   "api-ms-win-core-windowserrorreporting-l1-1-0",
   "api-ms-win-core-windowserrorreporting-l1-1-1",
   "api-ms-win-core-wow64-l1-1-0",
   "api-ms-win-core-wow64-l1-1-1",
   "api-ms-win-core-xstate-l2-1-0",
-  "api-ms-win-core-processtopology-l1-1-0",
-  "api-ms-win-core-processtopology-obsolete-l1-1-0",
-  "api-ms-win-core-util-l1-1-0",
   "api-ms-win-downlevel-kernel32-l2-1-0",
+  "api-ms-win-downlevel-normaliz-l1-1-0",
   "ext-ms-win-kernel32-package-current-l1-1-0",
   "ext-ms-win-kernel32-package-l1-1-1",
  ],
@@ -353,9 +352,9 @@ my @dll_groups =
  ],
  [
   "ole32",
-  "api-ms-win-downlevel-ole32-l1-1-0",
   "api-ms-win-core-com-l1-1-0",
   "api-ms-win-core-com-l1-1-1",
+  "api-ms-win-downlevel-ole32-l1-1-0",
   "iprop",
  ],
  [
@@ -374,11 +373,11 @@ my @dll_groups =
   "shcore",
   "shell32",
   "api-ms-win-shcore-obsolete-l1-1-0",
-  "api-ms-win-shcore-thread-l1-1-0",
-  "api-ms-win-shcore-stream-l1-1-0",
-  "api-ms-win-shcore-stream-winrt-l1-1-0",
   "api-ms-win-shcore-scaling-l1-1-0",
   "api-ms-win-shcore-scaling-l1-1-1",
+  "api-ms-win-shcore-stream-l1-1-0",
+  "api-ms-win-shcore-stream-winrt-l1-1-0",
+  "api-ms-win-shcore-thread-l1-1-0",
  ],
  [
   "shell32",
@@ -389,21 +388,23 @@ my @dll_groups =
  ],
  [
   "shlwapi",
-  "api-ms-win-downlevel-shlwapi-l1-1-0",
-  "api-ms-win-downlevel-shlwapi-l2-1-0",
   "api-ms-win-core-registryuserspecific-l1-1-0",
   "api-ms-win-core-shlwapi-legacy-l1-1-0",
   "api-ms-win-core-shlwapi-obsolete-l1-1-0",
   "api-ms-win-core-shlwapi-obsolete-l1-2-0",
   "api-ms-win-core-url-l1-1-0",
+  "api-ms-win-downlevel-shlwapi-l1-1-0",
+  "api-ms-win-downlevel-shlwapi-l2-1-0",
  ],
  [
   "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-core-string-l2-1-0",
   "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",
   "api-ms-win-rtcore-ntuser-draw-l1-1-0",
   "api-ms-win-rtcore-ntuser-private-l1-1-0",
   "api-ms-win-rtcore-ntuser-private-l1-1-4",
@@ -425,14 +426,12 @@ my @dll_groups =
   "ext-ms-win-ntuser-private-l1-1-1",
   "ext-ms-win-ntuser-private-l1-3-1",
   "ext-ms-win-ntuser-rectangle-ext-l1-1-0",
-  "api-ms-win-ntuser-rectangle-l1-1-0",
-  "api-ms-win-ntuser-sysparams-l1-1-0",
   "ext-ms-win-ntuser-uicontext-ext-l1-1-0",
-  "ext-ms-win-ntuser-windowclass-l1-1-0",
-  "ext-ms-win-ntuser-windowclass-l1-1-1",
   "ext-ms-win-ntuser-window-l1-1-0",
   "ext-ms-win-ntuser-window-l1-1-1",
   "ext-ms-win-ntuser-window-l1-1-4",
+  "ext-ms-win-ntuser-windowclass-l1-1-0",
+  "ext-ms-win-ntuser-windowclass-l1-1-1",
   "ext-ms-win-rtcore-ntuser-cursor-l1-1-0",
   "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0",
   "ext-ms-win-rtcore-ntuser-dpi-l1-1-0",
@@ -443,10 +442,10 @@ my @dll_groups =
  ],
  [
   "version",
-  "api-ms-win-core-versionansi-l1-1-0",
   "api-ms-win-core-version-l1-1-0",
   "api-ms-win-core-version-l1-1-1",
   "api-ms-win-core-version-private-l1-1-0",
+  "api-ms-win-core-versionansi-l1-1-0",
   "api-ms-win-downlevel-version-l1-1-0",
  ],
  [
@@ -461,10 +460,10 @@ my @dll_groups =
   "ntdll",
   "ntoskrnl.exe",
   "api-ms-win-core-apiquery-l1-1-0",
-  "api-ms-win-core-rtlsupport-l1-1-0",
-  "api-ms-win-core-rtlsupport-l1-2-0",
   "api-ms-win-core-crt-l1-1-0",
   "api-ms-win-core-crt-l2-1-0",
+  "api-ms-win-core-rtlsupport-l1-1-0",
+  "api-ms-win-core-rtlsupport-l1-2-0",
  ],
  [
   "gdi32",