55 files changed, 201 insertions, 251 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 7729b6ae..d1653786 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -159,7 +159,7 @@ qtConfig(bluez) {
     DEFINES += QT_OSX_BLUETOOTH
     LIBS_PRIVATE += -framework Foundation -framework IOBluetooth
 
-    include(osx/osxbt.pri)
+    include(darwin/darwinbt.pri)
     OBJECTIVE_SOURCES += \
         qbluetoothlocaldevice_macos.mm \
         qbluetoothdevicediscoveryagent_darwin.mm \
@@ -185,7 +185,7 @@ qtConfig(bluez) {
         qlowenergycontroller_darwin_p.h \
         qbluetoothsocket_dummy_p.h
 
-    include(osx/osxbt.pri)
+    include(darwin/darwinbt.pri)
     SOURCES += \
         qbluetoothlocaldevice_p.cpp \
         qbluetoothserviceinfo_p.cpp \
diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/darwin/btcentralmanager.mm
index d6a7cf70..12be3ee7 100644
--- a/src/bluetooth/osx/osxbtcentralmanager.mm
+++ b/src/bluetooth/darwin/btcentralmanager.mm
@@ -40,8 +40,8 @@
 #include "qlowenergyserviceprivate_p.h"
 #include "qlowenergycharacteristic.h"
 #include "qlowenergycontroller.h"
-#include "osxbtcentralmanager_p.h"
-#include "osxbtnotifier_p.h"
+#include "btcentralmanager_p.h"
+#include "btnotifier_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
diff --git a/src/bluetooth/osx/osxbtcentralmanager_p.h b/src/bluetooth/darwin/btcentralmanager_p.h
index d6db55ee..ae2931ca 100644
--- a/src/bluetooth/osx/osxbtcentralmanager_p.h
+++ b/src/bluetooth/darwin/btcentralmanager_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTCENTRALMANAGER_P_H
-#define OSXBTCENTRALMANAGER_P_H
+#ifndef BTCENTRALMANAGER_P_H
+#define BTCENTRALMANAGER_P_H
 
 //
 //  W A R N I N G
@@ -53,10 +53,9 @@
 
 #include "qlowenergycontroller.h"
 #include "qlowenergyservice.h"
-#include "osxbtgcdtimer_p.h"
 #include "qbluetoothuuid.h"
-#include "osxbtutility_p.h"
-#include "osxbluetooth_p.h"
+#include "btgcdtimer_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qglobal.h>
@@ -65,6 +64,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <CoreBluetooth/CoreBluetooth.h>
+
 QT_BEGIN_NAMESPACE
 
 class QLowEnergyServicePrivate;
diff --git a/src/bluetooth/osx/osxbtconnectionmonitor.mm b/src/bluetooth/darwin/btconnectionmonitor.mm
index f70c4a05..5110a0e1 100644
--- a/src/bluetooth/osx/osxbtconnectionmonitor.mm
+++ b/src/bluetooth/darwin/btconnectionmonitor.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "osxbtconnectionmonitor_p.h"
-#include "osxbtutility_p.h"
+#include "btconnectionmonitor_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/bluetooth/osx/osxbtconnectionmonitor_p.h b/src/bluetooth/darwin/btconnectionmonitor_p.h
index 40bda611..e2a2df0e 100644
--- a/src/bluetooth/osx/osxbtconnectionmonitor_p.h
+++ b/src/bluetooth/darwin/btconnectionmonitor_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTCONNECTIONMONITOR_P_H
-#define OSXBTCONNECTIONMONITOR_P_H
+#ifndef BTCONNECTIONMONITOR_P_H
+#define BTCONNECTIONMONITOR_P_H
 
 //
 //  W A R N I N G
@@ -52,13 +52,14 @@
 //
 
 #include "qbluetoothaddress.h"
-#include "osxbluetooth_p.h"
 #include "btdelegates_p.h"
 
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 @class QT_MANGLE_NAMESPACE(OSXBTConnectionMonitor);
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/osx/btdelegates.cpp b/src/bluetooth/darwin/btdelegates.cpp
index 531ca1df..531ca1df 100644
--- a/src/bluetooth/osx/btdelegates.cpp
+++ b/src/bluetooth/darwin/btdelegates.cpp
diff --git a/src/bluetooth/osx/btdelegates_p.h b/src/bluetooth/darwin/btdelegates_p.h
index 11fbcc28..11fbcc28 100644
--- a/src/bluetooth/osx/btdelegates_p.h
+++ b/src/bluetooth/darwin/btdelegates_p.h
diff --git a/src/bluetooth/osx/osxbtdeviceinquiry.mm b/src/bluetooth/darwin/btdeviceinquiry.mm
index 146e8481..68a804e9 100644
--- a/src/bluetooth/osx/osxbtdeviceinquiry.mm
+++ b/src/bluetooth/darwin/btdeviceinquiry.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "osxbtdeviceinquiry_p.h"
-#include "osxbtutility_p.h"
+#include "btdeviceinquiry_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
diff --git a/src/bluetooth/osx/osxbtdeviceinquiry_p.h b/src/bluetooth/darwin/btdeviceinquiry_p.h
index 86ed3fdf..423fd481 100644
--- a/src/bluetooth/osx/osxbtdeviceinquiry_p.h
+++ b/src/bluetooth/darwin/btdeviceinquiry_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTDEVICEINQUIRY_P_H
-#define OSXBTDEVICEINQUIRY_P_H
+#ifndef BTDEVICEINQUIRY_P_H
+#define BTDEVICEINQUIRY_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,6 @@
 // We mean it.
 //
 
-#include "osxbluetooth_p.h"
 #include "btdelegates_p.h"
 
 #include <QtCore/qglobal.h>
@@ -59,6 +58,8 @@
 #include <Foundation/Foundation.h>
 #include <IOKit/IOReturn.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 @interface QT_MANGLE_NAMESPACE(OSXBTDeviceInquiry) : NSObject<IOBluetoothDeviceInquiryDelegate>
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth::DeviceInquiryDelegate) *)delegate;
diff --git a/src/bluetooth/osx/osxbtdevicepair.mm b/src/bluetooth/darwin/btdevicepair.mm
index 00b95dee..14fcebe3 100644
--- a/src/bluetooth/osx/osxbtdevicepair.mm
+++ b/src/bluetooth/darwin/btdevicepair.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "osxbtdevicepair_p.h"
-#include "osxbtutility_p.h"
+#include "btdevicepair_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
diff --git a/src/bluetooth/osx/osxbtdevicepair_p.h b/src/bluetooth/darwin/btdevicepair_p.h
index 35913167..e3e58ba0 100644
--- a/src/bluetooth/osx/osxbtdevicepair_p.h
+++ b/src/bluetooth/darwin/btdevicepair_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTDEVICEPAIR_P_H
-#define OSXBTDEVICEPAIR_P_H
+#ifndef BTDEVICEPAIR_P_H
+#define BTDEVICEPAIR_P_H
 
 //
 //  W A R N I N G
