Index: source/ariba/utility/transport/rfcomm/CMakeLists.txt
===================================================================
--- source/ariba/utility/transport/rfcomm/CMakeLists.txt	(revision 10700)
+++ source/ariba/utility/transport/rfcomm/CMakeLists.txt	(revision 10700)
@@ -0,0 +1,45 @@
+# [License]
+# The Ariba-Underlay Copyright
+#
+# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH)
+#
+# Institute of Telematics
+# UniversitÀt Karlsruhe (TH)
+# Zirkel 2, 76128 Karlsruhe
+# Germany
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation
+# are those of the authors and should not be interpreted as representing
+# official policies, either expressed or implied, of the Institute of
+# Telematics.
+# [License]
+
+add_headers(
+    bluetooth_endpoint.hpp
+    bluetooth_rfcomm.hpp
+    rfcomm_transport.hpp
+    )
+
+add_sources(rfcomm_transport.cpp)
Index: source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp
===================================================================
--- source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp	(revision 10653)
+++ source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp	(revision 10700)
@@ -192,4 +192,4 @@
 }}} // namespace boost::asio::bluetooth
 
+#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
 #endif /* HAVE_LIBBLUETOOTH */
-#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
Index: source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp
===================================================================
--- source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp	(revision 10653)
+++ source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp	(revision 10700)
@@ -1,2 +1,6 @@
+#include "ariba/config.h"
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
 #define BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
@@ -53,2 +57,3 @@
 
 #endif /* BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__ */
+#endif /* HAVE_LIBBLUETOOTH */