diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index c917b2a..1eb56e2 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1805,37 +1805,60 @@
 %/libmincore.a: lib-common/mincore.mri \
 		%/libapi-ms-win-core-com-l1-1-1.a \
 		%/libapi-ms-win-core-com-midlproxystub-l1-1-0.a \
+		%/libapi-ms-win-core-com-l1-1-0.a \
 		%/libapi-ms-win-core-comm-l1-1-0.a \
+		%/libapi-ms-win-core-comm-l1-1-1.a \
+		%/libapi-ms-win-core-comm-l1-1-2.a \
 		%/libapi-ms-win-core-console-l1-1-0.a \
+		%/libapi-ms-win-core-console-l1-2-0.a \
+		%/libapi-ms-win-core-console-l2-1-0.a \
+		%/libapi-ms-win-core-console-l2-2-0.a \
+		%/libapi-ms-win-core-console-l2-3-0.a \
 		%/libapi-ms-win-core-datetime-l1-1-0.a \
 		%/libapi-ms-win-core-datetime-l1-1-1.a \
 		%/libapi-ms-win-core-datetime-l1-1-2.a \
+		%/libapi-ms-win-core-debug-l1-1-0.a \
 		%/libapi-ms-win-core-debug-l1-1-1.a \
 		%/libapi-ms-win-core-delayload-l1-1-1.a \
+		%/libapi-ms-win-core-errorhandling-l1-1-0.a \
 		%/libapi-ms-win-core-errorhandling-l1-1-1.a \
 		%/libapi-ms-win-core-errorhandling-l1-1-3.a \
 		%/libapi-ms-win-core-fibers-l1-1-1.a \
 		%/libapi-ms-win-core-file-ansi-l2-1-0.a \
+		%/libapi-ms-win-core-file-l1-1-0.a \
 		%/libapi-ms-win-core-file-l1-2-1.a \
 		%/libapi-ms-win-core-file-l1-2-2.a \
 		%/libapi-ms-win-core-file-l2-1-0.a \
 		%/libapi-ms-win-core-file-l2-1-1.a \
+		%/libapi-ms-win-core-file-l2-1-2.a \
+		%/libapi-ms-win-core-firmware-l1-1-0.a \
 		%/libapi-ms-win-core-handle-l1-1-0.a \
+		%/libapi-ms-win-core-heap-l1-2-0.a \
+		%/libapi-ms-win-core-interlocked-l1-1-0.a \
 		%/libapi-ms-win-core-interlocked-l1-2-0.a \
 		%/libapi-ms-win-core-io-l1-1-0.a \
 		%/libapi-ms-win-core-io-l1-1-1.a \
 		%/libapi-ms-win-core-libraryloader-l1-2-0.a \
+		%/libapi-ms-win-core-libraryloader-l1-2-1.a \
 		%/libapi-ms-win-core-libraryloader-l2-1-0.a \
 		%/libapi-ms-win-core-localization-l1-2-1.a \
+		%/libapi-ms-win-core-localization-l1-2-0.a \
 		%/libapi-ms-win-core-localization-l1-2-2.a \
 		%/libapi-ms-win-core-localization-l2-1-0.a \
+		%/libapi-ms-win-core-memory-l1-1-0.a \
+		%/libapi-ms-win-core-memory-l1-1-1.a \
 		%/libapi-ms-win-core-memory-l1-1-2.a \
 		%/libapi-ms-win-core-memory-l1-1-3.a \
+		%/libapi-ms-win-core-memory-l1-1-5.a \
+		%/libapi-ms-win-core-memory-l1-1-6.a \
+		%/libapi-ms-win-core-memory-l1-1-7.a \
 		%/libapi-ms-win-core-namedpipe-ansi-l1-1-0.a \
 		%/libapi-ms-win-core-namedpipe-ansi-l1-1-1.a \
 		%/libapi-ms-win-core-namedpipe-l1-1-0.a \
 		%/libapi-ms-win-core-namedpipe-l1-2-1.a \
 		%/libapi-ms-win-core-namedpipe-l1-2-2.a \
+		%/libapi-ms-win-core-namespace-l1-1-0.a \
+		%/libapi-ms-win-core-path-l1-1-0.a \
 		%/libapi-ms-win-core-processenvironment-l1-1-0.a \
 		%/libapi-ms-win-core-processenvironment-l1-2-0.a \
 		%/libapi-ms-win-core-processthreads-l1-1-0.a \