@@ -52,14 +52,15 @@
 //
 
 #include "qbluetoothaddress.h"
-#include "osxbtutility_p.h"
-#include "osxbluetooth_p.h"
 #include "btdelegates_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 @class QT_MANGLE_NAMESPACE(OSXBTPairing);
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/osx/osxbtgcdtimer.mm b/src/bluetooth/darwin/btgcdtimer.mm
index b849c9cc..0307ce84 100644
--- a/src/bluetooth/osx/osxbtgcdtimer.mm
+++ b/src/bluetooth/darwin/btgcdtimer.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "osxbtgcdtimer_p.h"
-#include "osxbtutility_p.h"
+#include "btgcdtimer_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/bluetooth/osx/osxbtgcdtimer_p.h b/src/bluetooth/darwin/btgcdtimer_p.h
index 266a4c98..277cf7ca 100644
--- a/src/bluetooth/osx/osxbtgcdtimer_p.h
+++ b/src/bluetooth/darwin/btgcdtimer_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "osxbtutility_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qglobal.h>
diff --git a/src/bluetooth/osx/osxbtl2capchannel.mm b/src/bluetooth/darwin/btl2capchannel.mm
index 31392c07..6a4eb0ce 100644
--- a/src/bluetooth/osx/osxbtl2capchannel.mm
+++ b/src/bluetooth/darwin/btl2capchannel.mm
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "osxbtl2capchannel_p.h"
+#include "btl2capchannel_p.h"
 #include "qbluetoothaddress.h"
-#include "osxbtutility_p.h"
 #include "btdelegates_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
diff --git a/src/bluetooth/osx/osxbtl2capchannel_p.h b/src/bluetooth/darwin/btl2capchannel_p.h
index 42eec8e7..74bfaf78 100644
--- a/src/bluetooth/osx/osxbtl2capchannel_p.h
+++ b/src/bluetooth/darwin/btl2capchannel_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTL2CAPCHANNEL_P_H
-#define OSXBTL2CAPCHANNEL_P_H
+#ifndef BTL2CAPCHANNEL_P_H
+#define BTL2CAPCHANNEL_P_H
 
 //
 //  W A R N I N G
@@ -51,12 +51,12 @@
 // We mean it.
 //
 
-#include "osxbluetooth_p.h"
-
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 #include <cstddef>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry.mm b/src/bluetooth/darwin/btledeviceinquiry.mm
index e4ec61ce..c12af39d 100644
--- a/src/bluetooth/osx/osxbtledeviceinquiry.mm
+++ b/src/bluetooth/darwin/btledeviceinquiry.mm
@@ -37,11 +37,11 @@
 **
 ****************************************************************************/
 
-#include "osxbtledeviceinquiry_p.h"
 #include "qbluetoothdeviceinfo.h"
-#include "osxbtnotifier_p.h"
+#include "btledeviceinquiry_p.h"
 #include "qbluetoothuuid.h"
