Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h
===================================================================
--- source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 10700)
+++ source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 12060)
@@ -40,21 +40,28 @@
 #define __PERIODIC_BROADCAST_H
 
+// ariba
 #include "ariba/config.h"
-
+#include "ariba/utility/bootstrap/modules/BootstrapModule.h"
+#include "ariba/utility/logging/Logging.h"
+#include "ariba/utility/system/Timer.h"
+
+// ariba messages
+#include "PeriodicBroadcastMessage.h"
+
+// (ariba) link-local
+#include "ariba/utility/transport/StreamTransport/StreamTransport.hpp"
+
+// system
 #include <map>
 #include <string>
 #include <ctime>
 #include <iostream>
+
+// boost
 #include <boost/asio.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include "ariba/utility/bootstrap/modules/BootstrapModule.h"
-#include "ariba/utility/logging/Logging.h"
-#include "ariba/utility/system/Timer.h"
-#include "PeriodicBroadcastMessage.h"
-
-//link-local
-#include "ariba/utility/transport/tcpip/tcpip.hpp"
+
 
 using std::map;
@@ -301,5 +308,5 @@
 				
 				// include all link-local interfaces
-				vector<uint64_t> scope_ids = ariba::transport::tcpip::get_interface_scope_ids();
+				vector<uint64_t> scope_ids = ariba::transport::get_interface_scope_ids();
 				
 				BOOST_FOREACH ( uint64_t id, scope_ids )