@@ -1844,26 +1867,42 @@
 		%/libapi-ms-win-core-processthreads-l1-1-3.a \
 		%/libapi-ms-win-core-psapi-ansi-l1-1-0.a \
 		%/libapi-ms-win-core-profile-l1-1-0.a \
+		%/libapi-ms-win-core-psapi-l1-1-0.a \
 		%/libapi-ms-win-core-realtime-l1-1-0.a \
 		%/libapi-ms-win-core-realtime-l1-1-1.a \
+		%/libapi-ms-win-core-realtime-l1-1-2.a \
 		%/libapi-ms-win-core-rtlsupport-l1-2-0.a \
 		%/libapi-ms-win-core-string-l1-1-0.a \
+		%/libapi-ms-win-core-synch-l1-1-0.a \
 		%/libapi-ms-win-core-synch-l1-2-0.a \
 		%/libapi-ms-win-core-synch-l1-2-1.a \
+		%/libapi-ms-win-core-sysinfo-l1-1-0.a \
+		%/libapi-ms-win-core-sysinfo-l1-2-0.a \
 		%/libapi-ms-win-core-sysinfo-l1-2-1.a \
 		%/libapi-ms-win-core-sysinfo-l1-2-3.a \
 		%/libapi-ms-win-core-threadpool-l1-2-0.a \
 		%/libapi-ms-win-core-timezone-l1-1-0.a \
+		%/libapi-ms-win-core-timezone-l1-1-1.a \
 		%/libapi-ms-win-core-util-l1-1-0.a \
+		%/libapi-ms-win-core-version-l1-1-0.a \
 		%/libapi-ms-win-core-version-l1-1-1.a \
 		%/libapi-ms-win-core-winrt-error-l1-1-1.a \
 		%/libapi-ms-win-core-winrt-l1-1-0.a \
 		%/libapi-ms-win-core-winrt-string-l1-1-0.a \
+		%/libapi-ms-win-core-wow64-l1-1-0.a \
+		%/libapi-ms-win-core-wow64-l1-1-1.a \
 		%/libapi-ms-win-core-xstate-l2-1-0.a \
+		%/libapi-ms-win-devices-config-l1-1-1.a \
+		%/libapi-ms-win-devices-config-l1-1-2.a \
 		%/libapi-ms-win-eventing-classicprovider-l1-1-0.a \
 		%/libapi-ms-win-eventing-consumer-l1-1-0.a \
 		%/libapi-ms-win-eventing-controller-l1-1-0.a \
 		%/libapi-ms-win-eventing-provider-l1-1-0.a \
+		%/libapi-ms-win-security-base-l1-1-0.a \
+		%/libapi-ms-win-security-base-l1-2-0.a \
+		%/libapi-ms-win-security-base-l1-2-1.a \
+		%/libapi-ms-win-security-lsalookup-l2-1-0.a \
+		%/libapi-ms-win-security-sddl-l1-1-0.a \
 		%/libauthz.a \
 		%/libbcrypt.a \
 		%/libcabinet.a \
diff --git a/mingw-w64-crt/lib-common/mincore.mri b/mingw-w64-crt/lib-common/mincore.mri
index a7546ca..5ed0464 100644
--- a/mingw-w64-crt/lib-common/mincore.mri
+++ b/mingw-w64-crt/lib-common/mincore.mri
@@ -1,74 +1,74 @@
 CREATE libmincore.a
-; FIXME libapi-ms-win-core-com-l1-1-0.a
+ADDLIB libapi-ms-win-core-com-l1-1-0.a
 ADDLIB libapi-ms-win-core-com-l1-1-1.a
 ; FIXME libapi-ms-win-core-com-l1-1-2.a
 ADDLIB libapi-ms-win-core-com-midlproxystub-l1-1-0.a
 ADDLIB libapi-ms-win-core-comm-l1-1-0.a
-; FIXME libapi-ms-win-core-comm-l1-1-1.a
-; FIXME libapi-ms-win-core-comm-l1-1-2.a
+ADDLIB libapi-ms-win-core-comm-l1-1-1.a
+ADDLIB libapi-ms-win-core-comm-l1-1-2.a
 ADDLIB libapi-ms-win-core-console-l1-1-0.a
