diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index e8bdeba..f04ccf2 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -2311,12 +2311,12 @@
 		%/libapi-ms-win-core-localization-l2-1-0_windowsapp.a \
 		%/libapi-ms-win-core-localization-obsolete-l1-2-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-1_windowsapp.a \
+		%/libapi-ms-win-core-memory-l1-1-2_windowsapp.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-5_windowsapp.a \
 		%/libapi-ms-win-core-memory-l1-1-6.a \
-		%/libapi-ms-win-core-memory-l1-1-7.a \
+		%/libapi-ms-win-core-memory-l1-1-7_windowsapp.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 \
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1.def
index f494ef2..a0435f7 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1.def
@@ -3,18 +3,24 @@
 EXPORTS
 
 CreateFileMappingFromApp
+CreateFileMappingNumaW
 CreateFileMappingW
+CreateMemoryResourceNotification
 FlushViewOfFile
 GetLargePageMinimum
 GetProcessWorkingSetSizeEx
+GetSystemFileCacheSize
 GetWriteWatch
 MapViewOfFile
 MapViewOfFileEx
 MapViewOfFileFromApp
 OpenFileMappingW
+PrefetchVirtualMemory
+QueryMemoryResourceNotification
 ReadProcessMemory
 ResetWriteWatch
 SetProcessWorkingSetSizeEx
+SetSystemFileCacheSize
 UnmapViewOfFile
 UnmapViewOfFileEx
 VirtualAlloc
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1_windowsapp.def
new file mode 100644
index 0000000..f494ef2
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-1_windowsapp.def
@@ -0,0 +1,30 @@
+LIBRARY api-ms-win-core-memory-l1-1-1
+
+EXPORTS
+
+CreateFileMappingFromApp
+CreateFileMappingW
+FlushViewOfFile
+GetLargePageMinimum
+GetProcessWorkingSetSizeEx
+GetWriteWatch
+MapViewOfFile
+MapViewOfFileEx
+MapViewOfFileFromApp
+OpenFileMappingW
+ReadProcessMemory
+ResetWriteWatch
+SetProcessWorkingSetSizeEx
+UnmapViewOfFile
+UnmapViewOfFileEx
+VirtualAlloc
+VirtualAllocEx
+VirtualFree
+VirtualFreeEx
+VirtualLock
+VirtualProtect
+VirtualProtectEx
+VirtualQuery
+VirtualQueryEx
+VirtualUnlock
+WriteProcessMemory
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2.def
index 1d63780..12721ae 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2.def
@@ -2,13 +2,18 @@
 
 EXPORTS
 
+AllocateUserPhysicalPages
+AllocateUserPhysicalPagesNuma
 CreateFileMappingFromApp
 CreateFileMappingW
 DiscardVirtualMemory
 FlushViewOfFile
+FreeUserPhysicalPages
 GetLargePageMinimum
+GetMemoryErrorHandlingCapabilities
 GetProcessWorkingSetSizeEx
 GetWriteWatch
+MapUserPhysicalPages
 MapViewOfFile
 MapViewOfFileEx
 MapViewOfFileFromApp
@@ -16,12 +21,15 @@
 OpenFileMappingW
 ReadProcessMemory
 ReclaimVirtualMemory
+RegisterBadMemoryNotification
 ResetWriteWatch
 SetProcessWorkingSetSizeEx
 UnmapViewOfFile
 UnmapViewOfFileEx
+UnregisterBadMemoryNotification
 VirtualAlloc
 VirtualAllocEx
+VirtualAllocExNuma
 VirtualFree
 VirtualFreeEx
 VirtualLock
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2_windowsapp.def
new file mode 100644
index 0000000..1d63780
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-2_windowsapp.def
@@ -0,0 +1,33 @@
+LIBRARY api-ms-win-core-memory-l1-1-2
+
+EXPORTS
+
+CreateFileMappingFromApp
+CreateFileMappingW
+DiscardVirtualMemory
+FlushViewOfFile
+GetLargePageMinimum
+GetProcessWorkingSetSizeEx
+GetWriteWatch
+MapViewOfFile
+MapViewOfFileEx
+MapViewOfFileFromApp
+OfferVirtualMemory
+OpenFileMappingW
+ReadProcessMemory
+ReclaimVirtualMemory
+ResetWriteWatch
+SetProcessWorkingSetSizeEx
+UnmapViewOfFile
+UnmapViewOfFileEx
+VirtualAlloc
+VirtualAllocEx
+VirtualFree
+VirtualFreeEx
+VirtualLock
+VirtualProtect
+VirtualProtectEx
+VirtualQuery
+VirtualQueryEx
+VirtualUnlock
+WriteProcessMemory
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5.def
index c85f4b1..7f31d4d 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5.def
@@ -12,6 +12,7 @@
 MapViewOfFile
 MapViewOfFileEx
 MapViewOfFileFromApp