-#include "osxbtutility_p.h"
+#include "btnotifier_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry_p.h b/src/bluetooth/darwin/btledeviceinquiry_p.h
index 5cd41e71..026f7a88 100644
--- a/src/bluetooth/osx/osxbtledeviceinquiry_p.h
+++ b/src/bluetooth/darwin/btledeviceinquiry_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTLEDEVICEINQUIRY_P_H
-#define OSXBTLEDEVICEINQUIRY_P_H
+#ifndef BTLEDEVICEINQUIRY_P_H
+#define BTLEDEVICEINQUIRY_P_H
 
 //
 //  W A R N I N G
@@ -53,15 +53,16 @@
 
 #include "qbluetoothdevicediscoveryagent.h"
 #include "qbluetoothdeviceinfo.h"
-#include "osxbtgcdtimer_p.h"
-#include "osxbtutility_p.h"
-#include "osxbluetooth_p.h"
+#include "btgcdtimer_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qlist.h>
 
 #include <Foundation/Foundation.h>
 
+#include <CoreBluetooth/CoreBluetooth.h>
+
 QT_BEGIN_NAMESPACE
 
 class QBluetoothUuid;
diff --git a/src/bluetooth/darwin/btnotifier.cpp b/src/bluetooth/darwin/btnotifier.cpp
new file mode 100644
index 00000000..24f54a09
--- /dev/null
+++ b/src/bluetooth/darwin/btnotifier.cpp
@@ -0,0 +1 @@
+#include "btnotifier_p.h"
diff --git a/src/bluetooth/osx/osxbtnotifier_p.h b/src/bluetooth/darwin/btnotifier_p.h
index 2e9c61eb..e074a225 100644
--- a/src/bluetooth/osx/osxbtnotifier_p.h
+++ b/src/bluetooth/darwin/btnotifier_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTNOTIFIER_P_H
-#define OSXBTNOTIFIER_P_H
+#ifndef BTNOTIFIER_P_H
+#define BTNOTIFIER_P_H
 
 //
 //  W A R N I N G
diff --git a/src/bluetooth/osx/osxbtobexsession.mm b/src/bluetooth/darwin/btobexsession.mm
index 95c87d11..933f94a7 100644
--- a/src/bluetooth/osx/osxbtobexsession.mm
+++ b/src/bluetooth/darwin/btobexsession.mm
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "osxbtobexsession_p.h"
 #include "qbluetoothaddress.h"
-#include "osxbtutility_p.h"
+#include "btobexsession_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qvector.h>
diff --git a/src/bluetooth/osx/osxbtobexsession_p.h b/src/bluetooth/darwin/btobexsession_p.h
index ecf44cff..ab8388e5 100644
--- a/src/bluetooth/osx/osxbtobexsession_p.h
+++ b/src/bluetooth/darwin/btobexsession_p.h
@@ -37,6 +37,9 @@
 **
 ****************************************************************************/
 
+#ifndef BTOBEXSESSION_P_H
+#define BTOBEXSESSION_P_H
+
 //
 //  W A R N I N G
 //  -------------
@@ -48,13 +51,13 @@
 // We mean it.
 //
 
-#include "osxbluetooth_p.h"
-
 #include <QtCore/qvariant.h>
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 // TODO: all this code must be removed in Qt 6?
 
 @class QT_MANGLE_NAMESPACE(OSXBTOBEXSession);
@@ -131,3 +134,6 @@ QT_END_NAMESPACE
 - (bool)hasActiveRequest;
 
 @end
+
+#endif
+
diff --git a/src/bluetooth/osx/osxbtperipheralmanager.mm b/src/bluetooth/darwin/btperipheralmanager.mm
index 515f41fc..a500966c 100644
--- a/src/bluetooth/osx/osxbtperipheralmanager.mm
+++ b/src/bluetooth/darwin/btperipheralmanager.mm
@@ -41,9 +41,9 @@
 
 #include "qlowenergycharacteristicdata.h"
 #include "qlowenergydescriptordata.h"
-#include "osxbtperipheralmanager_p.h"
+#include "btperipheralmanager_p.h"
 #include "qlowenergyservicedata.h"
-#include "osxbtnotifier_p.h"
+#include "btnotifier_p.h"
 #include "qbluetooth.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/bluetooth/osx/osxbtperipheralmanager_p.h b/src/bluetooth/darwin/btperipheralmanager_p.h
index 72f6efb4..4c5a5a45 100644
--- a/src/bluetooth/osx/osxbtperipheralmanager_p.h
+++ b/src/bluetooth/darwin/btperipheralmanager_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTPERIPHERALMANAGER_P_H
-#define OSXBTPERIPHERALMANAGER_P_H
+#ifndef BTPERIPHERALMANAGER_P_H
+#define BTPERIPHERALMANAGER_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "osxbtutility_p.h"
+#include "btutility_p.h"
 
 #include "qlowenergyadvertisingparameters.h"
 #include "qlowenergyserviceprivate_p.h"
@@ -71,7 +71,7 @@
 
 #include <Foundation/Foundation.h>
 