-; FIXME libapi-ms-win-core-console-l1-2-0.a
+ADDLIB libapi-ms-win-core-console-l1-2-0.a
 ; FIXME libapi-ms-win-core-console-l1-2-1.a
-; FIXME libapi-ms-win-core-console-l2-1-0.a
-; FIXME libapi-ms-win-core-console-l2-2-0.a
-; FIXME libapi-ms-win-core-console-l3-2-0.a
+ADDLIB libapi-ms-win-core-console-l2-1-0.a
+ADDLIB libapi-ms-win-core-console-l2-2-0.a
+ADDLIB libapi-ms-win-core-console-l3-2-0.a
 ADDLIB libapi-ms-win-core-datetime-l1-1-0.a
 ADDLIB libapi-ms-win-core-datetime-l1-1-1.a
 ADDLIB libapi-ms-win-core-datetime-l1-1-2.a
-; FIXME libapi-ms-win-core-debug-l1-1-0.a
+ADDLIB libapi-ms-win-core-debug-l1-1-0.a
 ADDLIB libapi-ms-win-core-debug-l1-1-1.a
 ; FIXME libapi-ms-win-core-debug-l1-1-2.a
 ; FIXME libapi-ms-win-core-delayload-l1-1-0.a
 ADDLIB libapi-ms-win-core-delayload-l1-1-1.a
-; FIXME libapi-ms-win-core-errorhandling-l1-1-0.a
+ADDLIB libapi-ms-win-core-errorhandling-l1-1-0.a
 ADDLIB libapi-ms-win-core-errorhandling-l1-1-1.a
 ; FIXME libapi-ms-win-core-errorhandling-l1-1-2.a
 ADDLIB libapi-ms-win-core-errorhandling-l1-1-3.a
 ; FIXME libapi-ms-win-core-fibers-l1-1-0.a
 ADDLIB libapi-ms-win-core-fibers-l1-1-1.a
 ADDLIB libapi-ms-win-core-file-ansi-l2-1-0.a
-; FIXME libapi-ms-win-core-file-l1-1-0.a
+ADDLIB libapi-ms-win-core-file-l1-1-0.a
 ; FIXME libapi-ms-win-core-file-l1-2-0.a
 ADDLIB libapi-ms-win-core-file-l1-2-1.a
 ADDLIB libapi-ms-win-core-file-l1-2-2.a
 ; FIXME libapi-ms-win-core-file-l1-2-3.a
 ADDLIB libapi-ms-win-core-file-l2-1-0.a
 ADDLIB libapi-ms-win-core-file-l2-1-1.a
-; FIXME libapi-ms-win-core-file-l2-1-2.a
+ADDLIB libapi-ms-win-core-file-l2-1-2.a
 ; FIXME libapi-ms-win-core-file-l2-1-3.a
-; FIXME libapi-ms-win-core-firmware-l1-1-0.a
+ADDLIB libapi-ms-win-core-firmware-l1-1-0.a
 ADDLIB libapi-ms-win-core-handle-l1-1-0.a
 ; FIXME libapi-ms-win-core-heap-l1-1-0.a
-; FIXME libapi-ms-win-core-heap-l2-1-0.a
-; FIXME libapi-ms-win-core-interlocked-l1-1-0.a
+ADDLIB libapi-ms-win-core-heap-l1-2-0.a
+ADDLIB libapi-ms-win-core-interlocked-l1-1-0.a
 ADDLIB libapi-ms-win-core-interlocked-l1-2-0.a
 ADDLIB libapi-ms-win-core-io-l1-1-0.a
 ADDLIB libapi-ms-win-core-io-l1-1-1.a
 ; FIXME libapi-ms-win-core-job-l1-1-0.a
 ADDLIB libapi-ms-win-core-libraryloader-l1-2-0.a
-; FIXME libapi-ms-win-core-libraryloader-l1-2-1.a
+ADDLIB libapi-ms-win-core-libraryloader-l1-2-1.a
 ; FIXME libapi-ms-win-core-libraryloader-l1-2-2.a
 ADDLIB libapi-ms-win-core-libraryloader-l2-1-0.a
