diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 8f0e9bd..686d188 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -2276,13 +2276,13 @@
 		%/libapi-ms-win-core-file-ansi-l1-1-0.a \
 		%/libapi-ms-win-core-file-ansi-l2-1-0.a \
 		%/libapi-ms-win-core-file-fromapp-l1-1-0.a \
-		%/libapi-ms-win-core-file-l1-1-0.a \
+		%/libapi-ms-win-core-file-l1-1-0_windowsapp.a \
 		%/libapi-ms-win-core-file-l1-2-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-l1-2-2_windowsapp.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-file-l2-1-2_windowsapp.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-1-0.a \
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0.def
index 490803d..dde3610 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0.def
@@ -7,6 +7,7 @@
 CreateDirectoryW
 CreateFileA
 CreateFileW
+DefineDosDeviceW
 DeleteFileA
 DeleteFileW
 DeleteVolumeMountPointW
@@ -58,6 +59,7 @@
 LocalFileTimeToFileTime
 LockFile
 LockFileEx
+QueryDosDeviceW
 ReadFile
 ReadFileEx
 ReadFileScatter
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0_windowsapp.def
new file mode 100644
index 0000000..490803d
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-1-0_windowsapp.def
@@ -0,0 +1,78 @@
+LIBRARY api-ms-win-core-file-l1-1-0
+
+EXPORTS
+
+CompareFileTime
+CreateDirectoryA
+CreateDirectoryW
+CreateFileA
+CreateFileW
+DeleteFileA
+DeleteFileW
+DeleteVolumeMountPointW
+FileTimeToLocalFileTime
+FileTimeToSystemTime
+FindClose
+FindCloseChangeNotification
+FindFirstChangeNotificationA
+FindFirstChangeNotificationW
+FindFirstFileA
+FindFirstFileExA
+FindFirstFileExW
+FindFirstFileW
+FindFirstVolumeW
+FindNextChangeNotification
+FindNextFileA
+FindNextFileW
+FindNextVolumeW
+FindVolumeClose
+FlushFileBuffers
+GetDiskFreeSpaceA
+GetDiskFreeSpaceExA
+GetDiskFreeSpaceExW
+GetDiskFreeSpaceW
+GetDriveTypeA
+GetDriveTypeW
+GetFileAttributesA
+GetFileAttributesExA
+GetFileAttributesExW
+GetFileAttributesW
+GetFileInformationByHandle
+GetFileSize
+GetFileSizeEx
+GetFileTime
+GetFileType
+GetFinalPathNameByHandleA
+GetFinalPathNameByHandleW
+GetFullPathNameA
+GetFullPathNameW
+GetLogicalDrives
+GetLogicalDriveStringsW
+GetLongPathNameA
+GetLongPathNameW
+GetShortPathNameW
+GetTempFileNameW
+GetVolumeInformationByHandleW
+GetVolumeInformationW
+GetVolumePathNameW
+LocalFileTimeToFileTime
+LockFile
+LockFileEx
+ReadFile
+ReadFileEx
+ReadFileScatter
+RemoveDirectoryA
+RemoveDirectoryW
+SetEndOfFile
+SetFileAttributesA
+SetFileAttributesW
+SetFileInformationByHandle
+SetFilePointer
+SetFilePointerEx
+SetFileTime
+SetFileValidData
+UnlockFile
+UnlockFileEx
+WriteFile
+WriteFileEx
+WriteFileGather
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-1.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-1.def
index 20124c1..adf4218 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-1.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-1.def
@@ -27,6 +27,8 @@
 FindNextVolumeW
 FindVolumeClose
 FlushFileBuffers
+GetCompressedFileSizeA
+GetCompressedFileSizeW
 GetDiskFreeSpaceA
 GetDiskFreeSpaceExA
 GetDiskFreeSpaceExW
@@ -70,6 +72,7 @@
 SetFileAttributesA
 SetFileAttributesW
 SetFileInformationByHandle
