diff --git a/mingw-w64-crt/libarm32/crypt32.def b/mingw-w64-crt/lib-common/crypt32.def
similarity index 95%
rename from mingw-w64-crt/libarm32/crypt32.def
rename to mingw-w64-crt/lib-common/crypt32.def
index 81b8f7a..3b81bcd 100644
--- a/mingw-w64-crt/libarm32/crypt32.def
+++ b/mingw-w64-crt/lib-common/crypt32.def
@@ -1,21 +1,9 @@
-;
-; Definition file of CRYPT32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
 LIBRARY "CRYPT32.dll"
 EXPORTS
-ord_1001 @1001
-ord_1002 @1002
-ord_1003 @1003
-ord_1004 @1004
-ord_1005 @1005
-ord_1006 @1006
-ord_1007 @1007
-ord_1008 @1008
-ord_1009 @1009
-ord_1010 @1010
-ord_1011 @1011
+ChainWlxLogoffEvent
+CloseCertPerformanceData
+CollectCertPerformanceData
+OpenCertPerformanceData
 CryptObjectLocatorFree
 CryptObjectLocatorGet
 CryptObjectLocatorGetContent
@@ -180,6 +168,8 @@
 CryptGetMessageSignerCount
 CryptGetOIDFunctionAddress
 CryptGetOIDFunctionValue
+CryptGetDefaultProviderA
+CryptGetDefaultProviderW
 CryptHashCertificate
 CryptHashCertificate2
 CryptHashMessage
@@ -303,4 +293,3 @@
 PFXImportCertStore
 PFXIsPFXBlob
 PFXVerifyPassword