+MapViewOfFileNuma2
 OfferVirtualMemory
 OpenFileMappingFromApp
 OpenFileMappingW
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5_windowsapp.def
new file mode 100644
index 0000000..c85f4b1
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-5_windowsapp.def
@@ -0,0 +1,39 @@
+LIBRARY api-ms-win-core-memory-l1-1-5
+
+EXPORTS
+
+CreateFileMappingFromApp
+CreateFileMappingW
+DiscardVirtualMemory
+FlushViewOfFile
+GetLargePageMinimum
+GetProcessWorkingSetSizeEx
+GetWriteWatch
+MapViewOfFile
+MapViewOfFileEx
+MapViewOfFileFromApp
+OfferVirtualMemory
+OpenFileMappingFromApp
+OpenFileMappingW
+ReadProcessMemory
+ReclaimVirtualMemory
+ResetWriteWatch
+SetProcessValidCallTargets
+SetProcessWorkingSetSizeEx
+UnmapViewOfFile
+UnmapViewOfFile2
+UnmapViewOfFileEx
+VirtualAlloc
+VirtualAllocEx
+VirtualAllocFromApp
+VirtualFree
+VirtualFreeEx
+VirtualLock
+VirtualProtect
+VirtualProtectEx
+VirtualProtectFromApp
+VirtualQuery
+VirtualQueryEx
+VirtualUnlock
+VirtualUnlockEx
+WriteProcessMemory
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7.def
index 8966c0d..245bf8c 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7.def
@@ -2,6 +2,7 @@
 
 EXPORTS
 
+CreateFileMapping2
 CreateFileMappingFromApp
 CreateFileMappingW
 DiscardVirtualMemory
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7_windowsapp.def
new file mode 100644
index 0000000..8966c0d
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-memory-l1-1-7_windowsapp.def
@@ -0,0 +1,42 @@
+LIBRARY api-ms-win-core-memory-l1-1-7
+
+EXPORTS
+
+CreateFileMappingFromApp
+CreateFileMappingW
+DiscardVirtualMemory
+FlushViewOfFile
+GetLargePageMinimum
+GetProcessWorkingSetSizeEx
+GetWriteWatch
+MapViewOfFile
+MapViewOfFile3FromApp
+MapViewOfFileEx
+MapViewOfFileFromApp
+OfferVirtualMemory
+OpenFileMappingFromApp
+OpenFileMappingW
+ReadProcessMemory
+ReclaimVirtualMemory
+ResetWriteWatch
+SetProcessValidCallTargets
+SetProcessValidCallTargetsForMappedView
+SetProcessWorkingSetSizeEx
+UnmapViewOfFile
+UnmapViewOfFile2
+UnmapViewOfFileEx
+VirtualAlloc
+VirtualAlloc2FromApp
+VirtualAllocEx
+VirtualAllocFromApp
+VirtualFree
+VirtualFreeEx
+VirtualLock
+VirtualProtect
+VirtualProtectEx
+VirtualProtectFromApp
+VirtualQuery
+VirtualQueryEx
+VirtualUnlock
+VirtualUnlockEx
+WriteProcessMemory
diff --git a/mingw-w64-crt/lib-common/windowsapp.mri b/mingw-w64-crt/lib-common/windowsapp.mri
index 2a341e6..50a961b 100644
--- a/mingw-w64-crt/lib-common/windowsapp.mri
+++ b/mingw-w64-crt/lib-common/windowsapp.mri
@@ -72,12 +72,12 @@
 ADDLIB libapi-ms-win-core-localization-l2-1-0_windowsapp.a
 ADDLIB libapi-ms-win-core-localization-obsolete-l1-2-0.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-1_windowsapp.a
+ADDLIB libapi-ms-win-core-memory-l1-1-2_windowsapp.a
 ADDLIB libapi-ms-win-core-memory-l1-1-3.a