+SetFileIoOverlappedRange
 SetFilePointer
 SetFilePointerEx
 SetFileTime
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2.def
index 472798d..b0fbe6e 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2.def
@@ -20,11 +20,15 @@
 FindFirstFileA
 FindFirstFileExA
 FindFirstFileExW
+FindFirstFileNameW
 FindFirstFileW
+FindFirstStreamW
 FindFirstVolumeW
 FindNextChangeNotification
 FindNextFileA
+FindNextFileNameW
 FindNextFileW
+FindNextStreamW
 FindNextVolumeW
 FindVolumeClose
 FlushFileBuffers
@@ -71,6 +75,8 @@
 RemoveDirectoryA
 RemoveDirectoryW
 SetEndOfFile
+SetFileApisToANSI
+SetFileApisToOEM
 SetFileAttributesA
 SetFileAttributesW
 SetFileInformationByHandle
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2_windowsapp.def
new file mode 100644
index 0000000..472798d
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l1-2-2_windowsapp.def
@@ -0,0 +1,85 @@
+LIBRARY api-ms-win-core-file-l1-2-2
+
+EXPORTS
+
+AreFileApisANSI
+CompareFileTime
+CreateDirectoryA
+CreateDirectoryW
+CreateFile2
+CreateFileA
+CreateFileW
+DeleteFileA
+DeleteFileW
+DeleteVolumeMountPointW
+FileTimeToLocalFileTime
+FindClose
+FindCloseChangeNotification
+FindFirstChangeNotificationA
+FindFirstChangeNotificationW
+FindFirstFileA
+FindFirstFileExA
+FindFirstFileExW
+FindFirstFileW
+FindFirstVolumeW
+FindNextChangeNotification
+FindNextFileA
+FindNextFileW
+FindNextVolumeW
+FindVolumeClose
+FlushFileBuffers
+GetDiskFreeSpaceA
+GetDiskFreeSpaceExA
+GetDiskFreeSpaceExW
+GetDiskFreeSpaceW
+GetDriveTypeA
+GetDriveTypeW
+GetFileAttributesA
+GetFileAttributesExA
+GetFileAttributesExW
+GetFileAttributesW
+GetFileInformationByHandle
+GetFileSize
+GetFileSizeEx
+GetFileTime
+GetFileType
+GetFinalPathNameByHandleA
+GetFinalPathNameByHandleW
+GetFullPathNameA
+GetFullPathNameW
+GetLogicalDrives
+GetLogicalDriveStringsW
+GetLongPathNameA
+GetLongPathNameW
+GetShortPathNameW
+GetTempFileNameA
+GetTempFileNameW
+GetTempPathA
+GetTempPathW
+GetVolumeInformationA
+GetVolumeInformationByHandleW
+GetVolumeInformationW
+GetVolumeNameForVolumeMountPointW
+GetVolumePathNamesForVolumeNameW
+GetVolumePathNameW
+LocalFileTimeToFileTime
+LockFile
+LockFileEx
+ReadFile
+ReadFileEx
+ReadFileScatter
+RemoveDirectoryA
+RemoveDirectoryW
+SetEndOfFile
+SetFileAttributesA
+SetFileAttributesW
+SetFileInformationByHandle
+SetFilePointer
+SetFilePointerEx
+SetFileTime
+SetFileValidData
+UnlockFile
+UnlockFileEx
+WriteFile
+WriteFileEx
+WriteFileGather
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-1.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-1.def
index 5c97ac6..b76e357 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-1.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-1.def
@@ -10,6 +10,7 @@
 GetFileInformationByHandleEx
 MoveFileExW
 MoveFileWithProgressW
+OpenFileById
 ReadDirectoryChangesW
 ReOpenFile
 ReplaceFileW
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2.def
index 818fbe3..1cac6e5 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2.def
@@ -6,6 +6,7 @@
 CopyFileExW
 CopyFileW
 CreateDirectoryExW
