diff --git a/headers/os/bluetooth/DeviceClass.h b/headers/os/bluetooth/DeviceClass.h
index 719175b743..89c3dfb5d3 100644
--- a/headers/os/bluetooth/DeviceClass.h
+++ b/headers/os/bluetooth/DeviceClass.h
@@ -57,4 +57,8 @@ class DeviceClass {
 
 }
 
+#ifndef _BT_USE_EXPLICIT_NAMESPACE
+using Bluetooth::DeviceClass;
+#endif
+
 #endif
diff --git a/headers/os/bluetooth/DiscoveryAgent.h b/headers/os/bluetooth/DiscoveryAgent.h
index 2c0e444a19..2142757b4b 100644
--- a/headers/os/bluetooth/DiscoveryAgent.h
+++ b/headers/os/bluetooth/DiscoveryAgent.h
@@ -55,14 +55,20 @@ class DiscoveryAgent {
         */
         
     private:
-        DiscoveryAgent();
+        DiscoveryAgent(LocalDevice* ld);
         void SetLocalDeviceOwner(LocalDevice* ld);
 
         DiscoveryListener* fLastUsedListener;
         LocalDevice*       fLocalDevice;
+        
+        friend class LocalDevice;
 
 };
 
 }
 
+#ifndef _BT_USE_EXPLICIT_NAMESPACE
+using Bluetooth::DiscoveryAgent;
+#endif
+
 #endif
diff --git a/headers/os/bluetooth/DiscoveryListener.h b/headers/os/bluetooth/DiscoveryListener.h
index 2a64347a61..8bb46b2c2b 100644
--- a/headers/os/bluetooth/DiscoveryListener.h
+++ b/headers/os/bluetooth/DiscoveryListener.h
@@ -52,8 +52,7 @@ class DiscoveryListener : public BLooper {
 		virtual void InquiryStarted(status_t status);
         
     private:                
-        DiscoveryListener();
-		void SetLocalDeviceOwner(LocalDevice* ld);
+
 		RemoteDevicesList GetRemoteDevicesList(void);
 		
         void MessageReceived(BMessage* msg);
@@ -62,8 +61,16 @@ class DiscoveryListener : public BLooper {
 		RemoteDevicesList fRemoteDevicesList;
 		
 		friend class DiscoveryAgent;
+
+	protected:
+	    DiscoveryListener();
+   		void SetLocalDeviceOwner(LocalDevice* ld);
 };
 
 }
 
+#ifndef _BT_USE_EXPLICIT_NAMESPACE
+using Bluetooth::DiscoveryListener;
+#endif
+
 #endif
diff --git a/headers/os/bluetooth/RemoteDevice.h b/headers/os/bluetooth/RemoteDevice.h
index 0ebeabbd1d..23a0d97ae4 100644
--- a/headers/os/bluetooth/RemoteDevice.h
+++ b/headers/os/bluetooth/RemoteDevice.h
@@ -58,4 +58,8 @@ class RemoteDevice {
 
 }
 
+#ifndef _BT_USE_EXPLICIT_NAMESPACE
+using Bluetooth::RemoteDevice;
+#endif
+
 #endif