Index: source/ariba/communication/BaseCommunication.h
===================================================================
--- source/ariba/communication/BaseCommunication.h	(revision 5873)
+++ source/ariba/communication/BaseCommunication.h	(revision 5874)
@@ -70,10 +70,4 @@
 #include "ariba/communication/networkinfo/NetworkChangeDetection.h"
 #include "ariba/communication/networkinfo/NetworkInformation.h"
-#include "ariba/communication/networkinfo/AddressInformation.h"
-
-// deprecated
-//#include "ariba/communication/modules/transport/TransportProtocol.h"
-//#include "ariba/communication/modules/network/NetworkProtocol.h"
-//#include "ariba/communication/modules/network/NetworkLocator.h"
 
 // disabled
@@ -81,13 +75,4 @@
 //  #include "ariba/communication/modules/transport/tcp/TCPTransport.h"
 //  #include "ariba/communication/modules/network/ip/IPv4NetworkProtocol.h"
-//#endif
-
-// deprecated
-//using ariba::communication::TransportProtocol;
-//using ariba::communication::NetworkProtocol;
-//using ariba::communication::NetworkLocator;
-
-// disabled
-//#ifndef UNDERLAY_OMNET
 //  using ariba::communication::IPv4NetworkProtocol;
 //  using ariba::communication::TCPTransport;