+CreateHardLinkA
 CreateHardLinkW
 CreateSymbolicLinkW
 GetFileInformationByHandleEx
diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2_windowsapp.def b/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2_windowsapp.def
new file mode 100644
index 0000000..818fbe3
--- /dev/null
+++ b/mingw-w64-crt/lib-common/api-ms-win-core-file-l2-1-2_windowsapp.def
@@ -0,0 +1,16 @@
+LIBRARY api-ms-win-core-file-l2-1-2
+
+EXPORTS
+
+CopyFile2
+CopyFileExW
+CopyFileW
+CreateDirectoryExW
+CreateHardLinkW
+CreateSymbolicLinkW
+GetFileInformationByHandleEx
+MoveFileExW
+MoveFileWithProgressW
+ReadDirectoryChangesW
+ReOpenFile
+ReplaceFileW
diff --git a/mingw-w64-crt/lib-common/windowsapp.mri b/mingw-w64-crt/lib-common/windowsapp.mri
index dab24d0..b212c8a 100644
--- a/mingw-w64-crt/lib-common/windowsapp.mri
+++ b/mingw-w64-crt/lib-common/windowsapp.mri
@@ -37,13 +37,13 @@
 ADDLIB libapi-ms-win-core-file-ansi-l1-1-0.a
 ADDLIB libapi-ms-win-core-file-ansi-l2-1-0.a
 ADDLIB libapi-ms-win-core-file-fromapp-l1-1-0.a
-ADDLIB libapi-ms-win-core-file-l1-1-0.a
+ADDLIB libapi-ms-win-core-file-l1-1-0_windowsapp.a
 ADDLIB 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
+ADDLIB libapi-ms-win-core-file-l1-2-2_windowsapp.a
 ADDLIB libapi-ms-win-core-file-l2-1-0.a
 ADDLIB libapi-ms-win-core-file-l2-1-1.a
-ADDLIB libapi-ms-win-core-file-l2-1-2.a
+ADDLIB libapi-ms-win-core-file-l2-1-2_windowsapp.a
 ADDLIB libapi-ms-win-core-firmware-l1-1-0.a
 ADDLIB libapi-ms-win-core-handle-l1-1-0.a
 ADDLIB libapi-ms-win-core-heap-l1-1-0.a
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0.def
index 153368c..39367f0 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0.def
@@ -7,6 +7,7 @@
 CreateDirectoryW@8
 CreateFileA@28
 CreateFileW@28
+DefineDosDeviceW@12
 DeleteFileA@4
 DeleteFileW@4
 DeleteVolumeMountPointW@4
@@ -58,6 +59,7 @@
 LocalFileTimeToFileTime@8
 LockFile@20
 LockFileEx@24