-; FIXME libapi-ms-win-core-localization-l1-2-0.a
+ADDLIB libapi-ms-win-core-localization-l1-2-0.a
 ADDLIB libapi-ms-win-core-localization-l1-2-1.a
 ADDLIB libapi-ms-win-core-localization-l1-2-2.a
 ; FIXME libapi-ms-win-core-localization-l1-2-3.a
 ADDLIB libapi-ms-win-core-localization-l2-1-0.a
-; FIXME libapi-ms-win-core-memory-l1-1-0.a
-; FIXME libapi-ms-win-core-memory-l1-1-1.a
+ADDLIB libapi-ms-win-core-memory-l1-1-0.a
+ADDLIB libapi-ms-win-core-memory-l1-1-1.a
 ADDLIB libapi-ms-win-core-memory-l1-1-2.a
 ADDLIB libapi-ms-win-core-memory-l1-1-3.a
 ; FIXME libapi-ms-win-core-memory-l1-1-4.a
-; FIXME libapi-ms-win-core-memory-l1-1-5.a
-; FIXME libapi-ms-win-core-memory-l1-1-6.a
-; FIXME libapi-ms-win-core-memory-l1-1-7.a
+ADDLIB libapi-ms-win-core-memory-l1-1-5.a
+ADDLIB libapi-ms-win-core-memory-l1-1-6.a
+ADDLIB libapi-ms-win-core-memory-l1-1-7.a
 ADDLIB libapi-ms-win-core-namedpipe-ansi-l1-1-0.a
 ADDLIB libapi-ms-win-core-namedpipe-ansi-l1-1-1.a
 ADDLIB libapi-ms-win-core-namedpipe-l1-1-0.a
 ADDLIB libapi-ms-win-core-namedpipe-l1-2-1.a
 ADDLIB libapi-ms-win-core-namedpipe-l1-2-2.a
-; FIXME libapi-ms-win-core-namespace-l1-1-0.a
-; FIXME libapi-ms-win-core-path-l1-1-0.a
+ADDLIB libapi-ms-win-core-namespace-l1-1-0.a
+ADDLIB libapi-ms-win-core-path-l1-1-0.a
 ADDLIB libapi-ms-win-core-processenvironment-l1-1-0.a
 ADDLIB libapi-ms-win-core-processenvironment-l1-2-0.a
 ; FIXME libapi-ms-win-core-processsnapshot-l1-1-0.a
@@ -78,13 +78,13 @@
 ADDLIB libapi-ms-win-core-processthreads-l1-1-3.a
 ; FIXME libapi-ms-win-core-processtopology-l1-1-0.a
 ADDLIB libapi-ms-win-core-profile-l1-1-0.a
-; FIXME libapi-ms-win-core-psapi-l1-1-0.a
+ADDLIB libapi-ms-win-core-psapi-l1-1-0.a
 ADDLIB libapi-ms-win-core-psapi-ansi-l1-1-0.a
 ; FIXME libapi-ms-win-core-quirks-l1-1-0.a
 ; FIXME libapi-ms-win-core-quirks-l1-1-1.a
 ADDLIB libapi-ms-win-core-realtime-l1-1-0.a
 ADDLIB libapi-ms-win-core-realtime-l1-1-1.a
-; FIXME libapi-ms-win-core-realtime-l1-1-2.a
+ADDLIB libapi-ms-win-core-realtime-l1-1-2.a
 ; FIXME libapi-ms-win-core-registry-l1-1-0.a
 ; FIXME libapi-ms-win-core-registry-l1-1-1.a
 ; FIXME libapi-ms-win-core-registry-l1-1-2.a
@@ -95,11 +95,11 @@
 ADDLIB libapi-ms-win-core-string-l1-1-0.a
 ; FIXME libapi-ms-win-core-string-l2-1-0.a
 ; FIXME libapi-ms-win-core-string-l2-1-1.a
-; FIXME libapi-ms-win-core-synch-l1-1-0.a
+ADDLIB libapi-ms-win-core-synch-l1-1-0.a
 ADDLIB libapi-ms-win-core-synch-l1-2-0.a
 ADDLIB libapi-ms-win-core-synch-l1-2-1.a
