--- common/device/bluetoth/bluez.c.orig	Wed Sep 14 21:47:08 2005
+++ common/device/bluetoth/bluez.c	Wed Nov 23 22:11:16 2005
@@ -23,6 +23,8 @@
 #ifdef GSM_ENABLE_BLUETOOTHDEVICE
 #ifdef GSM_ENABLE_BLUEZ
 
+#define BDADDR_ANY NG_HCI_BDADDR_ANY
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -31,11 +33,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-#include <bluetooth/hci_lib.h>
+#include <bluetooth.h>
 
 #include "../../gsmcomon.h"
 #include "../devfunc.h"
@@ -44,21 +42,21 @@
 GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
 {
 	GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
-	struct sockaddr_rc 		laddr, raddr;
+	struct sockaddr_rfcomm 		laddr, raddr;
 	bdaddr_t			bdaddr;
 	int 				fd;
 
 	smprintf(s, "Connecting to RF channel %i\n",port);
 
-	fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+	fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
 	if (fd < 0) {
 		dbgprintf("Can't create socket\n");
 		return ERR_DEVICENODRIVER;
 	}
 
-	bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
-	laddr.rc_family 	= AF_BLUETOOTH;
-	laddr.rc_channel 	= 0;
+	bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
+	laddr.rfcomm_family 	= AF_BLUETOOTH;
+	laddr.rfcomm_channel 	= 0;
 
 	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
 		dbgprintf("Can't bind socket\n");
@@ -67,9 +65,9 @@
 	}
 
 	str2ba(device, &bdaddr);
-	bacpy(&raddr.rc_bdaddr, &bdaddr);
-	raddr.rc_family 	= AF_BLUETOOTH;
-	raddr.rc_channel 	= port;
+	bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
+	raddr.rfcomm_family 	= AF_BLUETOOTH;
+	raddr.rfcomm_channel 	= port;
 
 	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
 		dbgprintf("Can't connect\n");