-#include "osxbluetooth_p.h"
+#include <CoreBluetooth/CoreBluetooth.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/bluetooth/osx/btraii.mm b/src/bluetooth/darwin/btraii.mm
index a1bf2a8d..a1bf2a8d 100644
--- a/src/bluetooth/osx/btraii.mm
+++ b/src/bluetooth/darwin/btraii.mm
diff --git a/src/bluetooth/osx/btraii_p.h b/src/bluetooth/darwin/btraii_p.h
index 6053d63b..6053d63b 100644
--- a/src/bluetooth/osx/btraii_p.h
+++ b/src/bluetooth/darwin/btraii_p.h
diff --git a/src/bluetooth/osx/osxbtrfcommchannel.mm b/src/bluetooth/darwin/btrfcommchannel.mm
index 6ce8c3cd..5e9d5e51 100644
--- a/src/bluetooth/osx/osxbtrfcommchannel.mm
+++ b/src/bluetooth/darwin/btrfcommchannel.mm
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "osxbtrfcommchannel_p.h"
+#include "btrfcommchannel_p.h"
 #include "qbluetoothaddress.h"
-#include "osxbtutility_p.h"
 #include "btdelegates_p.h"
+#include "btutility_p.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/bluetooth/osx/osxbtrfcommchannel_p.h b/src/bluetooth/darwin/btrfcommchannel_p.h
index 44416cce..8f14fe9f 100644
--- a/src/bluetooth/osx/osxbtrfcommchannel_p.h
+++ b/src/bluetooth/darwin/btrfcommchannel_p.h
@@ -51,12 +51,12 @@
 // We mean it.
 //
 
-#include "osxbluetooth_p.h"
-
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 @class QT_MANGLE_NAMESPACE(OSXBTRFCOMMChannel);
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/osx/osxbtsdpinquiry.mm b/src/bluetooth/darwin/btsdpinquiry.mm
index ebcca34e..fc653831 100644
--- a/src/bluetooth/osx/osxbtsdpinquiry.mm
+++ b/src/bluetooth/darwin/btsdpinquiry.mm
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include "qbluetoothserviceinfo.h"
-#include "osxbtsdpinquiry_p.h"
+#include "btsdpinquiry_p.h"
 #include "qbluetoothuuid.h"
-#include "osxbtutility_p.h"
 #include "btdelegates_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qstring.h>
diff --git a/src/bluetooth/osx/osxbtsdpinquiry_p.h b/src/bluetooth/darwin/btsdpinquiry_p.h
index ea3b99f6..80d3e66c 100644
--- a/src/bluetooth/osx/osxbtsdpinquiry_p.h
+++ b/src/bluetooth/darwin/btsdpinquiry_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTSDPINQUIRY_H
-#define OSXBTSDPINQUIRY_H
+#ifndef BTSDPINQUIRY_H
+#define BTSDPINQUIRY_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,6 @@
 
 #include "qbluetoothaddress.h"
 #include "qbluetoothuuid.h"
-#include "osxbluetooth_p.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qlist.h>
@@ -61,6 +60,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 @class QT_MANGLE_NAMESPACE(OSXBTSDPInquiry);
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/osx/osxbtservicerecord.mm b/src/bluetooth/darwin/btservicerecord.mm
index 18e7a58b..82067558 100644
--- a/src/bluetooth/osx/osxbtservicerecord.mm
+++ b/src/bluetooth/darwin/btservicerecord.mm
@@ -38,14 +38,15 @@
 ****************************************************************************/
 
 #include "qbluetoothserviceinfo.h"