-ADDLIB libapi-ms-win-core-memory-l1-1-5.a
+ADDLIB libapi-ms-win-core-memory-l1-1-5_windowsapp.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-memory-l1-1-7_windowsapp.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
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1.def
index fa3e9b4..9339681 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1.def
@@ -3,18 +3,24 @@
 EXPORTS
 
 CreateFileMappingFromApp@24
+CreateFileMappingNumaW@28
 CreateFileMappingW@24
+CreateMemoryResourceNotification@4
 FlushViewOfFile@8
 GetLargePageMinimum@0
 GetProcessWorkingSetSizeEx@16
+GetSystemFileCacheSize@12
 GetWriteWatch@24
 MapViewOfFile@20
 MapViewOfFileEx@24
 MapViewOfFileFromApp@20
 OpenFileMappingW@12
+PrefetchVirtualMemory@16
+QueryMemoryResourceNotification@8
 ReadProcessMemory@20
 ResetWriteWatch@8
 SetProcessWorkingSetSizeEx@16
+SetSystemFileCacheSize@12
 UnmapViewOfFile@4
 UnmapViewOfFileEx@8
 VirtualAlloc@16
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1_windowsapp.def
new file mode 100644
index 0000000..fa3e9b4
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-1_windowsapp.def
@@ -0,0 +1,30 @@
+LIBRARY api-ms-win-core-memory-l1-1-1
+
+EXPORTS
+
+CreateFileMappingFromApp@24
+CreateFileMappingW@24
+FlushViewOfFile@8
+GetLargePageMinimum@0
+GetProcessWorkingSetSizeEx@16
+GetWriteWatch@24
+MapViewOfFile@20
+MapViewOfFileEx@24
+MapViewOfFileFromApp@20
+OpenFileMappingW@12
+ReadProcessMemory@20
+ResetWriteWatch@8
+SetProcessWorkingSetSizeEx@16
+UnmapViewOfFile@4
+UnmapViewOfFileEx@8
+VirtualAlloc@16
+VirtualAllocEx@20
+VirtualFree@12
+VirtualFreeEx@16
+VirtualLock@8
+VirtualProtect@16
+VirtualProtectEx@20
+VirtualQuery@12
+VirtualQueryEx@16
+VirtualUnlock@8
+WriteProcessMemory@20
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2.def
index f179d77..e2bb989 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2.def
@@ -2,13 +2,18 @@
 
 EXPORTS
 
+AllocateUserPhysicalPages@12
+AllocateUserPhysicalPagesNuma@16
 CreateFileMappingFromApp@24
 CreateFileMappingW@24
 DiscardVirtualMemory@8
 FlushViewOfFile@8
+FreeUserPhysicalPages@12
 GetLargePageMinimum@0
+GetMemoryErrorHandlingCapabilities@4
 GetProcessWorkingSetSizeEx@16
 GetWriteWatch@24
+MapUserPhysicalPages@12
 MapViewOfFile@20
 MapViewOfFileEx@24
 MapViewOfFileFromApp@20
@@ -16,12 +21,15 @@
 OpenFileMappingW@12
 ReadProcessMemory@20
 ReclaimVirtualMemory@8
+RegisterBadMemoryNotification@4
 ResetWriteWatch@8
 SetProcessWorkingSetSizeEx@16
 UnmapViewOfFile@4
 UnmapViewOfFileEx@8
+UnregisterBadMemoryNotification@4
 VirtualAlloc@16
 VirtualAllocEx@20
+VirtualAllocExNuma@24
 VirtualFree@12
 VirtualFreeEx@16
 VirtualLock@8
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2_windowsapp.def
new file mode 100644
index 0000000..f179d77
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-2_windowsapp.def
@@ -0,0 +1,33 @@
+LIBRARY api-ms-win-core-memory-l1-1-2
+
+EXPORTS
+
+CreateFileMappingFromApp@24
+CreateFileMappingW@24
+DiscardVirtualMemory@8
+FlushViewOfFile@8
+GetLargePageMinimum@0
+GetProcessWorkingSetSizeEx@16
+GetWriteWatch@24
+MapViewOfFile@20
+MapViewOfFileEx@24
+MapViewOfFileFromApp@20
+OfferVirtualMemory@12
+OpenFileMappingW@12
+ReadProcessMemory@20
+ReclaimVirtualMemory@8
+ResetWriteWatch@8
+SetProcessWorkingSetSizeEx@16
+UnmapViewOfFile@4
+UnmapViewOfFileEx@8
+VirtualAlloc@16
+VirtualAllocEx@20
+VirtualFree@12
+VirtualFreeEx@16
+VirtualLock@8
+VirtualProtect@16
+VirtualProtectEx@20
+VirtualQuery@12
+VirtualQueryEx@16
+VirtualUnlock@8
+WriteProcessMemory@20
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-4.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-4.def
index 71caef9..33391b8 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-4.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-4.def
@@ -15,6 +15,7 @@
 OfferVirtualMemory@12
 OpenFileMappingFromApp@12
 OpenFileMappingW@12
