Index: source/ariba/utility/addressing/endpoint_set.hpp
===================================================================
--- source/ariba/utility/addressing/endpoint_set.hpp	(revision 10789)
+++ source/ariba/utility/addressing/endpoint_set.hpp	(revision 12060)
@@ -1,4 +1,4 @@
-#ifndef ENDPOINT_SET_HPP_
-#define ENDPOINT_SET_HPP_
+#ifndef ENDPOINT_SET_HPP_DEPRECATED_
+#define ENDPOINT_SET_HPP_DEPRECATED_
 
 #include "addressing.hpp"
Index: source/ariba/utility/addressing/facades/address_v.hpp
===================================================================
--- source/ariba/utility/addressing/facades/address_v.hpp	(revision 10789)
+++ source/ariba/utility/addressing/facades/address_v.hpp	(revision 12060)
@@ -13,4 +13,6 @@
 
 #include "../detail/address_convenience.hpp"
+
+#include <boost/shared_ptr.hpp>
 
 namespace ariba {
@@ -26,4 +28,6 @@
 class address_v: public detail::address_convenience<address_v> {
 public:
+    typedef boost::shared_ptr<address_v> shared_ptr;
+    
 	virtual ~address_v() {}
 	
Index: source/ariba/utility/addressing/ip_address.hpp
===================================================================
--- source/ariba/utility/addressing/ip_address.hpp	(revision 10789)
+++ source/ariba/utility/addressing/ip_address.hpp	(revision 12060)
@@ -1,4 +1,4 @@
-#ifndef IP_ADDRESS_HPP_
-#define IP_ADDRESS_HPP_
+#ifndef IP_ADDRESS_HPP_DEPRECATED_
+#define IP_ADDRESS_HPP_DEPRECATED_
 
 #include <string>
Index: source/ariba/utility/addressing/tcpip_endpoint.hpp
===================================================================
--- source/ariba/utility/addressing/tcpip_endpoint.hpp	(revision 10789)
+++ source/ariba/utility/addressing/tcpip_endpoint.hpp	(revision 12060)
@@ -1,4 +1,4 @@
-#ifndef TCPIP_ENDPOINT_HPP_
-#define TCPIP_ENDPOINT_HPP_
+#ifndef TCPIP_ENDPOINT_HPP_DEPRECATED_
+#define TCPIP_ENDPOINT_HPP_DEPRECATED_
 
 #include<string>