-#include "osxbtservicerecord_p.h"
-#include "osxbluetooth_p.h"
+#include "btservicerecord_p.h"
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qurl.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace DarwinBluetooth {
diff --git a/src/bluetooth/osx/osxbtservicerecord_p.h b/src/bluetooth/darwin/btservicerecord_p.h
index 685a7274..6b5b0374 100644
--- a/src/bluetooth/osx/osxbtservicerecord_p.h
+++ b/src/bluetooth/darwin/btservicerecord_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTSERVICERECORD_P_H
-#define OSXBTSERVICERECORD_P_H
+#ifndef BTSERVICERECORD_P_H
+#define BTSERVICERECORD_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "osxbtutility_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qglobal.h>
 
diff --git a/src/bluetooth/osx/osxbtsocketlistener.mm b/src/bluetooth/darwin/btsocketlistener.mm
index 10526b0f..046c683b 100644
--- a/src/bluetooth/osx/osxbtsocketlistener.mm
+++ b/src/bluetooth/darwin/btsocketlistener.mm
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "osxbtsocketlistener_p.h"
-#include "osxbtutility_p.h"
+#include "btsocketlistener_p.h"
 #include "btdelegates_p.h"
+#include "btutility_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/bluetooth/osx/osxbtsocketlistener_p.h b/src/bluetooth/darwin/btsocketlistener_p.h
index 3bbce24e..236207b8 100644
--- a/src/bluetooth/osx/osxbtsocketlistener_p.h
+++ b/src/bluetooth/darwin/btsocketlistener_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTSOCKETLISTENER_P_H
-#define OSXBTSOCKETLISTENER_P_H
+#ifndef BTSOCKETLISTENER_P_H
+#define BTSOCKETLISTENER_P_H
 
 //
 //  W A R N I N G
@@ -51,12 +51,12 @@
 // We mean it.
 //
 
-#include "osxbluetooth_p.h"
-
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 // TODO: use the special macros we have to create an
 // alias for a mangled name.
 @class QT_MANGLE_NAMESPACE(OSXBTSocketListener);
diff --git a/src/bluetooth/osx/osxbtutility.mm b/src/bluetooth/darwin/btutility.mm
index 3a12553b..6f223a82 100644
--- a/src/bluetooth/osx/osxbtutility.mm
+++ b/src/bluetooth/darwin/btutility.mm
@@ -39,7 +39,7 @@
 
 #include "qlowenergycharacteristicdata.h"
 #include "qbluetoothaddress.h"
-#include "osxbtutility_p.h"
+#include "btutility_p.h"
 #include "qbluetoothuuid.h"
 
 #include <QtCore/qendian.h>
diff --git a/src/bluetooth/osx/osxbtutility_p.h b/src/bluetooth/darwin/btutility_p.h
index 1be7fb82..3108b515 100644
--- a/src/bluetooth/osx/osxbtutility_p.h
+++ b/src/bluetooth/darwin/btutility_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTUTILITY_P_H
-#define OSXBTUTILITY_P_H
+#ifndef BTUTILITY_P_H
+#define BTUTILITY_P_H
 
 //
 //  W A R N I N G
@@ -51,14 +51,18 @@
 // We mean it.
 //
 
-#include "osxbluetooth_p.h"
-
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qglobal.h>
 
 #include <Foundation/Foundation.h>
 
+#include <CoreBluetooth/CoreBluetooth.h>
+
+#ifdef Q_OS_MACOS
+#include <IOBluetooth/IOBluetooth.h>
+#endif // Q_OS_MACOS
+
 QT_BEGIN_NAMESPACE
 
 class QLowEnergyCharacteristicData;
@@ -332,4 +336,4 @@ QT_END_NAMESPACE
 
 #endif // QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE
 
-#endif // OSXBTUTILITY_P_H
+#endif // BTUTILITY_P_H
diff --git a/src/bluetooth/darwin/darwinbt.pri b/src/bluetooth/darwin/darwinbt.pri
new file mode 100644
index 00000000..a1ca887b
--- /dev/null
+++ b/src/bluetooth/darwin/darwinbt.pri
@@ -0,0 +1,48 @@
+SOURCES += darwin/uistrings.cpp \
+           darwin/btnotifier.cpp \
+           darwin/btdelegates.cpp \
+           darwin/btledeviceinquiry.mm \
+           darwin/btcentralmanager.mm
+
+PRIVATE_HEADERS += darwin/uistrings_p.h \
+                   darwin/btgcdtimer_p.h \
+                   darwin/btraii_p.h \
+                   darwin/btdelegates_p.h \
+                   darwin/btutility_p.h \
+                   darwin/btledeviceinquiry_p.h \
+                   darwin/btcentralmanager_p.h \
+                   darwin/btnotifier_p.h
+
+OBJECTIVE_SOURCES += darwin/btgcdtimer.mm \
+                     darwin/btraii.mm \
+                     darwin/btutility.mm
+
+#QMAKE_CXXFLAGS_WARN_ON += -Wno-nullability-completeness
+
+macos {
+    PRIVATE_HEADERS += darwin/btdevicepair_p.h \
+                       darwin/btdeviceinquiry_p.h \
+                       darwin/btconnectionmonitor_p.h \
+                       darwin/btsdpinquiry_p.h \
+                       darwin/btrfcommchannel_p.h \
+                       darwin/btl2capchannel_p.h \
+                       darwin/btservicerecord_p.h \
+                       darwin/btsocketlistener_p.h \
+                       darwin/btobexsession_p.h
+
+    OBJECTIVE_SOURCES += darwin/btdevicepair.mm \
+                         darwin/btdeviceinquiry.mm \
+                         darwin/btconnectionmonitor.mm \
+                         darwin/btsdpinquiry.mm \
+                         darwin/btrfcommchannel.mm \
+                         darwin/btl2capchannel.mm \
+                         darwin/btservicerecord.mm \
+                         darwin/btsocketlistener.mm \
+                         darwin/btobexsession.mm
+}
+
+macos | ios {
+    PRIVATE_HEADERS += darwin/btperipheralmanager_p.h
+
+    OBJECTIVE_SOURCES += darwin/btperipheralmanager.mm
+}
diff --git a/src/bluetooth/osx/uistrings.cpp b/src/bluetooth/darwin/uistrings.cpp
index 7260417f..7260417f 100644
--- a/src/bluetooth/osx/uistrings.cpp
+++ b/src/bluetooth/darwin/uistrings.cpp
diff --git a/src/bluetooth/osx/uistrings_p.h b/src/bluetooth/darwin/uistrings_p.h
index 999a8c6d..999a8c6d 100644
--- a/src/bluetooth/osx/uistrings_p.h
+++ b/src/bluetooth/darwin/uistrings_p.h
diff --git a/src/bluetooth/osx/osxbluetooth_p.h b/src/bluetooth/osx/osxbluetooth_p.h
deleted file mode 100644
index ea1b388f..00000000
--- a/src/bluetooth/osx/osxbluetooth_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef OSXBLUETOOTH_P_H
-#define OSXBLUETOOTH_P_H
-
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-#include <CoreBluetooth/CoreBluetooth.h>
-
-#ifdef Q_OS_MACOS
-#include <IOBluetooth/IOBluetooth.h>
-#endif
-
-#endif // OSXBLUETOOTH_P_H
diff --git a/src/bluetooth/osx/osxbt.pri b/src/bluetooth/osx/osxbt.pri
deleted file mode 100644
index 8f6ea0d1..00000000
--- a/src/bluetooth/osx/osxbt.pri
+++ /dev/null
@@ -1,61 +0,0 @@
-SOURCES += osx/uistrings.cpp \
-           osx/osxbtnotifier.cpp \
-           osx/btdelegates.cpp
-
-PRIVATE_HEADERS += osx/uistrings_p.h \
-                   osx/osxbtgcdtimer_p.h \
-                   osx/btraii_p.h \
-                   osx/btdelegates_p.h
-
-
-OBJECTIVE_SOURCES += osx/osxbtgcdtimer.mm \
-                     osx/btraii.mm
-#QMAKE_CXXFLAGS_WARN_ON += -Wno-nullability-completeness
-
-CONFIG(osx) {
-    PRIVATE_HEADERS += osx/osxbtutility_p.h \
-                       osx/osxbtdevicepair_p.h \
-                       osx/osxbtdeviceinquiry_p.h \
-                       osx/osxbtconnectionmonitor_p.h \
-                       osx/osxbtsdpinquiry_p.h \
-                       osx/osxbtrfcommchannel_p.h \
-                       osx/osxbtl2capchannel_p.h \
-                       osx/osxbtservicerecord_p.h \
-                       osx/osxbtsocketlistener_p.h \
-                       osx/osxbtobexsession_p.h \
-                       osx/osxbtledeviceinquiry_p.h \
-                       osx/osxbluetooth_p.h \
-                       osx/osxbtcentralmanager_p.h \
-                       osx/osxbtnotifier_p.h \
-                       osx/osxbtperipheralmanager_p.h
-
-    OBJECTIVE_SOURCES += osx/osxbtutility.mm \
-                         osx/osxbtdevicepair.mm \
-                         osx/osxbtdeviceinquiry.mm \
-                         osx/osxbtconnectionmonitor.mm \
-                         osx/osxbtsdpinquiry.mm \
-                         osx/osxbtrfcommchannel.mm \
-                         osx/osxbtl2capchannel.mm \
-                         osx/osxbtservicerecord.mm \
-                         osx/osxbtsocketlistener.mm \
-                         osx/osxbtobexsession.mm \
-                         osx/osxbtledeviceinquiry.mm \
-                         osx/osxbtcentralmanager.mm \
-                         osx/osxbtperipheralmanager.mm
-} else {
-    PRIVATE_HEADERS += osx/osxbtutility_p.h \
-                       osx/osxbtledeviceinquiry_p.h \
-                       osx/osxbluetooth_p.h \
-                       osx/osxbtcentralmanager_p.h \
-                       osx/osxbtnotifier_p.h
-    ios {
-        PRIVATE_HEADERS += osx/osxbtperipheralmanager_p.h
-    }
-
-    OBJECTIVE_SOURCES += osx/osxbtutility.mm \
-                         osx/osxbtledeviceinquiry.mm \
-                         osx/osxbtcentralmanager.mm
-    ios {
-        OBJECTIVE_SOURCES += osx/osxbtperipheralmanager.mm
-    }
-}
diff --git a/src/bluetooth/osx/osxbtnotifier.cpp b/src/bluetooth/osx/osxbtnotifier.cpp
deleted file mode 100644
index 0e0343cf..00000000
--- a/src/bluetooth/osx/osxbtnotifier.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "osxbtnotifier_p.h"
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
index 2a1bb667..e333a4de 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
@@ -40,21 +40,24 @@
 #include "qbluetoothdevicediscoveryagent_p.h"
 #include "qbluetoothdevicediscoveryagent.h"
 
-#include "osx/osxbtledeviceinquiry_p.h"
+#include "darwin/btledeviceinquiry_p.h"
+
 #ifdef Q_OS_MACOS
-#include "osx/osxbtdeviceinquiry_p.h"
-#include "osx/osxbtsdpinquiry_p.h"
+#include "darwin/btdeviceinquiry_p.h"
+#include "darwin/btsdpinquiry_p.h"
+
+#include <IOBluetooth/IOBluetooth.h>
 #endif // Q_OS_MACOS
+
 #include "qbluetoothdeviceinfo.h"
-#include "osx/osxbtnotifier_p.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/osxbluetooth_p.h"
-#include "osx/uistrings_p.h"
+#include "darwin/btnotifier_p.h"
+#include "darwin/btutility_p.h"
+#include "darwin/uistrings_p.h"
 #include "qbluetoothhostinfo.h"
+#include "darwin/uistrings_p.h"
 #include "qbluetoothaddress.h"
-#include "osx/uistrings_p.h"
+#include "darwin/btraii_p.h"
 #include "qbluetoothuuid.h"
-#include "osx/btraii_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qscopedpointer.h>
@@ -65,6 +68,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <CoreBluetooth/CoreBluetooth.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 27220a09..263ab9ca 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -60,8 +60,8 @@
 #endif
 
 #ifdef Q_OS_DARWIN
-#include "osx/btdelegates_p.h"
-#include "osx/btraii_p.h"
+#include "darwin/btdelegates_p.h"
+#include "darwin/btraii_p.h"
 #endif // Q_OS_DARWIN
 
 #include <QtCore/QVariantMap>
diff --git a/src/bluetooth/qbluetoothlocaldevice_macos.mm b/src/bluetooth/qbluetoothlocaldevice_macos.mm
index efe76123..f086710f 100644
--- a/src/bluetooth/qbluetoothlocaldevice_macos.mm
+++ b/src/bluetooth/qbluetoothlocaldevice_macos.mm
@@ -37,13 +37,12 @@
 **
 ****************************************************************************/
 
-#include "osx/osxbtconnectionmonitor_p.h"
+#include "darwin/btconnectionmonitor_p.h"
 #include "qbluetoothlocaldevice_p.h"
 #include "qbluetoothlocaldevice.h"
-#include "osx/osxbtdevicepair_p.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/osxbluetooth_p.h"
-#include "osx/btdelegates_p.h"
+#include "darwin/btdevicepair_p.h"
+#include "darwin/btdelegates_p.h"
+#include "darwin/btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qstring.h>
@@ -54,6 +53,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/qbluetoothserver_macos.mm b/src/bluetooth/qbluetoothserver_macos.mm
index 1d19f161..f7d4a0d8 100644
--- a/src/bluetooth/qbluetoothserver_macos.mm
+++ b/src/bluetooth/qbluetoothserver_macos.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "osx/osxbtsocketlistener_p.h"
+#include "darwin/btsocketlistener_p.h"
 #include "qbluetoothserver_p.h"
 
 // The order is important: a workround for
@@ -47,8 +47,7 @@
 #include "qbluetoothsocket_macos_p.h"
 
 #include "qbluetoothlocaldevice.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/osxbluetooth_p.h"
+#include "darwin/btutility_p.h"
 #include "qbluetoothserver.h"
 #include "qbluetoothsocket.h"
 
@@ -60,6 +59,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 #include <limits>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h
index d14dc7b4..a82114ba 100644
--- a/src/bluetooth/qbluetoothserver_p.h
+++ b/src/bluetooth/qbluetoothserver_p.h
@@ -79,8 +79,8 @@ class ServerAcceptanceThread;
 
 #ifdef QT_OSX_BLUETOOTH
 
-#include "osx/btdelegates_p.h"
-#include "osx/btraii_p.h"
+#include "darwin/btdelegates_p.h"
+#include "darwin/btraii_p.h"
 
 #include <QtCore/qvector.h>
 
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm b/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
index 0bc8bb66..fc852dce 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
@@ -41,11 +41,10 @@
 #include "qbluetoothservicediscoveryagent.h"
 #include "qbluetoothdevicediscoveryagent.h"
 #include "qbluetoothlocaldevice.h"
-#include "osx/osxbtsdpinquiry_p.h"
+#include "darwin/btsdpinquiry_p.h"
 #include "qbluetoothhostinfo.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/osxbluetooth_p.h"
-#include "osx/uistrings_p.h"
+#include "darwin/btutility_p.h"
+#include "darwin/uistrings_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qscopedpointer.h>
@@ -56,6 +55,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace {
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index 41410b70..d9b1e5f4 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -91,8 +91,8 @@ QT_END_NAMESPACE
 #endif
 
 #ifdef QT_OSX_BLUETOOTH
-#include "osx/btdelegates_p.h"
-#include "osx/btraii_p.h"
+#include "darwin/btdelegates_p.h"
+#include "darwin/btraii_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/qbluetoothserviceinfo_macos.mm b/src/bluetooth/qbluetoothserviceinfo_macos.mm
index a94b0ab5..b73ae55f 100644
--- a/src/bluetooth/qbluetoothserviceinfo_macos.mm
+++ b/src/bluetooth/qbluetoothserviceinfo_macos.mm
@@ -37,13 +37,12 @@
 **
 ****************************************************************************/
 
-#include "osx/osxbtservicerecord_p.h"
 #include "qbluetoothserviceinfo_p.h"
+#include "darwin/btservicerecord_p.h"
 #include "qbluetoothserviceinfo.h"
 #include "qbluetoothdeviceinfo.h"
 #include "qbluetoothserver_p.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/osxbluetooth_p.h"
+#include "darwin/btutility_p.h"
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qvariant.h>
@@ -54,6 +53,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include <IOBluetooth/IOBluetooth.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace {
diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h
index 3ed005e1..a51204c6 100644
--- a/src/bluetooth/qbluetoothserviceinfo_p.h
+++ b/src/bluetooth/qbluetoothserviceinfo_p.h
@@ -60,7 +60,7 @@
 #include <QVariant>
 
 #ifdef Q_OS_MACOS
-#include "osx/btraii_p.h"
+#include "darwin/btraii_p.h"
 #endif
 
 class OrgBluezServiceInterface;
diff --git a/src/bluetooth/qbluetoothsocket_macos.mm b/src/bluetooth/qbluetoothsocket_macos.mm
index ef2b39f4..a275e292 100644
--- a/src/bluetooth/qbluetoothsocket_macos.mm
+++ b/src/bluetooth/qbluetoothsocket_macos.mm
@@ -44,12 +44,12 @@
 #include "qbluetoothsocketbase_p.h"
 #include "qbluetoothsocket_macos_p.h"
 
-#include "osx/osxbtrfcommchannel_p.h"
-#include "osx/osxbtl2capchannel_p.h"
+#include "darwin/btrfcommchannel_p.h"
+#include "darwin/btl2capchannel_p.h"
 #include "qbluetoothlocaldevice.h"
 #include "qbluetoothdeviceinfo.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/uistrings_p.h"
+#include "darwin/btutility_p.h"
+#include "darwin/uistrings_p.h"
 #include "qbluetoothsocket.h"
 
 #include <QtCore/qloggingcategory.h>
diff --git a/src/bluetooth/qbluetoothsocket_macos_p.h b/src/bluetooth/qbluetoothsocket_macos_p.h
index 1291878c..93cfbe4c 100644
--- a/src/bluetooth/qbluetoothsocket_macos_p.h
+++ b/src/bluetooth/qbluetoothsocket_macos_p.h
@@ -55,9 +55,9 @@
 
 #include "qbluetoothsocketbase_p.h"
 #include "qbluetoothserviceinfo.h"
-#include "osx/btdelegates_p.h"
+#include "darwin/btdelegates_p.h"
 #include "qbluetoothsocket.h"
-#include "osx/btraii_p.h"
+#include "darwin/btraii_p.h"
 
 #ifndef QPRIVATELINEARBUFFER_BUFFERSIZE
 #define QPRIVATELINEARBUFFER_BUFFERSIZE Q_INT64_C(16384)
diff --git a/src/bluetooth/qbluetoothtransferreply_macos.mm b/src/bluetooth/qbluetoothtransferreply_macos.mm
index fb4f5927..9ca1d817 100644
--- a/src/bluetooth/qbluetoothtransferreply_macos.mm
+++ b/src/bluetooth/qbluetoothtransferreply_macos.mm
@@ -39,10 +39,10 @@
 
 #include "qbluetoothservicediscoveryagent.h"
 #include "qbluetoothtransferreply_macos_p.h"
-#include "osx/osxbtobexsession_p.h"
+#include "darwin/btobexsession_p.h"
 #include "qbluetoothserviceinfo.h"
-#include "osx/osxbtutility_p.h"
-#include "osx/uistrings_p.h"
+#include "darwin/btutility_p.h"
+#include "darwin/uistrings_p.h"
 #include "qbluetoothuuid.h"
 
 
diff --git a/src/bluetooth/qlowenergycontroller_darwin.mm b/src/bluetooth/qlowenergycontroller_darwin.mm
index b715a647..af75926f 100644
--- a/src/bluetooth/qlowenergycontroller_darwin.mm
+++ b/src/bluetooth/qlowenergycontroller_darwin.mm
@@ -38,16 +38,16 @@
 **
 ****************************************************************************/
 
-#include "osx/osxbtutility_p.h"
-#include "osx/uistrings_p.h"
+#include "darwin/btutility_p.h"
+#include "darwin/uistrings_p.h"
 
 #ifndef Q_OS_TVOS
-#include "osx/osxbtperipheralmanager_p.h"
+#include "darwin/btperipheralmanager_p.h"
 #endif // Q_OS_TVOS
 
 #include "qlowenergycontroller_darwin_p.h"
 #include "qlowenergyserviceprivate_p.h"
-#include "osx/osxbtcentralmanager_p.h"
+#include "darwin/btcentralmanager_p.h"
 
 #include "qlowenergyservicedata.h"
 #include "qbluetoothlocaldevice.h"
diff --git a/src/bluetooth/qlowenergycontroller_darwin_p.h b/src/bluetooth/qlowenergycontroller_darwin_p.h
index 1f34457e..b285830c 100644
--- a/src/bluetooth/qlowenergycontroller_darwin_p.h
+++ b/src/bluetooth/qlowenergycontroller_darwin_p.h
@@ -54,10 +54,10 @@
 #include "qlowenergyserviceprivate_p.h"
 #include "qlowenergycontrollerbase_p.h"
 #include "qlowenergycontroller.h"
-#include "osx/osxbtnotifier_p.h"
+#include "darwin/btnotifier_p.h"
 #include "qbluetoothaddress.h"
+#include "darwin/btraii_p.h"
 #include "qbluetoothuuid.h"
-#include "osx/btraii_p.h"
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qglobal.h>