-; FIXME libapi-ms-win-core-sysinfo-l1-1-0.a
-; FIXME libapi-ms-win-core-sysinfo-l1-2-0.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-1-0.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-2-0.a
 ADDLIB libapi-ms-win-core-sysinfo-l1-2-1.a
 ; FIXME libapi-ms-win-core-sysinfo-l1-2-2.a
 ADDLIB libapi-ms-win-core-sysinfo-l1-2-3.a
@@ -109,18 +109,18 @@
 ; FIXME libapi-ms-win-core-systemtopology-l1-1-1.a
 ADDLIB libapi-ms-win-core-threadpool-l1-2-0.a
 ADDLIB libapi-ms-win-core-timezone-l1-1-0.a
-; FIXME libapi-ms-win-core-timezone-l1-1-1.a
+ADDLIB libapi-ms-win-core-timezone-l1-1-1.a
 ADDLIB libapi-ms-win-core-util-l1-1-0.a
 ; FIXME libapi-ms-win-core-util-l1-1-1.a
-; FIXME libapi-ms-win-core-version-l1-1-0.a
+ADDLIB libapi-ms-win-core-version-l1-1-0.a
 ADDLIB libapi-ms-win-core-version-l1-1-1.a
 ; FIXME libapi-ms-win-core-winrt-error-l1-1-0.a
 ADDLIB libapi-ms-win-core-winrt-error-l1-1-1.a
 ADDLIB libapi-ms-win-core-winrt-l1-1-0.a
 ADDLIB libapi-ms-win-core-winrt-string-l1-1-0.a
 ; FIXME libapi-ms-win-core-winrt-string-l1-1-1.a
-; FIXME libapi-ms-win-core-wow64-l1-1-0.a
-; FIXME libapi-ms-win-core-wow64-l1-1-1.a
+ADDLIB libapi-ms-win-core-wow64-l1-1-0.a
+ADDLIB libapi-ms-win-core-wow64-l1-1-1.a
 ; FIXME libapi-ms-win-core-wow64-l1-1-2.a
 ; FIXME libapi-ms-win-core-xstate-l1-1-0.a
 ; FIXME libapi-ms-win-core-xstate-l1-1-1.a
@@ -128,8 +128,8 @@
 ; FIXME libapi-ms-win-core-xstate-l1-1-3.a
 ADDLIB libapi-ms-win-core-xstate-l2-1-0.a
 ; FIXME libapi-ms-win-core-xstate-l2-1-1.a
-; FIXME libapi-ms-win-devices-config-l1-1-1.a
-; FIXME libapi-ms-win-devices-config-l1-1-2.a
+ADDLIB libapi-ms-win-devices-config-l1-1-1.a
+ADDLIB libapi-ms-win-devices-config-l1-1-2.a
 ; FIXME libapi-ms-win-devices-swdevice-l1-1-0.a
 ; FIXME libapi-ms-win-devices-swdevice-l1-1-1.a
 ADDLIB libapi-ms-win-eventing-classicprovider-l1-1-0.a
@@ -141,14 +141,14 @@
 ; FIXME libapi-ms-win-power-setting-l1-1-0.a
 ; FIXME libapi-ms-win-power-setting-l1-1-1.a
 ; FIXME libapi-ms-win-security-appcontainer-l1-1-0.a
-; FIXME libapi-ms-win-security-base-l1-1-0.a
-; FIXME libapi-ms-win-security-base-l1-2-0.a
-; FIXME libapi-ms-win-security-base-l1-2-1.a
+ADDLIB libapi-ms-win-security-base-l1-1-0.a
+ADDLIB libapi-ms-win-security-base-l1-2-0.a
+ADDLIB libapi-ms-win-security-base-l1-2-1.a
 ; FIXME libapi-ms-win-security-base-l1-2-2.a
 ; FIXME libapi-ms-win-security-credentials-l1-1-0.a
-; FIXME libapi-ms-win-security-lsalookup-l2-1-0.a
+ADDLIB libapi-ms-win-security-lsalookup-l2-1-0.a
 ; FIXME libapi-ms-win-security-lsalookup-l2-1-1.a
-; FIXME libapi-ms-win-security-sddl-l1-1-0.a
+ADDLIB libapi-ms-win-security-sddl-l1-1-0.a
 ; FIXME libapi-ms-win-service-core-l1-1-0.a
 ; FIXME libapi-ms-win-service-core-l1-1-1.a
 ; FIXME libapi-ms-win-service-core-l1-1-2.a