-ord_2000 @2000
diff --git a/mingw-w64-crt/lib64/crypt32.def b/mingw-w64-crt/lib64/crypt32.def
deleted file mode 100644
index 2e2f352..0000000
--- a/mingw-w64-crt/lib64/crypt32.def
+++ /dev/null
@@ -1,273 +0,0 @@
-; 
-; Exports of file CRYPT32.dll
-;
-; Autogenerated by gen_exportdef
-; Written by Kai Tietz, 2007
-;
-LIBRARY CRYPT32.dll
-EXPORTS
-ChainWlxLogoffEvent
-CloseCertPerformanceData
-CollectCertPerformanceData
-OpenCertPerformanceData
-CertAddCRLContextToStore
-CertAddCRLLinkToStore
-CertAddCTLContextToStore
-CertAddCTLLinkToStore
-CertAddCertificateContextToStore
-CertAddCertificateLinkToStore
-CertAddEncodedCRLToStore
-CertAddEncodedCTLToStore
-CertAddEncodedCertificateToStore
-CertAddEncodedCertificateToSystemStoreA
-CertAddEncodedCertificateToSystemStoreW
-CertAddEnhancedKeyUsageIdentifier
-CertAddSerializedElementToStore
-CertAddStoreToCollection
-CertAlgIdToOID
-CertCloseStore
-CertCompareCertificate
-CertCompareCertificateName
-CertCompareIntegerBlob
-CertComparePublicKeyInfo
-CertControlStore
-CertCreateCRLContext
-CertCreateCTLContext
-CertCreateCTLEntryFromCertificateContextProperties
-CertCreateCertificateChainEngine
-CertCreateCertificateContext
-CertCreateContext
-CertCreateSelfSignCertificate
-CertDeleteCRLFromStore
-CertDeleteCTLFromStore
-CertDeleteCertificateFromStore
-CertDuplicateCRLContext
-CertDuplicateCTLContext
-CertDuplicateCertificateChain
-CertDuplicateCertificateContext
-CertDuplicateStore
-CertEnumCRLContextProperties
-CertEnumCRLsInStore
-CertEnumCTLContextProperties
-CertEnumCTLsInStore
-CertEnumCertificateContextProperties
-CertEnumCertificatesInStore
-CertEnumPhysicalStore
-CertEnumSubjectInSortedCTL
-CertEnumSystemStore
-CertEnumSystemStoreLocation
-CertFindAttribute
-CertFindCRLInStore
-CertFindCTLInStore
-CertFindCertificateInCRL
-CertFindCertificateInStore
-CertFindChainInStore
-CertFindExtension
-CertFindRDNAttr
-CertFindSubjectInCTL
-CertFindSubjectInSortedCTL
-CertFreeCRLContext
-CertFreeCTLContext
-CertFreeCertificateChain
-CertFreeCertificateChainEngine
-CertFreeCertificateContext
-CertGetCRLContextProperty
-CertGetCRLFromStore
-CertGetCTLContextProperty
-CertGetCertificateChain
-CertGetCertificateContextProperty
-CertGetEnhancedKeyUsage
-CertGetIntendedKeyUsage
-CertGetIssuerCertificateFromStore
-CertGetNameStringA
-CertGetNameStringW
-CertGetPublicKeyLength
-CertGetStoreProperty
-CertGetSubjectCertificateFromStore
-CertGetValidUsages
-CertIsRDNAttrsInCertificateName
-CertIsValidCRLForCertificate
-CertNameToStrA
-CertNameToStrW
-CertOIDToAlgId
-CertOpenStore
-CertOpenSystemStoreA
-CertOpenSystemStoreW
-CertRDNValueToStrA
-CertRDNValueToStrW
-CertRegisterPhysicalStore
-CertRegisterSystemStore
-CertRemoveEnhancedKeyUsageIdentifier
-CertRemoveStoreFromCollection
-CertResyncCertificateChainEngine
-CertSaveStore
-CertSerializeCRLStoreElement
-CertSerializeCTLStoreElement
-CertSerializeCertificateStoreElement
-CertSetCRLContextProperty
-CertSetCTLContextProperty
-CertSetCertificateContextPropertiesFromCTLEntry
-CertSetCertificateContextProperty
-CertSetEnhancedKeyUsage
-CertSetStoreProperty
-CertStrToNameA
-CertStrToNameW
-CertUnregisterPhysicalStore
-CertUnregisterSystemStore
-CertVerifyCRLRevocation
-CertVerifyCRLTimeValidity
-CertVerifyCTLUsage
-CertVerifyCertificateChainPolicy
-CertVerifyRevocation
-CertVerifySubjectCertificateContext
-CertVerifyTimeValidity
-CertVerifyValidityNesting
-CryptAcquireCertificatePrivateKey
-CryptBinaryToStringA
-CryptBinaryToStringW
-CryptCloseAsyncHandle
-CryptCreateAsyncHandle
-CryptCreateKeyIdentifierFromCSP
-CryptDecodeMessage
-CryptDecodeObject
-CryptDecodeObjectEx
-CryptDecryptAndVerifyMessageSignature
-CryptDecryptMessage
-CryptEncodeObject
-CryptEncodeObjectEx
-CryptEncryptMessage
-CryptEnumKeyIdentifierProperties
-CryptEnumOIDFunction
-CryptEnumOIDInfo
-CryptExportPKCS8
-CryptExportPublicKeyInfo
-CryptExportPublicKeyInfoEx
-CryptFindCertificateKeyProvInfo
-CryptFindLocalizedName
-CryptFindOIDInfo
-CryptFormatObject
-CryptFreeOIDFunctionAddress
-CryptGetAsyncParam
-CryptGetDefaultOIDDllList
-CryptGetDefaultOIDFunctionAddress
-CryptGetKeyIdentifierProperty
-CryptGetMessageCertificates
-CryptGetMessageSignerCount
-CryptGetOIDFunctionAddress
-CryptGetOIDFunctionValue
-CryptGetDefaultProviderA
-CryptGetDefaultProviderW
-CryptHashCertificate
-CryptHashMessage
-CryptHashPublicKeyInfo
-CryptHashToBeSigned
-CryptImportPKCS8
-CryptImportPublicKeyInfo
-CryptImportPublicKeyInfoEx
-CryptInitOIDFunctionSet
-CryptInstallDefaultContext
-CryptInstallOIDFunctionAddress
-CryptLoadSip
-CryptMemAlloc
-CryptMemFree
-CryptMemRealloc
-CryptMsgCalculateEncodedLength
-CryptMsgClose
-CryptMsgControl
-CryptMsgCountersign
-CryptMsgCountersignEncoded
-CryptMsgDuplicate
-CryptMsgEncodeAndSignCTL
-CryptMsgGetAndVerifySigner
-CryptMsgGetParam
-CryptMsgOpenToDecode
-CryptMsgOpenToEncode
-CryptMsgSignCTL
-CryptMsgUpdate
-CryptMsgVerifyCountersignatureEncoded
-CryptMsgVerifyCountersignatureEncodedEx
-CryptProtectData
-CryptProtectMemory
-CryptQueryObject
-CryptRegisterDefaultOIDFunction
-CryptRegisterOIDFunction
-CryptRegisterOIDInfo
-CryptSIPAddProvider
-CryptSIPCreateIndirectData
-CryptSIPGetSignedDataMsg
-CryptSIPLoad
-CryptSIPPutSignedDataMsg
-CryptSIPRemoveProvider
-CryptSIPRemoveSignedDataMsg
-CryptSIPRetrieveSubjectGuid
-CryptSIPRetrieveSubjectGuidForCatalogFile
-CryptSIPVerifyIndirectData
-CryptSetAsyncParam
-CryptSetKeyIdentifierProperty
-CryptSetOIDFunctionValue
-CryptSignAndEncodeCertificate
-CryptSignAndEncryptMessage
-CryptSignCertificate
-CryptSignMessage
-CryptSignMessageWithKey
-CryptStringToBinaryA
-CryptStringToBinaryW
-CryptUninstallDefaultContext
-CryptUnprotectData
-CryptUnprotectMemory
-CryptUnregisterDefaultOIDFunction
-CryptUnregisterOIDFunction
-CryptUnregisterOIDInfo
-CryptVerifyCertificateSignature
-CryptVerifyCertificateSignatureEx
-CryptVerifyDetachedMessageHash
-CryptVerifyDetachedMessageSignature
-CryptVerifyMessageHash
-CryptVerifyMessageSignature
-CryptVerifyMessageSignatureWithKey
-I_CertProtectFunction
-I_CertSrvProtectFunction
-I_CertSyncStore
-I_CertUpdateStore
-I_CryptAddRefLruEntry
-I_CryptAddSmartCardCertToStore
-I_CryptAllocTls
-I_CryptCreateLruCache
-I_CryptCreateLruEntry
-I_CryptDetachTls
-I_CryptDisableLruOfEntries
-I_CryptEnableLruOfEntries
-I_CryptEnumMatchingLruEntries
-I_CryptFindLruEntry
-I_CryptFindLruEntryData
-I_CryptFindSmartCardCertInStore
-I_CryptFlushLruCache
-I_CryptFreeLruCache
-I_CryptFreeTls
-I_CryptGetAsn1Decoder
-I_CryptGetAsn1Encoder
-I_CryptGetDefaultCryptProv
-I_CryptGetDefaultCryptProvForEncrypt
-I_CryptGetFileVersion
-I_CryptGetLruEntryData
-I_CryptGetLruEntryIdentifier
-I_CryptGetOssGlobal
-I_CryptGetTls
-I_CryptInsertLruEntry
-I_CryptInstallAsn1Module
-I_CryptInstallOssGlobal
-I_CryptReadTrustedPublisherDWORDValueFromRegistry
-I_CryptRegisterSmartCardStore
-I_CryptReleaseLruEntry
-I_CryptRemoveLruEntry
-I_CryptSetTls
-I_CryptTouchLruEntry
-I_CryptUninstallAsn1Module
-I_CryptUninstallOssGlobal
-I_CryptUnregisterSmartCardStore
-I_CryptWalkAllLruCacheEntries
-PFXExportCertStore
-PFXExportCertStoreEx
-PFXImportCertStore
-PFXIsPFXBlob
-PFXVerifyPassword