Index: /source/ariba/communication/EndpointDescriptor.cpp
===================================================================
--- /source/ariba/communication/EndpointDescriptor.cpp	(revision 5487)
+++ /source/ariba/communication/EndpointDescriptor.cpp	(revision 5488)
@@ -38,5 +38,4 @@
 
 #include "EndpointDescriptor.h"
-#include "ariba/utility/misc/Helper.h"
 
 namespace ariba {
@@ -44,5 +43,4 @@
 
 const EndpointDescriptor EndpointDescriptor::UNSPECIFIED;
-
 vsznDefault(EndpointDescriptor);
 
Index: /source/ariba/communication/EndpointDescriptor.h
===================================================================
--- /source/ariba/communication/EndpointDescriptor.h	(revision 5487)
+++ /source/ariba/communication/EndpointDescriptor.h	(revision 5488)
@@ -40,22 +40,8 @@
 #define ENDPOINTDESCRIPTOR_H_
 
-// deprecated
-//#include "ariba/communication/modules/network/ip/IPv4Locator.h"
-
-// deprecated
-//using ariba::utility::Locator;
-//using ariba::communication::IPv4Locator;
-
-// typical types
-#include "ariba/utility/types.h"
-#include "ariba/utility/serialization.h"
-
-// new addressing and transport
-#include "ariba/utility/addressing/addressing.hpp"
-#include "ariba/utility/transport/transport.hpp"
-
-// stdlibc++
 #include <string>
 #include <set>
+#include "ariba/utility/serialization.h"
+#include "ariba/utility/addressing/endpoint_set.hpp"
 
 namespace ariba {