Index: source/ariba/utility/transport/asio/bluetooth_endpoint.hpp
===================================================================
--- source/ariba/utility/transport/asio/bluetooth_endpoint.hpp	(revision 7040)
+++ source/ariba/utility/transport/asio/bluetooth_endpoint.hpp	(revision 7041)
@@ -1,2 +1,6 @@
+#include<config.h>
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__
 #define BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__
@@ -180,2 +184,3 @@
 
 #endif
+#endif
Index: source/ariba/utility/transport/rfcomm/rfcomm.cpp
===================================================================
--- source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 7040)
+++ source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 7041)
@@ -1,2 +1,6 @@
+#include<config.h>
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #include "rfcomm.hpp"
 
@@ -432,2 +436,4 @@
 
 }} // namespace ariba::transport
+
+#endif
Index: source/ariba/utility/transport/rfcomm/rfcomm.hpp
===================================================================
--- source/ariba/utility/transport/rfcomm/rfcomm.hpp	(revision 7040)
+++ source/ariba/utility/transport/rfcomm/rfcomm.hpp	(revision 7041)
@@ -1,2 +1,6 @@
+#include<config.h>
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef RFCOMM_HPP_
 #define RFCOMM_HPP_
@@ -72,2 +76,3 @@
 
 #endif /* RFCOMM_HPP_ */
+#endif
Index: source/ariba/utility/transport/transport_peer.cpp
===================================================================
--- source/ariba/utility/transport/transport_peer.cpp	(revision 7040)
+++ source/ariba/utility/transport/transport_peer.cpp	(revision 7041)
@@ -1,3 +1,4 @@
 
+#include<config.h>
 #include "transport_peer.hpp"
 #include "transport.hpp"
@@ -17,4 +18,6 @@
 		cout << "Started tcpip_transport on port "  << local.tcp.begin()->value() << endl;
 	}
+
+	#ifdef HAVE_LIBBLUETOOTH
 	// setup rfcomm transports
 	rfc = NULL;
@@ -24,19 +27,26 @@
 		cout << "Started rfcomm_transport on port "  << local.rfcomm.begin()->value() << endl;
 	}
+	#endif
 }
 
 transport_peer::~transport_peer() {
 	if (tcp !=NULL ) delete tcp;
+#ifdef HAVE_LIBBLUETOOTH
 	if (rfc !=NULL ) delete rfc;
+#endif
 }
 
 void transport_peer::start() {
 	if (tcp!=NULL) tcp->start();
+#ifdef HAVE_LIBBLUETOOTH
 	if (rfc!=NULL) rfc->start();
+#endif
 }
 
 void transport_peer::stop() {
 	if (tcp!=NULL) tcp->stop();
+#ifdef HAVE_LIBBLUETOOTH
 	if (rfc!=NULL) rfc->stop();
+#endif
 }
 
@@ -45,7 +55,9 @@
 		tcp->send(remote,data,size);
 	} else
+#ifdef HAVE_LIBBLUETOOTH
 	if (remote->instanceof<rfcomm_endpoint>() && rfc!=NULL) {
 		rfc->send(remote,data,size);
 	} else
+#endif
 		cerr << "Could not send message to " << remote->to_string() << endl;
 }
@@ -53,5 +65,7 @@
 void transport_peer::send( const endpoint_set& endpoints, const uint8_t* data, size_t size ) {
 	if (tcp!=NULL) tcp->send(endpoints,data,size);
+#ifdef HAVE_LIBBLUETOOTH
 	if (rfc!=NULL) rfc->send(endpoints,data,size);
+#endif
 }
 
@@ -59,11 +73,15 @@
 	if (remote->instanceof<tcpip_endpoint>() && tcp!=NULL)
 		tcp->terminate(remote);
+#ifdef HAVE_LIBBLUETOOTH
 	if (remote->instanceof<rfcomm_endpoint>() && rfc!=NULL)
 		rfc->terminate(remote);
+#endif
 }
 
 void transport_peer::register_listener( transport_listener* listener ) {
 	if (tcp!=NULL) tcp->register_listener(listener);
+#ifdef HAVE_LIBBLUETOOTH
 	if (rfc!=NULL) rfc->register_listener(listener);
+#endif
 }
 
Index: source/ariba/utility/transport/transport_peer.hpp
===================================================================
--- source/ariba/utility/transport/transport_peer.hpp	(revision 7040)
+++ source/ariba/utility/transport/transport_peer.hpp	(revision 7041)
@@ -2,4 +2,5 @@
 #define TRANSPORT_PEER_HPP_
 
+#include<config.h>
 #include "transport_protocol.hpp"
 #include "ariba/utility/addressing/endpoint_set.hpp"
@@ -12,5 +13,7 @@
 
 class tcpip;
+#ifdef HAVE_LIBBLUETOOTH
 class rfcomm;
+#endif
 
 /**
@@ -35,5 +38,7 @@
 	endpoint_set&  local;
 	tcpip* tcp;
+#ifdef HAVE_LIBBLUETOOTH
 	rfcomm* rfc;
+#endif
 };