diff --git a/headers/os/bluetooth/LocalDevice.h b/headers/os/bluetooth/LocalDevice.h
index 47e5a17f39..2cba636f58 100644
--- a/headers/os/bluetooth/LocalDevice.h
+++ b/headers/os/bluetooth/LocalDevice.h
@@ -51,8 +51,6 @@ class LocalDevice {
     private:
         LocalDevice(hci_id hid);
         
-        static   status_t 		SRetrieveBluetoothMessenger(void);           
-                 status_t 		RetrieveBluetoothMessenger(void);
         static   LocalDevice*   RequestLocalDeviceID(BMessage* request);
         
         static BMessenger*      sfMessenger;
diff --git a/src/kits/bluetooth/Jamfile b/src/kits/bluetooth/Jamfile
index f30b71014a..0eb026f116 100644
--- a/src/kits/bluetooth/Jamfile
+++ b/src/kits/bluetooth/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src kits bluetooth ;
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-        UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
+       UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
 }
 
 UsePrivateHeaders bluetooth ;
@@ -13,5 +13,6 @@ SharedLibrary libbluetooth.so :
 	DiscoveryAgent.cpp
 	DiscoveryListener.cpp
 	CommandManager.cpp
+	KitSupport.cpp
 	: be
 ;
diff --git a/src/kits/bluetooth/KitSupport.cpp b/src/kits/bluetooth/KitSupport.cpp
new file mode 100644
index 0000000000..4b692672d3
--- /dev/null
+++ b/src/kits/bluetooth/KitSupport.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+
+#include <bluetooth/bluetooth.h>
+#include <bluetoothserver_p.h>
+
+#include "KitSupport.h"
+
+
+BMessenger* _RetrieveBluetoothMessenger(void)
+{
+	BMessenger* fMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
+
+    if (fMessenger == NULL || !fMessenger->IsValid())
+    	return NULL;
+    else
+    	return fMessenger;
+}
diff --git a/src/kits/bluetooth/KitSupport.h b/src/kits/bluetooth/KitSupport.h
new file mode 100644
index 0000000000..b1596f3309
--- /dev/null
+++ b/src/kits/bluetooth/KitSupport.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+
+#include <Messenger.h>
+
+
+BMessenger* _RetrieveBluetoothMessenger(void);
diff --git a/src/kits/bluetooth/LocalDevice.cpp b/src/kits/bluetooth/LocalDevice.cpp
index ac5a331501..0041beda8f 100644
--- a/src/kits/bluetooth/LocalDevice.cpp
+++ b/src/kits/bluetooth/LocalDevice.cpp
@@ -15,7 +15,9 @@
 
 #include <bluetooth/bdaddrUtils.h>
 
-#include "bluetoothserver_p.h"
+#include <bluetoothserver_p.h>
+
+#include "KitSupport.h"
 
 /* TODO: remove me */
 #include <stdio.h>
@@ -24,22 +26,6 @@ namespace Bluetooth {
 
 BMessenger*  LocalDevice::sfMessenger = NULL;
 
-status_t
-LocalDevice::SRetrieveBluetoothMessenger(void)
-{
-    if (sfMessenger == NULL || !sfMessenger->IsValid() )
-        sfMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
-
-    return (sfMessenger != NULL)?B_OK:B_ERROR;
-}
-
-status_t LocalDevice::RetrieveBluetoothMessenger(void)
-{
-    if (fMessenger == NULL || !fMessenger->IsValid())
-        fMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
-
-    return (fMessenger != NULL)?B_OK:B_ERROR;
-}
 
 LocalDevice*
 LocalDevice::RequestLocalDeviceID(BMessage* request)
@@ -67,7 +53,7 @@ LocalDevice::RequestLocalDeviceID(BMessage* request)
 LocalDevice*
 LocalDevice::GetLocalDevice()
 {          
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;
  
     BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);
@@ -79,7 +65,7 @@ LocalDevice::GetLocalDevice()
 LocalDevice*
 LocalDevice::GetLocalDevice(hci_id hid)
 {
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;
  
     BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);    
@@ -93,7 +79,7 @@ LocalDevice::GetLocalDevice(hci_id hid)
 LocalDevice*
 LocalDevice::GetLocalDevice(bdaddr_t bdaddr)
 {
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;
  
     BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);    
@@ -107,7 +93,7 @@ LocalDevice::GetLocalDevice(bdaddr_t bdaddr)
 uint32
 LocalDevice::GetLocalDeviceCount()
 {
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return 0;
 
 	BMessage request(BT_MSG_COUNT_LOCAL_DEVICES);	
@@ -157,9 +143,8 @@ LocalDevice::GetDiscoverable()
 status_t 
 LocalDevice::SetDiscoverable(int mode)
 {
-    if (RetrieveBluetoothMessenger() != B_OK)
-        return B_ERROR;            
-
+    if ((fMessenger = _RetrieveBluetoothMessenger()) == NULL)
+        return B_ERROR;
 
     BMessage request(BT_MSG_HANDLE_SIMPLE_REQUEST);
     BMessage reply;
@@ -186,7 +171,7 @@ LocalDevice::SetDiscoverable(int mode)
 bdaddr_t 
 LocalDevice::GetBluetoothAddress()
 {
-    if (RetrieveBluetoothMessenger() != B_OK)
+    if ((fMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return bdaddrUtils::NullAddress();            
  
     const bdaddr_t* bdaddr;
@@ -216,7 +201,7 @@ LocalDevice::GetBluetoothAddress()
 BString 
 LocalDevice::GetFriendlyName()
 {
-    if (RetrieveBluetoothMessenger() != B_OK)
+    if ((fMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;            
  
     BString friendlyname;