diff --git a/mingw-w64-crt/libarm32/bluetoothapis.def b/mingw-w64-crt/lib-common/bluetoothapis.def
similarity index 98%
rename from mingw-w64-crt/libarm32/bluetoothapis.def
rename to mingw-w64-crt/lib-common/bluetoothapis.def
index ce9563c..afa395e 100644
--- a/mingw-w64-crt/libarm32/bluetoothapis.def
+++ b/mingw-w64-crt/lib-common/bluetoothapis.def
@@ -5,7 +5,6 @@
 ;
 LIBRARY "BluetoothApis.dll"
 EXPORTS
-ord_103 @103
 BluetoothAddressToString
 BluetoothDisconnectDevice
 BluetoothEnableDiscovery
@@ -78,6 +77,7 @@
 BthpCleanupDeviceLocalServices
 BthpCleanupDeviceRemoteServices
 BthpCleanupLEDeviceNodes
+BthpEnableA2DPIfPresent
 BthpEnableAllServices
 BthpEnableConnectableAndDiscoverable
 BthpEnableRadioSoftware
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index 3bd44d8..a6d2013 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -10,6 +10,7 @@
 lib32_DATA += %reldir%/libavifil32.a
 lib32_DATA += %reldir%/libavrt.a
 lib32_DATA += %reldir%/libbcrypt.a
+lib32_DATA += %reldir%/libbluetoothapis.a
 lib32_DATA += %reldir%/libbootvid.a
 lib32_DATA += %reldir%/libbrowcli.a
 lib32_DATA += %reldir%/libbthprops.a
diff --git a/mingw-w64-crt/lib32/bluetoothapis.def b/mingw-w64-crt/lib32/bluetoothapis.def
new file mode 100644
index 0000000..b91edb8
--- /dev/null
+++ b/mingw-w64-crt/lib32/bluetoothapis.def
@@ -0,0 +1,103 @@
+;
+; Definition file of BluetoothApis.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008-2014
+;
+LIBRARY "BluetoothApis.dll"
+EXPORTS
+BluetoothAddressToString@12
+BluetoothDisconnectDevice@8
+BluetoothEnableDiscovery@8
+BluetoothEnableIncomingConnections@8
+BluetoothEnumerateInstalledServices@16
+BluetoothEnumerateInstalledServicesEx@16
+BluetoothEnumerateLocalServices@12
+BluetoothFindBrowseGroupClose@4
+BluetoothFindClassIdClose@4
+BluetoothFindDeviceClose@4
+BluetoothFindFirstBrowseGroup@8
+BluetoothFindFirstClassId@8
+BluetoothFindFirstDevice@8
+BluetoothFindFirstProfileDescriptor@8
+BluetoothFindFirstProtocolDescriptorStack@8
+BluetoothFindFirstProtocolEntry@8
+BluetoothFindFirstRadio@8
+BluetoothFindFirstService@8
+BluetoothFindFirstServiceEx@12
+BluetoothFindNextBrowseGroup@8
+BluetoothFindNextClassId@8
+BluetoothFindNextDevice@8
+BluetoothFindNextProfileDescriptor@8
+BluetoothFindNextProtocolDescriptorStack@8
+BluetoothFindNextProtocolEntry@8
+BluetoothFindNextRadio@8
+BluetoothFindNextService@8
+BluetoothFindProfileDescriptorClose@4
+BluetoothFindProtocolDescriptorStackClose@4
+BluetoothFindProtocolEntryClose@4
+BluetoothFindRadioClose@4
+BluetoothFindServiceClose@4
+BluetoothGATTAbortReliableWrite@16
+BluetoothGATTBeginReliableWrite@12
+BluetoothGATTEndReliableWrite@16
+BluetoothGATTGetCharacteristicValue@24
+BluetoothGATTGetCharacteristics@24
+BluetoothGATTGetDescriptorValue@24
+BluetoothGATTGetDescriptors@24
+BluetoothGATTGetIncludedServices@24
+BluetoothGATTGetServices@20
+BluetoothGATTRegisterEvent@28
+BluetoothGATTSetCharacteristicValue@24
+BluetoothGATTSetDescriptorValue@16
+BluetoothGATTUnregisterEvent@8
+BluetoothGetDeviceInfo@8
+BluetoothGetLocalServiceInfo@16
+BluetoothGetRadioInfo@8
+BluetoothGetServicePnpInstance@24
+BluetoothIsConnectable@4
+BluetoothIsDiscoverable@4
+BluetoothIsVersionAvailable@8
+BluetoothRegisterForAuthentication@16
+BluetoothRegisterForAuthenticationEx@16
+BluetoothRemoveDevice@4
+BluetoothSdpEnumAttributes@16
+BluetoothSdpGetAttributeValue@16
+BluetoothSdpGetContainerElementData@16
+BluetoothSdpGetElementData@12
+BluetoothSdpGetString@24
+BluetoothSendAuthenticationResponse@12
+BluetoothSendAuthenticationResponseEx@8
+BluetoothSetLocalServiceInfo@16
+BluetoothSetServiceState@16
+BluetoothSetServiceStateEx@20
+BluetoothUnregisterAuthentication@4
+BluetoothUpdateDeviceRecord@4
+BthpCheckForUnsupportedGuid@4
+BthpCleanupBRDeviceNode@8
+BthpCleanupDeviceLocalServices@4
+BthpCleanupDeviceRemoteServices@4
+BthpCleanupLEDeviceNodes@16
+BthpEnableA2DPIfPresent@8
+BthpEnableAllServices@8
+BthpEnableConnectableAndDiscoverable@12
+BthpEnableRadioSoftware@4
+BthpFindPnpInfo@16
+BthpGATTCloseSession@8
+BthpInnerRecord@12
+BthpIsBluetoothServiceRunning@0
+BthpIsConnectableByDefault@0
+BthpIsDiscoverable@4
+BthpIsDiscoverableByDefault@0
+BthpIsRadioSoftwareEnabled@4
+BthpIsTopOfServiceGroup@24
+BthpMapStatusToErr@4
+BthpNextRecord@8
+BthpRegisterForAuthentication@28
+BthpSetServiceState@36
+BthpSetServiceStateEx@40
+BthpTranspose16Bits@4
+BthpTranspose32Bits@4
+BthpTransposeAndExtendBytes@12
+FindNextOpenVCOMPort@4
+InstallIncomingComPort@8
+ShouldForceAuthentication@4
diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am
index 816a2aa..040dcdc 100644
--- a/mingw-w64-crt/lib64/Makefile.am
+++ b/mingw-w64-crt/lib64/Makefile.am
@@ -34,6 +34,7 @@
 lib64_DATA += %reldir%/libbasesrv.a
 lib64_DATA += %reldir%/libbatmeter.a
 lib64_DATA += %reldir%/libbatt.a
+lib64_DATA += %reldir%/libbluetoothapis.a
 lib64_DATA += %reldir%/libbootvid.a
 lib64_DATA += %reldir%/libbrowser.a
 lib64_DATA += %reldir%/libbthci.a
diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am
index 69603f4..960808e 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -12,6 +12,7 @@
 libarm64_DATA += %reldir%/libazroles.a
 libarm64_DATA += %reldir%/libbasesrv.a
 libarm64_DATA += %reldir%/libbcrypt.a
+libarm64_DATA += %reldir%/libbluetoothapis.a
 libarm64_DATA += %reldir%/libbootvid.a
 libarm64_DATA += %reldir%/libbrowcli.a
 libarm64_DATA += %reldir%/libbrowser.a