+QueryDosDeviceW@12
 ReadFile@20
 ReadFileEx@20
 ReadFileScatter@20
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0_windowsapp.def
new file mode 100644
index 0000000..153368c
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-1-0_windowsapp.def
@@ -0,0 +1,78 @@
+LIBRARY api-ms-win-core-file-l1-1-0
+
+EXPORTS
+
+CompareFileTime@8
+CreateDirectoryA@8
+CreateDirectoryW@8
+CreateFileA@28
+CreateFileW@28
+DeleteFileA@4
+DeleteFileW@4
+DeleteVolumeMountPointW@4
+FileTimeToLocalFileTime@8
+FileTimeToSystemTime@8
+FindClose@4
+FindCloseChangeNotification@4
+FindFirstChangeNotificationA@12
+FindFirstChangeNotificationW@12
+FindFirstFileA@8
+FindFirstFileExA@24
+FindFirstFileExW@24
+FindFirstFileW@8
+FindFirstVolumeW@8
+FindNextChangeNotification@4
+FindNextFileA@8
+FindNextFileW@8
+FindNextVolumeW@12
+FindVolumeClose@4
+FlushFileBuffers@4
+GetDiskFreeSpaceA@20
+GetDiskFreeSpaceExA@16
+GetDiskFreeSpaceExW@16
+GetDiskFreeSpaceW@20
+GetDriveTypeA@4
+GetDriveTypeW@4
+GetFileAttributesA@4
+GetFileAttributesExA@12
+GetFileAttributesExW@12
+GetFileAttributesW@4
+GetFileInformationByHandle@8
+GetFileSize@8
+GetFileSizeEx@8
+GetFileTime@16
+GetFileType@4
+GetFinalPathNameByHandleA@16
+GetFinalPathNameByHandleW@16
+GetFullPathNameA@16
+GetFullPathNameW@16
+GetLogicalDrives@0
+GetLogicalDriveStringsW@8
+GetLongPathNameA@12
+GetLongPathNameW@12
+GetShortPathNameW@12
+GetTempFileNameW@16
+GetVolumeInformationByHandleW@32
+GetVolumeInformationW@32
+GetVolumePathNameW@12
+LocalFileTimeToFileTime@8
+LockFile@20
+LockFileEx@24
+ReadFile@20
+ReadFileEx@20
+ReadFileScatter@20
+RemoveDirectoryA@4
+RemoveDirectoryW@4
+SetEndOfFile@4
+SetFileAttributesA@8
+SetFileAttributesW@8
+SetFileInformationByHandle@16
+SetFilePointer@16
+SetFilePointerEx@20
+SetFileTime@16
+SetFileValidData@12
+UnlockFile@20
+UnlockFileEx@20
+WriteFile@20
+WriteFileEx@20
+WriteFileGather@20
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-1.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-1.def
index 0fc8eee..9b0d55f 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-1.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-1.def
@@ -27,6 +27,8 @@
 FindNextVolumeW@12
 FindVolumeClose@4
 FlushFileBuffers@4
+GetCompressedFileSizeA@8
+GetCompressedFileSizeW@8
 GetDiskFreeSpaceA@20
 GetDiskFreeSpaceExA@16
 GetDiskFreeSpaceExW@16
@@ -70,6 +72,7 @@
 SetFileAttributesA@8
 SetFileAttributesW@8
 SetFileInformationByHandle@16
+SetFileIoOverlappedRange@12
 SetFilePointer@16
 SetFilePointerEx@20
 SetFileTime@16
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2.def
index 9d24e66..0e379ac 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2.def
@@ -20,11 +20,15 @@
 FindFirstFileA@8
 FindFirstFileExA@24
 FindFirstFileExW@24
+FindFirstFileNameW@16
 FindFirstFileW@8
+FindFirstStreamW@16
 FindFirstVolumeW@8
 FindNextChangeNotification@4
 FindNextFileA@8
+FindNextFileNameW@12
 FindNextFileW@8
+FindNextStreamW@8
 FindNextVolumeW@12
 FindVolumeClose@4
 FlushFileBuffers@4
@@ -71,6 +75,8 @@
 RemoveDirectoryA@4
 RemoveDirectoryW@4
 SetEndOfFile@4
