diff --git a/mingw-w64-crt/libarm32/wimgapi.def b/mingw-w64-crt/lib-common/wimgapi.def
similarity index 74%
rename from mingw-w64-crt/libarm32/wimgapi.def
rename to mingw-w64-crt/lib-common/wimgapi.def
index 8bd316f..e259913 100644
--- a/mingw-w64-crt/libarm32/wimgapi.def
+++ b/mingw-w64-crt/lib-common/wimgapi.def
@@ -5,6 +5,11 @@
 ;
 LIBRARY "WIMGAPI.DLL"
 EXPORTS
+;DllCanUnloadNow
+;DllMain
+WIMAddImagePath
+WIMAddImagePaths
+WIMAddWimbootEntry
 WIMApplyImage
 WIMCaptureImage
 WIMCloseHandle
@@ -12,10 +17,12 @@
 WIMCopyFile
 WIMCreateFile
 WIMCreateImageFile
+WIMCreateWofCompressedFile
 WIMDeleteImage
 WIMDeleteImageMounts
 WIMEnumImageFiles
 WIMExportImage
+WIMExtractImageDirectory
 WIMExtractImagePath
 WIMFindFirstImageFile
 WIMFindNextImageFile
@@ -30,22 +37,31 @@
 WIMGetWIMBootEntries
 WIMGetWIMBootWIMPath
 WIMInitFileIOCallbacks
+WIMInitializeWofDriver
+WIMIsCurrentSystemWimboot
+WIMIsReferenceWim
 WIMLoadImage
 WIMMountImage
 WIMMountImageHandle
 WIMProcessCustomImage
+WIMReadFileEx
 WIMReadImageFile
+WIMRedirectFolderBeforeApply
 WIMRegisterLogFile
 WIMRegisterMessageCallback
 WIMRemountImage
 WIMSetBootImage
 WIMSetFileIOCallbackTemporaryPath
 WIMSetImageInformation
+WIMSetImageUserSpecifiedCreationTime
 WIMSetReferenceFile
 WIMSetTemporaryPath
+WIMSetWimGuid
+WIMSingleInstanceFile
 WIMSplitFile
 WIMUnmountImage
 WIMUnmountImageHandle
 WIMUnregisterLogFile
 WIMUnregisterMessageCallback
 WIMUpdateWIMBootEntry
+WIMWriteFileWithIntegrity
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index db5c5a6..564178f 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -299,6 +299,7 @@
 lib32_DATA += %reldir%/libwevtapi.a
 lib32_DATA += %reldir%/libwevtfwd.a
 lib32_DATA += %reldir%/libwiadss.a
+lib32_DATA += %reldir%/libwimgapi.a
 lib32_DATA += %reldir%/libwin32k.a
 lib32_DATA += %reldir%/libwin32spl.a
 lib32_DATA += %reldir%/libwinhttp.a
diff --git a/mingw-w64-crt/lib32/wimgapi.def b/mingw-w64-crt/lib32/wimgapi.def
new file mode 100644
index 0000000..c1e0182
--- /dev/null
+++ b/mingw-w64-crt/lib32/wimgapi.def
@@ -0,0 +1,67 @@
+;
+; Definition file of WIMGAPI.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "WIMGAPI.DLL"
+EXPORTS
+;DllCanUnloadNow@0
+;DllMain@12
+WIMAddImagePath@16
+WIMAddImagePaths@20
+WIMAddWimbootEntry@16
+WIMApplyImage@12
+WIMCaptureImage@12
+WIMCloseHandle@4
+WIMCommitImageHandle@12
+WIMCopyFile@24
+WIMCreateFile@24
+WIMCreateImageFile@20
+WIMCreateWofCompressedFile@12
+WIMDeleteImage@8
+WIMDeleteImageMounts@4
+WIMEnumImageFiles@16
+WIMExportImage@12
+WIMExtractImageDirectory@16
+WIMExtractImagePath@16
+WIMFindFirstImageFile@12
+WIMFindNextImageFile@8
+WIMGetAttributes@12
+WIMGetImageCount@4
+WIMGetImageInformation@12
+WIMGetMessageCallbackCount@4
+WIMGetMountedImageHandle@16
+WIMGetMountedImageInfo@20
+WIMGetMountedImageInfoFromHandle@20
+WIMGetMountedImages@8
+WIMGetWIMBootEntries@12
+WIMGetWIMBootWIMPath@8
+WIMInitFileIOCallbacks@4
+WIMInitializeWofDriver@8
+WIMIsCurrentSystemWimboot@0
+WIMIsReferenceWim@20
+WIMLoadImage@8
+WIMMountImage@16
+WIMMountImageHandle@12
+WIMProcessCustomImage@12
+WIMReadFileEx@20
+WIMReadImageFile@20
+WIMRedirectFolderBeforeApply@12
+WIMRegisterLogFile@8
+WIMRegisterMessageCallback@12
+WIMRemountImage@8
+WIMSetBootImage@8
+WIMSetFileIOCallbackTemporaryPath@4
+WIMSetImageInformation@12
+WIMSetImageUserSpecifiedCreationTime@8
+WIMSetReferenceFile@12
+WIMSetTemporaryPath@8
+WIMSetWimGuid@8
+WIMSingleInstanceFile@16
+WIMSplitFile@16
+WIMUnmountImage@16
+WIMUnmountImageHandle@8
+WIMUnregisterLogFile@4
+WIMUnregisterMessageCallback@8
+WIMUpdateWIMBootEntry@16
+WIMWriteFileWithIntegrity@16
diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am
index 8cfa287..842e4a2 100644
--- a/mingw-w64-crt/lib64/Makefile.am
+++ b/mingw-w64-crt/lib64/Makefile.am
@@ -810,6 +810,7 @@
 lib64_DATA += %reldir%/libd3dcompiler_46.a
 lib64_DATA += %reldir%/libd3dcsx_46.a
 lib64_DATA += %reldir%/libd3dcompiler_47.a
+lib64_DATA += %reldir%/libwimgapi.a
 lib64_DATA += %reldir%/libwinhttp.a
 lib64_DATA += %reldir%/libruntimeobject.a
 lib64_DATA += %reldir%/libsynchronization.a
diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am
index 07e8145..69253a1 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -302,6 +302,7 @@
 libarm64_DATA += %reldir%/libwecapi.a
 libarm64_DATA += %reldir%/libwevtapi.a
 libarm64_DATA += %reldir%/libwiashext.a
+libarm64_DATA += %reldir%/libwimgapi.a
 libarm64_DATA += %reldir%/libwindowsapp.a
 libarm64_DATA += %reldir%/libwinhttp.a
 libarm64_DATA += %reldir%/libwininet.a