4 files changed, 10 insertions, 12 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 876685b6..b7f9a198 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -46,7 +46,6 @@ HEADERS += \
     qbluetoothlocaldevice_p.h \
     qlowenergycontrollerbase_p.h \
     qlowenergyserviceprivate_p.h \
-    qleadvertiser_p.h \
     lecmaccalculator_p.h
 
 SOURCES += \
@@ -116,8 +115,10 @@ qtConfig(bluez) {
             lecmaccalculator.cpp \
             qlowenergycontroller_bluezdbus.cpp
 
-        HEADERS += qlowenergycontroller_bluezdbus_p.h \
-                           qlowenergycontroller_bluez_p.h
+        HEADERS += \
+            qleadvertiser_bluez_p.h \
+            qlowenergycontroller_bluezdbus_p.h \
+            qlowenergycontroller_bluez_p.h
 
         qtConfig(linux_crypto_api): DEFINES += CONFIG_LINUX_CRYPTO_API
     } else {
diff --git a/src/bluetooth/qleadvertiser_bluez.cpp b/src/bluetooth/qleadvertiser_bluez.cpp
index 98f965a1..83641575 100644
--- a/src/bluetooth/qleadvertiser_bluez.cpp
+++ b/src/bluetooth/qleadvertiser_bluez.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qleadvertiser_p.h"
+#include "qleadvertiser_bluez_p.h"
 
 #include "bluez/bluez_data_p.h"
 #include "bluez/hcimanager_p.h"
diff --git a/src/bluetooth/qleadvertiser_p.h b/src/bluetooth/qleadvertiser_bluez_p.h
index 6cddd1e3..f5d6d49f 100644
--- a/src/bluetooth/qleadvertiser_p.h
+++ b/src/bluetooth/qleadvertiser_bluez_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QLEADVERTISER_P_H
-#define QLEADVERTISER_P_H
+#ifndef QLEADVERTISER_BLUEZ_P_H
+#define QLEADVERTISER_BLUEZ_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@
 #include "qlowenergyadvertisingdata.h"
 #include "qlowenergyadvertisingparameters.h"
 
-#if QT_CONFIG(bluez)
+QT_REQUIRE_CONFIG(bluez);
+
 #include "bluez/bluez_data_p.h"
-#endif
 
 #include <QtCore/qobject.h>
 #include <QtCore/qvector.h>
@@ -94,8 +94,6 @@ private:
     const QLowEnergyAdvertisingData m_responseData;
 };
 
-
-#if QT_CONFIG(bluez)
 struct AdvData;
 struct AdvParams;
 class HciManager;
@@ -147,7 +145,6 @@ private:
     quint8 m_powerLevel;
     bool m_sendPowerLevel;
 };
-#endif // QT_CONFIG(bluez)
 
 QT_END_NAMESPACE
 
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index aab6df12..bc802f34 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -42,7 +42,7 @@
 #include "qlowenergycontroller_bluez_p.h"
 #include "qbluetoothsocketbase_p.h"
 #include "qbluetoothsocket_bluez_p.h"
-#include "qleadvertiser_p.h"
+#include "qleadvertiser_bluez_p.h"
 #include "bluez/bluez_data_p.h"
 #include "bluez/hcimanager_p.h"
 #include "bluez/objectmanager_p.h"