+QueryVirtualMemoryInformation@24
 ReadProcessMemory@20
 ReclaimVirtualMemory@8
 ResetWriteWatch@8
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5.def
index 13cf678..2fae8c9 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5.def
@@ -12,6 +12,7 @@
 MapViewOfFile@20
 MapViewOfFileEx@24
 MapViewOfFileFromApp@20
+MapViewOfFileNuma2@36
 OfferVirtualMemory@12
 OpenFileMappingFromApp@12
 OpenFileMappingW@12
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5_windowsapp.def
new file mode 100644
index 0000000..13cf678
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-5_windowsapp.def
@@ -0,0 +1,39 @@
+LIBRARY api-ms-win-core-memory-l1-1-5
+
+EXPORTS
+
+CreateFileMappingFromApp@24
+CreateFileMappingW@24
+DiscardVirtualMemory@8
+FlushViewOfFile@8
+GetLargePageMinimum@0
+GetProcessWorkingSetSizeEx@16
+GetWriteWatch@24
+MapViewOfFile@20
+MapViewOfFileEx@24
+MapViewOfFileFromApp@20
+OfferVirtualMemory@12
+OpenFileMappingFromApp@12
+OpenFileMappingW@12
+ReadProcessMemory@20
+ReclaimVirtualMemory@8
+ResetWriteWatch@8
+SetProcessValidCallTargets@20
+SetProcessWorkingSetSizeEx@16
+UnmapViewOfFile@4
+UnmapViewOfFile2@12
+UnmapViewOfFileEx@8
+VirtualAlloc@16
+VirtualAllocEx@20
+VirtualAllocFromApp@16
+VirtualFree@12
+VirtualFreeEx@16
+VirtualLock@8
+VirtualProtect@16
+VirtualProtectEx@20
+VirtualProtectFromApp@16
+VirtualQuery@12
+VirtualQueryEx@16
+VirtualUnlock@8
+VirtualUnlockEx@12
+WriteProcessMemory@20
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7.def
index 64384be..6f53410 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7.def
@@ -2,6 +2,7 @@
 
 EXPORTS
 
+CreateFileMapping2@40
 CreateFileMappingFromApp@24
 CreateFileMappingW@24
 DiscardVirtualMemory@8
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7_windowsapp.def
new file mode 100644
index 0000000..64384be
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-memory-l1-1-7_windowsapp.def
@@ -0,0 +1,42 @@
+LIBRARY api-ms-win-core-memory-l1-1-7
+
+EXPORTS
+
+CreateFileMappingFromApp@24
+CreateFileMappingW@24
+DiscardVirtualMemory@8
+FlushViewOfFile@8
+GetLargePageMinimum@0
+GetProcessWorkingSetSizeEx@16
+GetWriteWatch@24
+MapViewOfFile@20
+MapViewOfFile3FromApp@40
+MapViewOfFileEx@24
+MapViewOfFileFromApp@20
+OfferVirtualMemory@12
+OpenFileMappingFromApp@12
+OpenFileMappingW@12
+ReadProcessMemory@20
+ReclaimVirtualMemory@8
+ResetWriteWatch@8
+SetProcessValidCallTargets@20
+SetProcessValidCallTargetsForMappedView@32
+SetProcessWorkingSetSizeEx@16
+UnmapViewOfFile@4
+UnmapViewOfFile2@12
+UnmapViewOfFileEx@8
+VirtualAlloc@16
+VirtualAlloc2FromApp@28
+VirtualAllocEx@20
+VirtualAllocFromApp@16
+VirtualFree@12
+VirtualFreeEx@16
+VirtualLock@8
+VirtualProtect@16
+VirtualProtectEx@20
+VirtualProtectFromApp@16
+VirtualQuery@12
+VirtualQueryEx@16
+VirtualUnlock@8
+VirtualUnlockEx@12
+WriteProcessMemory@20