Index: source/ariba/Makefile.am
===================================================================
--- source/ariba/Makefile.am	(revision 5985)
+++ source/ariba/Makefile.am	(revision 5993)
@@ -298,5 +298,5 @@
   utility/transport/transport_peer.cpp \
   utility/transport/rfcomm/rfcomm.cpp \
-  utility/transport/asio/asio_io_service.cpp 
+  utility/transport/asio/asio_io_service.cpp
 
 nobase_libariba_la_HEADERS += \
@@ -310,4 +310,5 @@
   utility/transport/asio/rfcomm.hpp \
   utility/transport/transport_listener.hpp \
+  utility/transport/asio/asio_io_service.h \
   utility/transport/tcpip/protlib/threadsafe_db.h \
   utility/transport/tcpip/protlib/configuration.h \
@@ -324,4 +325,5 @@
   utility/transport/tcpip/protlib/protlib_types.h \
   utility/transport/tcpip/protlib/tp_over_tcp.h \
+  utility/transport/tcpip/protlib/tp_over_udp.h \
   utility/transport/tcpip/protlib/tp.h \
   utility/transport/tcpip/protlib/threads.h \
Index: source/ariba/utility/system/StartupWrapper.cpp
===================================================================
--- source/ariba/utility/system/StartupWrapper.cpp	(revision 5985)
+++ source/ariba/utility/system/StartupWrapper.cpp	(revision 5993)
@@ -99,5 +99,5 @@
 	{
 		log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
-		logger->setLevel(log4cxx::Level::getWarn());
+		logger->setLevel(log4cxx::Level::getInfo());
 	}
 
Index: source/ariba/utility/transport/rfcomm/rfcomm.cpp
===================================================================
--- source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 5985)
+++ source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 5993)
@@ -1,7 +1,7 @@
 #include "rfcomm.hpp"
 
-#include "../asio/asio_io_service.h"
-#include "../asio/rfcomm.hpp"
-#include "../asio/bluetooth_endpoint.hpp"
+#include "ariba/utility/transport/asio/asio_io_service.h"
+#include "ariba/utility/transport/asio/rfcomm.hpp"
+#include "ariba/utility/transport/asio/bluetooth_endpoint.hpp"
 
 #include <boost/asio.hpp>
Index: source/ariba/utility/transport/rfcomm/rfcomm.hpp
===================================================================
--- source/ariba/utility/transport/rfcomm/rfcomm.hpp	(revision 5985)
+++ source/ariba/utility/transport/rfcomm/rfcomm.hpp	(revision 5993)
@@ -2,8 +2,8 @@
 #define RFCOMM_HPP_
 
-#include "../transport.hpp"
-#include "../asio/asio_io_service.h"
-#include "../asio/bluetooth_endpoint.hpp"
-#include "../asio/rfcomm.hpp"
+#include "ariba/utility/transport/transport.hpp"
+#include "ariba/utility/transport/asio/asio_io_service.h"
+#include "ariba/utility/transport/asio/bluetooth_endpoint.hpp"
+#include "ariba/utility/transport/asio/rfcomm.hpp"
 
 #include <boost/thread.hpp>
Index: source/ariba/utility/transport/tcpip/tcpip.hpp
===================================================================
--- source/ariba/utility/transport/tcpip/tcpip.hpp	(revision 5985)
+++ source/ariba/utility/transport/tcpip/tcpip.hpp	(revision 5993)
@@ -2,5 +2,5 @@
 #define TCPIP_HPP_
 
-#include "../transport.hpp"
+#include "ariba/utility/transport/transport.hpp"
 #include <pthread.h>
 
Index: source/ariba/utility/transport/transport_listener.hpp
===================================================================
--- source/ariba/utility/transport/transport_listener.hpp	(revision 5985)
+++ source/ariba/utility/transport/transport_listener.hpp	(revision 5993)
@@ -4,5 +4,5 @@
 #define TRANSPORT_LISTENER_HPP_
 
-#include "../addressing/addressing.hpp"
+#include "ariba/utility/addressing/addressing.hpp"
 
 // namespace ariba::transport
Index: source/ariba/utility/transport/transport_peer.hpp
===================================================================
--- source/ariba/utility/transport/transport_peer.hpp	(revision 5985)
+++ source/ariba/utility/transport/transport_peer.hpp	(revision 5993)
@@ -3,5 +3,5 @@
 
 #include "transport_protocol.hpp"
-#include "../addressing/endpoint_set.hpp"
+#include "ariba/utility/addressing/endpoint_set.hpp"
 
 // namespace ariba::transport
Index: source/ariba/utility/transport/transport_protocol.hpp
===================================================================
--- source/ariba/utility/transport/transport_protocol.hpp	(revision 5985)
+++ source/ariba/utility/transport/transport_protocol.hpp	(revision 5993)
@@ -2,5 +2,5 @@
 #define TRANSPORT_PROTOCOL_HPP_
 
-#include "../addressing/addressing.hpp"
+#include "ariba/utility/addressing/addressing.hpp"
 #include "transport_listener.hpp"