+SetFileApisToANSI@0
+SetFileApisToOEM@0
 SetFileAttributesA@8
 SetFileAttributesW@8
 SetFileInformationByHandle@16
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2_windowsapp.def
new file mode 100644
index 0000000..9d24e66
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l1-2-2_windowsapp.def
@@ -0,0 +1,85 @@
+LIBRARY api-ms-win-core-file-l1-2-2
+
+EXPORTS
+
+AreFileApisANSI@0
+CompareFileTime@8
+CreateDirectoryA@8
+CreateDirectoryW@8
+CreateFile2@20
+CreateFileA@28
+CreateFileW@28
+DeleteFileA@4
+DeleteFileW@4
+DeleteVolumeMountPointW@4
+FileTimeToLocalFileTime@8
+FindClose@4
+FindCloseChangeNotification@4
+FindFirstChangeNotificationA@12
+FindFirstChangeNotificationW@12
+FindFirstFileA@8
+FindFirstFileExA@24
+FindFirstFileExW@24
+FindFirstFileW@8
+FindFirstVolumeW@8
+FindNextChangeNotification@4
+FindNextFileA@8
+FindNextFileW@8
+FindNextVolumeW@12
+FindVolumeClose@4
+FlushFileBuffers@4
+GetDiskFreeSpaceA@20
+GetDiskFreeSpaceExA@16
+GetDiskFreeSpaceExW@16
+GetDiskFreeSpaceW@20
+GetDriveTypeA@4
+GetDriveTypeW@4
+GetFileAttributesA@4
+GetFileAttributesExA@12
+GetFileAttributesExW@12
+GetFileAttributesW@4
+GetFileInformationByHandle@8
+GetFileSize@8
+GetFileSizeEx@8
+GetFileTime@16
+GetFileType@4
+GetFinalPathNameByHandleA@16
+GetFinalPathNameByHandleW@16
+GetFullPathNameA@16
+GetFullPathNameW@16
+GetLogicalDrives@0
+GetLogicalDriveStringsW@8
+GetLongPathNameA@12
+GetLongPathNameW@12
+GetShortPathNameW@12
+GetTempFileNameA@16
+GetTempFileNameW@16
+GetTempPathA@8
+GetTempPathW@8
+GetVolumeInformationA@32
+GetVolumeInformationByHandleW@32
+GetVolumeInformationW@32
+GetVolumeNameForVolumeMountPointW@12
+GetVolumePathNamesForVolumeNameW@16
+GetVolumePathNameW@12
+LocalFileTimeToFileTime@8
+LockFile@20
+LockFileEx@24
+ReadFile@20
+ReadFileEx@20
+ReadFileScatter@20
+RemoveDirectoryA@4
+RemoveDirectoryW@4
+SetEndOfFile@4
+SetFileAttributesA@8
+SetFileAttributesW@8
+SetFileInformationByHandle@16
+SetFilePointer@16
+SetFilePointerEx@20
+SetFileTime@16
+SetFileValidData@12
+UnlockFile@20
+UnlockFileEx@20
+WriteFile@20
+WriteFileEx@20
+WriteFileGather@20
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-1.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-1.def
index fa954d6..5720166 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-1.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-1.def
@@ -10,6 +10,7 @@
 GetFileInformationByHandleEx@16
 MoveFileExW@12
 MoveFileWithProgressW@20
+OpenFileById@24
 ReadDirectoryChangesW@32
 ReOpenFile@16
 ReplaceFileW@24
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2.def
index 56c040d..38ef9a1 100644
--- a/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2.def
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2.def
@@ -6,6 +6,7 @@
 CopyFileExW@24
 CopyFileW@12
 CreateDirectoryExW@12
+CreateHardLinkA@12
 CreateHardLinkW@12
 CreateSymbolicLinkW@12
 GetFileInformationByHandleEx@16
diff --git a/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2_windowsapp.def b/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2_windowsapp.def
new file mode 100644
index 0000000..56c040d
--- /dev/null
+++ b/mingw-w64-crt/lib32/api-ms-win-core-file-l2-1-2_windowsapp.def
@@ -0,0 +1,16 @@
+LIBRARY api-ms-win-core-file-l2-1-2
+
+EXPORTS
+
+CopyFile2@12
+CopyFileExW@24
+CopyFileW@12
+CreateDirectoryExW@12
+CreateHardLinkW@12
+CreateSymbolicLinkW@12
+GetFileInformationByHandleEx@16
+MoveFileExW@12
+MoveFileWithProgressW@20
+ReadDirectoryChangesW@32
+ReOpenFile@16
+ReplaceFileW@24