Index: source/ariba/utility/transport/tcpip/protlib/address.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/address.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/address.h	(revision 6922)
@@ -38,5 +38,7 @@
 #include "ie.h"
 
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
+#include <boost/functional/hash.hpp>
+
 #include <netinet/in.h>
 #include <set>
@@ -1404,5 +1406,5 @@
 /*********************************** hash functions ***********************************/
 
-namespace __gnu_cxx {
+namespace boost {
 /// hostaddress hasher
 template <> struct hash<protlib::hostaddress> {
@@ -1439,4 +1441,5 @@
 
 /// appladdress equal_to
+
 template <> struct equal_to<protlib::appladdress> {
 	inline bool operator()(const protlib::appladdress& addr1, const protlib::appladdress& addr2) const { return addr1.equiv(addr2); }
Index: source/ariba/utility/transport/tcpip/protlib/connectionmap.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/connectionmap.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/connectionmap.h	(revision 6922)
@@ -31,7 +31,10 @@
 
 #include "assocdata.h"
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
+using boost::unordered_map;
 
 namespace protlib {
+
+
 
 /* @class ConnectionMap 
@@ -62,10 +65,10 @@
 		size_t get_size() const;
 	private:
-		// this hash_map uses the standard hashfunction on the first entry, int
+		// this unordered_map uses the standard hashfunction on the first entry, int
 		
 		// only typedefs
-		typedef hash_map<socketfd_t ,AssocData*> ass2data_t;
+		typedef unordered_map<socketfd_t ,AssocData*> ass2data_t;
 		typedef ass2data_t::const_iterator const_ass2data_it_t;
-		typedef hash_map<appladdress,AssocData*> addr2data_t;
+		typedef unordered_map<appladdress,AssocData*> addr2data_t;
 		typedef addr2data_t::const_iterator const_addr2data_it_t;
 
Index: source/ariba/utility/transport/tcpip/protlib/connectionmap_uds.cpp
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/connectionmap_uds.cpp	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/connectionmap_uds.cpp	(revision 6922)
@@ -32,4 +32,5 @@
 namespace protlib {
   using namespace log;
+  using boost::unordered_map;
 
 /** @ingroup tptcp
Index: source/ariba/utility/transport/tcpip/protlib/connectionmap_uds.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/connectionmap_uds.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/connectionmap_uds.h	(revision 6922)
@@ -32,7 +32,9 @@
 
 #include "assocdata_uds.h"
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
 
 namespace protlib {
+
+using boost::unordered_map;
 
 /* @class ConnectionMap 
@@ -63,10 +65,10 @@
 		size_t get_size() const;
 	private:
-		// this hash_map uses the standard hashfunction on the first entry, int
+		// this unordered_map uses the standard hashfunction on the first entry, int
 		
 		// only typedefs
-		typedef hash_map<socketfd_t ,AssocDataUDS*> ass2data_t;
+		typedef unordered_map<socketfd_t ,AssocDataUDS*> ass2data_t;
 		typedef ass2data_t::const_iterator const_ass2data_it_t;
-		typedef hash_map<udsaddress,AssocDataUDS*> addr2data_t;
+		typedef unordered_map<udsaddress,AssocDataUDS*> addr2data_t;
 		typedef addr2data_t::const_iterator const_addr2data_it_t;
 
Index: source/ariba/utility/transport/tcpip/protlib/ie.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/ie.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/ie.h	(revision 6922)
@@ -45,5 +45,5 @@
 #define _PROTLIB__IE_H_
 
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
 #include <deque>
 #include <string>
@@ -53,4 +53,6 @@
 #include "protlib_types.h"
 #include "network_message.h"
+
+using boost::unordered_map;
 
 namespace protlib {
@@ -463,5 +465,5 @@
 
   private:
-	typedef hash_map<IE_Key, IE *, hash_IE_Key> category_map_t;
+	typedef unordered_map<IE_Key, IE *, hash_IE_Key> category_map_t;
 
 	category_map_t registry;
Index: source/ariba/utility/transport/tcpip/protlib/llhashers.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/llhashers.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/llhashers.h	(revision 6922)
@@ -31,4 +31,5 @@
 #define PROTLIB_LL_HASHERS_H
 
+#include <boost/functional/hash.hpp>
 
 /** @addtogroup hashers Hash function objects
@@ -40,5 +41,5 @@
  */
 
-namespace __gnu_cxx {
+namespace boost {
 
 /// long long int hasher
Index: source/ariba/utility/transport/tcpip/protlib/messages.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/messages.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/messages.h	(revision 6922)
@@ -37,5 +37,5 @@
 
 #include <pthread.h>
-#include <ext/hash_set>
+#include <boost/unordered_set.hpp>
 
 #include "protlib_types.h"
@@ -180,5 +180,5 @@
 } // end namespace protlib
 
-namespace __gnu_cxx {
+namespace boost {
 
 /// message pointer hasher
Index: source/ariba/utility/transport/tcpip/protlib/threads.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/threads.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/threads.h	(revision 6922)
@@ -46,4 +46,5 @@
 #define PROTLIB__THREADS_H
 
+#include <vector>
 #include <pthread.h>
 #include <signal.h>
Index: source/ariba/utility/transport/tcpip/protlib/timer.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/timer.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/timer.h	(revision 6922)
@@ -51,5 +51,5 @@
 #include <sys/time.h>
 #include <list>
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
 
 #include "protlib_types.h"
@@ -124,5 +124,5 @@
 	}; // end struct timer
 	/// timer manager hashmap
-	typedef hash_map<timer_id_t,timer*> timer_hashmap_t;
+	typedef boost::unordered_map<timer_id_t,timer*> timer_hashmap_t;
 	/// hashmap iterator
 	typedef timer_hashmap_t::iterator timer_hashmap_it_t;
Index: source/ariba/utility/transport/tcpip/protlib/timer_module.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/timer_module.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/timer_module.h	(revision 6922)
@@ -37,5 +37,5 @@
 #define _PROTLIB__TIMER_MODULE_H
 
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
 
 #include "messages.h"
@@ -43,4 +43,6 @@
 #include "llhashers.h"
 #include "timer.h"
+
+using boost::unordered_map;
 
 namespace protlib {
@@ -248,9 +250,9 @@
     void clear(bool dispose = true);
   private:
-    typedef hash_map<message::id_t,timer_id_t> mid2tid_t;
+    typedef unordered_map<message::id_t,timer_id_t> mid2tid_t;
     typedef mid2tid_t::const_iterator const_mid2tid_it_t;
-    typedef hash_map<timer_id_t,message::id_t> tid2mid_t;
+    typedef unordered_map<timer_id_t,message::id_t> tid2mid_t;
     typedef tid2mid_t::const_iterator const_tid2mid_it_t;
-    typedef hash_map<timer_id_t,TimerMsg*> tid2msg_t;
+    typedef unordered_map<timer_id_t,TimerMsg*> tid2msg_t;
     typedef tid2msg_t::const_iterator const_tid2msg_it_t;
     mid2tid_t mid2tid;
Index: source/ariba/utility/transport/tcpip/protlib/tp_over_tcp.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/tp_over_tcp.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/tp_over_tcp.h	(revision 6922)
@@ -35,5 +35,5 @@
 #define TP_OVER_TCP_H
 
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
 
 #include "tp.h"
@@ -202,9 +202,9 @@
   
   /// store per receiver thread arguments, e.g. for signaling termination
-  typedef hash_map<pthread_t, receiver_thread_arg_t*> recv_thread_argmap_t;
+  typedef boost::unordered_map<pthread_t, receiver_thread_arg_t*> recv_thread_argmap_t;
   recv_thread_argmap_t  recv_thread_argmap;
 
   /// store sender thread related information
-  typedef hash_map<appladdress, FastQueue*> sender_thread_queuemap_t;
+  typedef boost::unordered_map<appladdress, FastQueue*> sender_thread_queuemap_t;
   sender_thread_queuemap_t  senderthread_queuemap;
   
Index: source/ariba/utility/transport/tcpip/protlib/tp_over_udp.h
===================================================================
--- source/ariba/utility/transport/tcpip/protlib/tp_over_udp.h	(revision 6919)
+++ source/ariba/utility/transport/tcpip/protlib/tp_over_udp.h	(revision 6922)
@@ -35,5 +35,5 @@
 #define TP_OVER_UDP_H
 
-#include <ext/hash_map>
+#include <boost/unordered_map.hpp>
 
 #include "tp.h"