Working on libACE_Utils

- Stopped at Stats.cpp

48 files changed, 244 insertions, 152 deletions

diff --git a/ace/IPC/INET_Addr.cpp b/ace/IPC/INET_Addr.cpp
index d77067f2465..c822baf0a2b 100644
--- a/ace/IPC/INET_Addr.cpp
+++ b/ace/IPC/INET_Addr.cpp
@@ -2,11 +2,14 @@
 
 // Defines the Internet domain address family address format.
 
-#include "ace/INET_Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/IPC/INET_Addr.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/INET_Addr.i"
+#include "ace/IPC/INET_Addr.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, INET_Addr, "$Id$")
@@ -52,6 +55,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
     }
 }
 
+#ifdef ACE_SUBSET_0
 void
 ACE_INET_Addr::dump (void) const
 {
@@ -64,6 +68,7 @@ ACE_INET_Addr::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 // Compare two addresses for inequality.
 
diff --git a/ace/IPC/INET_Addr.h b/ace/IPC/INET_Addr.h
index 3cee7b8ac94..67a7f5953f5 100644
--- a/ace/IPC/INET_Addr.h
+++ b/ace/IPC/INET_Addr.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Addr.h"
+#include "ace/IPC/Addr.h"
 
 #if defined(VXWORKS)
 #  include /**/ "inetLib.h"
@@ -323,7 +323,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/INET_Addr.i"
+#include "ace/IPC/INET_Addr.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Sockets/IPC_SAP.cpp b/ace/Sockets/IPC_SAP.cpp
index 39b73436c96..1cf9472a145 100644
--- a/ace/Sockets/IPC_SAP.cpp
+++ b/ace/Sockets/IPC_SAP.cpp
@@ -1,16 +1,20 @@
 // $Id$
 
-#include "ace/IPC_SAP.h"
-#include "ace/Log_Msg.h"
+#include "ace/Sockets/IPC_SAP.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/IPC_SAP.i"
+#include "ace/Sockets/IPC_SAP.i"
 #endif
 
 ACE_RCSID(ace, IPC_SAP, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 
+#ifdef ACE_SUBSET_0
 void
 ACE_IPC_SAP::dump (void) const
 {
@@ -21,6 +25,7 @@ ACE_IPC_SAP::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 // Cache for the process ID.
 pid_t ACE_IPC_SAP::pid_ = 0;
diff --git a/ace/Sockets/IPC_SAP.h b/ace/Sockets/IPC_SAP.h
index 86d9a3e2d5c..db991bf0e87 100644
--- a/ace/Sockets/IPC_SAP.h
+++ b/ace/Sockets/IPC_SAP.h
@@ -14,7 +14,7 @@
 #define ACE_IPC_SAP_H
 #include "ace/pre.h"
 
-#include "ace/Flag_Manip.h"
+#include "ace/Utils/Flag_Manip.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -77,7 +77,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/IPC_SAP.i"
+#include "ace/Sockets/IPC_SAP.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/post.h"
diff --git a/ace/Sockets/SOCK.cpp b/ace/Sockets/SOCK.cpp
index 333ff6c16b5..33236e5cdee 100644
--- a/ace/Sockets/SOCK.cpp
+++ b/ace/Sockets/SOCK.cpp
@@ -1,11 +1,14 @@
 // SOCK.cpp
 // $Id$
 
-#include "ace/SOCK.h"
-#include "ace/Log_Msg.h"
+#include "ace/Sockets/SOCK.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK.i"
+#include "ace/Sockets/SOCK.i"
 #endif
 
 ACE_RCSID(ace, SOCK, "$Id$")
@@ -117,6 +120,7 @@ ACE_SOCK::ACE_SOCK (int type,
                     int reuse_addr)
 {
   // ACE_TRACE ("ACE_SOCK::ACE_SOCK");
+#ifdef ACE_SUBSET_0
   if (this->open (type,
                   protocol_family, 
                   protocol,
@@ -124,6 +128,12 @@ ACE_SOCK::ACE_SOCK (int type,
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK")));
+#else
+  this-open (type,
+	     protocol_family,
+	     protocol,
+	     reuse_addr);
+#endif /* ACE_SUBSET_0 */
 }
 
 int
@@ -159,7 +169,7 @@ ACE_SOCK::open (int type,
   else
     return 0;
 }
-      
+
 ACE_SOCK::ACE_SOCK (int type, 
                     int protocol_family, 
                     int protocol,
@@ -169,6 +179,7 @@ ACE_SOCK::ACE_SOCK (int type,
                     int reuse_addr)
 {
   // ACE_TRACE ("ACE_SOCK::ACE_SOCK");
+#ifdef ACE_SUBSET_0
   if (this->open (type,
                   protocol_family,
                   protocol,
@@ -179,4 +190,14 @@ ACE_SOCK::ACE_SOCK (int type,
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK")));
+#else
+  this->open (type,
+              protocol_family,
+              protocol,
+              protocolinfo,
+              g,
+              flags,
+              reuse_addr);
+#endif /* ACE_SUBSET_0 */
+
 }
diff --git a/ace/Sockets/SOCK.h b/ace/Sockets/SOCK.h
index bbed708afe0..e64feec15df 100644
--- a/ace/Sockets/SOCK.h
+++ b/ace/Sockets/SOCK.h
@@ -20,8 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Addr.h"
-#include "ace/IPC_SAP.h"
+#include "ace/IPC/Addr.h"
+#include "ace/Sockets/IPC_SAP.h"
 
 /**
  * @class ACE_SOCK
@@ -113,7 +113,7 @@ protected:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK.i"
+#include "ace/Sockets/SOCK.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/post.h"
diff --git a/ace/Sockets/SOCK_Acceptor.cpp b/ace/Sockets/SOCK_Acceptor.cpp
index d92f9343447..d54284c81d3 100644
--- a/ace/Sockets/SOCK_Acceptor.cpp
+++ b/ace/Sockets/SOCK_Acceptor.cpp
@@ -1,15 +1,19 @@
 // SOCK_Acceptor.cpp
 // $Id$
 
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_QoS.h"
+#include "ace/Sockets/SOCK_Acceptor.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
+
+#include "ace/OS/OS_QoS.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK_Acceptor.i"
+#include "ace/Sockets/SOCK_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-#include "ace/Synch.h"
+#include "ace/Threads/Synch.h"
 
 ACE_RCSID(ace, SOCK_Acceptor, "$Id$")
 
@@ -325,6 +329,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                                       int backlog,
                                       int protocol)
 {
+#ifdef ACE_SUBSET_0
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
   if (this->open (local_sap,
                   protocolinfo,
@@ -337,6 +342,16 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SOCK_Acceptor")));
+#else
+  this->open (local_sap,
+              protocolinfo,
+              g,
+              flags,
+              reuse_addr,
+              protocol_family,
+              backlog,
+              protocol);
+#endif
 }
 
 // General purpose routine for performing server ACE_SOCK creation.
@@ -380,6 +395,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                                       int backlog,
                                       int protocol)
 {
+#ifdef ACE_SUBET_0
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
   if (this->open (local_sap,
                   reuse_addr,
@@ -389,6 +405,13 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SOCK_Acceptor")));
+#else
+  this->open (local_sap,
+              reuse_addr,
+              protocol_family,
+              backlog,
+              protocol;
+#endif
 }
 
 int
diff --git a/ace/Sockets/SOCK_Acceptor.h b/ace/Sockets/SOCK_Acceptor.h
index b5bd8f8ff17..484c558e3ee 100644
--- a/ace/Sockets/SOCK_Acceptor.h
+++ b/ace/Sockets/SOCK_Acceptor.h
@@ -14,13 +14,13 @@
 #define ACE_SOCK_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Stream.h"
+#include "ace/Sockets/SOCK_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Time_Value.h"
+#include "ace/Timer/Time_Value.h"
 
 /**
  * @class ACE_SOCK_Acceptor
@@ -164,7 +164,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK_Acceptor.i"
+#include "ace/Sockets/SOCK_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/post.h"
diff --git a/ace/Sockets/SOCK_IO.cpp b/ace/Sockets/SOCK_IO.cpp
index 1f233aa88db..db0092ffe58 100644
--- a/ace/Sockets/SOCK_IO.cpp
+++ b/ace/Sockets/SOCK_IO.cpp
@@ -1,11 +1,11 @@
 // SOCK_IO.cpp
 // $Id$
 
-#include "ace/SOCK_IO.h"
-#include "ace/Handle_Set.h"
+#include "ace/Sockets/SOCK_IO.h"
+#include "ace/OS/Handle_Set.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK_IO.i"
+#include "ace/Sockets/SOCK_IO.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 ACE_RCSID(ace, SOCK_IO, "$Id$")
diff --git a/ace/Sockets/SOCK_IO.h b/ace/Sockets/SOCK_IO.h
index 0fbfee6203d..7e1ae52630c 100644
--- a/ace/Sockets/SOCK_IO.h
+++ b/ace/Sockets/SOCK_IO.h
@@ -14,7 +14,7 @@
 #define ACE_SOCK_IO_H
 #include "ace/pre.h"
 
-#include "ace/SOCK.h"
+#include "ace/Sockets/SOCK.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -136,7 +136,7 @@ public:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK_IO.i"
+#include "ace/Sockets/SOCK_IO.i"
 #endif
 
 #include "ace/post.h"
diff --git a/ace/Sockets/SOCK_Stream.cpp b/ace/Sockets/SOCK_Stream.cpp
index cd9be127aaa..5f74e3723ab 100644
--- a/ace/Sockets/SOCK_Stream.cpp
+++ b/ace/Sockets/SOCK_Stream.cpp
@@ -1,10 +1,10 @@
 // SOCK_Stream.cpp
 // $Id$
 
-#include "ace/SOCK_Stream.h"
+#include "ace/Sockets/SOCK_Stream.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK_Stream.i"
+#include "ace/Sockets/SOCK_Stream.i"
 #endif
 
 ACE_RCSID(ace, SOCK_Stream, "$Id$")
diff --git a/ace/Sockets/SOCK_Stream.h b/ace/Sockets/SOCK_Stream.h
index f478702aaaa..59c577d0375 100644
--- a/ace/Sockets/SOCK_Stream.h
+++ b/ace/Sockets/SOCK_Stream.h
@@ -14,13 +14,13 @@
 #define ACE_SOCK_STREAM_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_IO.h"
+#include "ace/Sockets/SOCK_IO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/INET_Addr.h"
+#include "ace/IPC/INET_Addr.h"
 
 // Forward declarations.
 class ACE_Message_Block;
@@ -160,7 +160,7 @@ public:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK_Stream.i"
+#include "ace/Sockets/SOCK_Stream.i"
 #endif
 
 #include "ace/post.h"
diff --git a/ace/Sockets/SOCK_Stream.i b/ace/Sockets/SOCK_Stream.i
index 0684e069832..31fcca33c6b 100644
--- a/ace/Sockets/SOCK_Stream.i
+++ b/ace/Sockets/SOCK_Stream.i
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/SOCK_Stream.h"
+#include "ace/Sockets/SOCK_Stream.h"
 
 ASYS_INLINE
 ACE_SOCK_Stream::ACE_SOCK_Stream (void)
diff --git a/ace/Svcconf/Service_Manager.cpp b/ace/Svcconf/Service_Manager.cpp
index 8d94f95bb70..d036bfb3666 100644
--- a/ace/Svcconf/Service_Manager.cpp
+++ b/ace/Svcconf/Service_Manager.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "ace/Get_Opt.h"
-#include "ace/Service_Repository.h"
-#include "ace/Service_Config.h"
-#include "ace/Service_Manager.h"
-#include "ace/Reactor.h"
-#include "ace/WFMO_Reactor.h"
+#include "ace/Utils/Get_Opt.h"
+#include "ace/Svcconf/Service_Repository.h"
+#include "ace/Svcconf/Service_Config.h"
+#include "ace/Svcconf/Service_Manager.h"
+#include "ace/Demux/Reactor.h"
+#include "ace/Demux/WFMO_Reactor.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Manager.i"
+#include "ace/Svcconf/Service_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Service_Manager, "$Id$")
diff --git a/ace/Svcconf/Service_Manager.h b/ace/Svcconf/Service_Manager.h
index 2dbb4e5068b..1a6a4b57b53 100644
--- a/ace/Svcconf/Service_Manager.h
+++ b/ace/Svcconf/Service_Manager.h
@@ -14,15 +14,15 @@
 #define ACE_SERVICE_MANAGER_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Stream.h"
+#include "ace/Sockets/SOCK_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/Service_Object.h"
+#include "ace/Sockets/SOCK_Acceptor.h"
+#include "ace/IPC/INET_Addr.h"
+#include "ace/Svcconf/Service_Object.h"
 
 /**
  * @class ACE_Service_Manager
@@ -113,7 +113,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Manager.i"
+#include "ace/Svcconf/Service_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Timer/Basic_Stats.cpp b/ace/Timer/Basic_Stats.cpp
index 00509d827ce..f7a62d84ec9 100644
--- a/ace/Timer/Basic_Stats.cpp
+++ b/ace/Timer/Basic_Stats.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "ace/Basic_Stats.h"
-#include "ace/Log_Msg.h"
+#include "ace/Timer/Basic_Stats.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Basic_Stats.inl"
+#include "ace/Timer/Basic_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Basic_Stats, "$Id$")
@@ -37,6 +40,7 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
   this->sum2_ += rhs.sum2_;
 }
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
                                ACE_UINT32 sf) const
@@ -71,3 +75,4 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
               l_max, this->max_at_,
               l_dev));
 }
+#endif /* ACE_SUBSET_0 */
diff --git a/ace/Timer/Basic_Stats.h b/ace/Timer/Basic_Stats.h
index 722c92ae355..f9da3eb19b9 100644
--- a/ace/Timer/Basic_Stats.h
+++ b/ace/Timer/Basic_Stats.h
@@ -15,7 +15,7 @@
 #include "ace/pre.h"
 
 #include "ace/config-all.h"
-#include "ace/Basic_Types.h"
+#include "ace/OS/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -80,7 +80,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Basic_Stats.inl"
+#include "ace/Timer/Basic_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Timer/Timeprobe.cpp b/ace/Timer/Timeprobe.cpp
index cdfdb116913..4a921c828c0 100644
--- a/ace/Timer/Timeprobe.cpp
+++ b/ace/Timer/Timeprobe.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 ACE_RCSID(ace, Timeprobe, "$Id$")
 
 #if defined (ACE_COMPILE_TIMEPROBES)
 
-#include "ace/Timeprobe.h"
+#include "ace/Timer/Timeprobe.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Timeprobe.i"
+#include "ace/Timer/Timeprobe.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Timer/Timeprobe.h b/ace/Timer/Timeprobe.h
index 91033b54ece..95a0bd3ebee 100644
--- a/ace/Timer/Timeprobe.h
+++ b/ace/Timer/Timeprobe.h
@@ -32,7 +32,7 @@
 #define ACE_TIMEPROBE_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -100,12 +100,12 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Timeprobe.i"
+#include "ace/Timer/Timeprobe.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Synch.h"
-#include "ace/Singleton.h"
-#include "ace/Timeprobe_T.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Utils/Templates/Singleton.h"
+#include "ace/Timer/Timeprobe_T.h"
 
 // If ACE_MT_TIMEPROBES is defined, use a Thread_Mutex to lock the
 // internal state of ACE_Timerprobe.  This allows multiple threads to
diff --git a/ace/Token/Local_Tokens.cpp b/ace/Token/Local_Tokens.cpp
index bca379f58ca..4f8ff364e6a 100644
--- a/ace/Token/Local_Tokens.cpp
+++ b/ace/Token/Local_Tokens.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "ace/Thread.h"
-#include "ace/Local_Tokens.h"
-#include "ace/Token_Manager.h"
+#include "ace/Threads/Thread.h"
+#include "ace/Token/Local_Tokens.h"
+#include "ace/Token/Token_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Local_Tokens.i"
+#include "ace/Token/Local_Tokens.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token/Local_Tokens.h b/ace/Token/Local_Tokens.h
index 6660d8b2028..1e70b82aca8 100644
--- a/ace/Token/Local_Tokens.h
+++ b/ace/Token/Local_Tokens.h
@@ -45,16 +45,19 @@
 #define ACE_LOCAL_MUTEX_H
 #include "ace/pre.h"
 
-#include "ace/Synch_T.h"
+#include "ace/Threads/Synch_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Containers.h"
-#include "ace/Synch_Options.h"
-#include "ace/Map_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Utils/Containers.h"
+#include "ace/Threads/Synch_Options.h"
+#include "ace/Utils/Templates/Map_Manager.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
@@ -1092,7 +1095,7 @@ protected:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Local_Tokens.i"
+#include "ace/Token/Local_Tokens.i"
 #endif /* __ACE_INLINE__ */
 #include "ace/post.h"
 #endif /* ACE_LOCAL_MUTEX_H */
diff --git a/ace/Token/Token_Manager.cpp b/ace/Token/Token_Manager.cpp
index 13e21c361fc..1d513cc2a65 100644
--- a/ace/Token/Token_Manager.cpp
+++ b/ace/Token/Token_Manager.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/Token_Manager.h"
-#include "ace/Object_Manager.h"
+#include "ace/Token/Token_Manager.h"
+#include "ace/Utils/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token_Manager.i"
+#include "ace/Token/Token_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token/Token_Manager.h b/ace/Token/Token_Manager.h
index aec44e08ae3..c8d2dae156e 100644
--- a/ace/Token/Token_Manager.h
+++ b/ace/Token/Token_Manager.h
@@ -14,14 +14,14 @@
 #define ACE_TOKEN_MANAGER_H
 #include "ace/pre.h"
 
-#include "ace/Synch.h"
+#include "ace/Threads/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Map_Manager.h"
-#include "ace/Local_Tokens.h"
+#include "ace/Utils/Templates/Map_Manager.h"
+#include "ace/Token/Local_Tokens.h"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
@@ -128,7 +128,7 @@ private:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token_Manager.i"
+#include "ace/Token/Token_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Future_Set.cpp b/ace/Utils/Future_Set.cpp
index 5b0069fac4f..f57b9a35fae 100644
--- a/ace/Utils/Future_Set.cpp
+++ b/ace/Utils/Future_Set.cpp
@@ -4,7 +4,7 @@
 #ifndef ACE_FUTURE_SET_CPP
 #define ACE_FUTURE_SET_CPP
 
-#include "ace/Future_Set.h"
+#include "ace/Utils/Future_Set.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/ace/Utils/Future_Set.h b/ace/Utils/Future_Set.h
index b79241dfa14..38180d51548 100644
--- a/ace/Utils/Future_Set.h
+++ b/ace/Utils/Future_Set.h
@@ -14,10 +14,10 @@
 #define ACE_FUTURE_SET_H
 #include "ace/pre.h"
 
-#include "ace/Thread.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Hash_Map_Manager.h"
+#include "ace/Threads/Thread.h"
+#include "ace/Streams/Message_Queue.h"
+#include "ace/Utils/Future.h"
+#include "ace/Utils/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -111,7 +111,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Future_Set.cpp"
+#include "ace/Utils/Future_Set.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Get_Opt.cpp b/ace/Utils/Get_Opt.cpp
index d198ef01cf8..cb21cf95e02 100644
--- a/ace/Utils/Get_Opt.cpp
+++ b/ace/Utils/Get_Opt.cpp
@@ -1,11 +1,14 @@
 // Get_Opt.cpp
 // $Id$
 
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
+#include "ace/Utils/Get_Opt.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Get_Opt.i"
+#include "ace/Utils/Get_Opt.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Get_Opt, "$Id$")
@@ -521,6 +524,7 @@ ACE_Get_Opt::long_option (void) const
   return 0;
 }
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Get_Opt::dump (void) const
 {
@@ -530,6 +534,7 @@ ACE_Get_Opt::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 void
 ACE_Get_Opt::permute_args (void)
diff --git a/ace/Utils/Get_Opt.h b/ace/Utils/Get_Opt.h
index 793056a1e36..77cee9b99f1 100644
--- a/ace/Utils/Get_Opt.h
+++ b/ace/Utils/Get_Opt.h
@@ -16,8 +16,8 @@
 #include "ace/pre.h"
 
 #include "ace/ACE.h"
-#include "ace/SString.h"
-#include "ace/Containers.h"
+#include "ace/Utils/SString.h"
+#include "ace/Utils/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -350,7 +350,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Get_Opt.i"
+#include "ace/Utils/Get_Opt.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Hash_Map_Manager.cpp b/ace/Utils/Hash_Map_Manager.cpp
index 4378551c7f8..2eb56b4d2e6 100644
--- a/ace/Utils/Hash_Map_Manager.cpp
+++ b/ace/Utils/Hash_Map_Manager.cpp
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#include "ace/Hash_Map_Manager.h"
+#include "ace/Utils/Hash_Map_Manager.h"
 
 ACE_RCSID(ace, Hash_Map_Manager, "$Id$")
 
diff --git a/ace/Utils/Lib_Find.cpp b/ace/Utils/Lib_Find.cpp
index 4d63eb430c5..63b97f6bfeb 100644
--- a/ace/Utils/Lib_Find.cpp
+++ b/ace/Utils/Lib_Find.cpp
@@ -1,7 +1,10 @@
 // $Id$
 
-#include "ace/Lib_Find.h"
-#include "ace/Log_Msg.h"
+#include "ace/Utils/Lib_Find.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Lib_Find, "$Id$")
 
@@ -83,6 +86,7 @@ ACE_Lib_Find::ldfind (const ACE_TCHAR filename[],
 
       // Check whether this matches the appropriate platform-specific
       // suffix.
+#ifdef ACE_SUBSET_0
 #if defined (ACE_WIN32)
       // Use <ACE_OS::strcasecmp> on any platform with
       // case-insensitive filenames.
@@ -96,6 +100,15 @@ ACE_Lib_Find::ldfind (const ACE_TCHAR filename[],
                       ACE_LIB_TEXT ("shared library on this platform: %s\n"),
                       s));
         }
+#else
+#if defined (ACE_WIN32)
+      // Use <ACE_OS::strcasecmp> on any platform with
+      // case-insensitive filenames.
+      ACE_OS::strcasecmp (s, dll_suffix);
+#else
+      ACE_OS::strcmp (s, dll_suffix);
+#endif /* ACE_WIN32 */
+#endif /* ACE_SUBSET_0 */
     }
 
   // Make sure we've got enough space in searchfilename.
diff --git a/ace/Utils/Lib_Find.h b/ace/Utils/Lib_Find.h
index f80b10fab0c..f1182579a56 100644
--- a/ace/Utils/Lib_Find.h
+++ b/ace/Utils/Lib_Find.h
@@ -99,7 +99,7 @@ class ACE_Export ACE_Lib_Find
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "Lib_Find.i"
+#include "ace/Utils/Lib_Find.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Map.cpp b/ace/Utils/Map.cpp
index daa8b29dc70..b03b8cd4c53 100644
--- a/ace/Utils/Map.cpp
+++ b/ace/Utils/Map.cpp
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#include "ace/Map.h"
+#include "ace/Utils/Map.h"
 
 ACE_RCSID(ace, Map, "$Id$")
 
diff --git a/ace/Utils/Map.h b/ace/Utils/Map.h
index a8334f72cb6..fb29da0ebe2 100644
--- a/ace/Utils/Map.h
+++ b/ace/Utils/Map.h
@@ -15,14 +15,14 @@
 #define ACE_MAP_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Include the templates here.
-#include "ace/Map_T.h"
+#include "ace/Utils/Templates/Map_T.h"
 
 #include "ace/post.h"
 #endif /* ACE_MAP_H */
diff --git a/ace/Utils/Message_Block.cpp b/ace/Utils/Message_Block.cpp
index b0b13965ad6..ece923eb0d8 100644
--- a/ace/Utils/Message_Block.cpp
+++ b/ace/Utils/Message_Block.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "ace/Message_Block.h"
-#include "ace/Synch_T.h"
+#include "ace/Utils/Message_Block.h"
+#include "ace/Threads/Synch_T.h"
 
 //#define ACE_ENABLE_TIMEPROBES
-#include "ace/Timeprobe.h"
+#include "ace/Timer/Timeprobe.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Block.i"
+#include "ace/Utils/Message_Block.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Message_Block, "$Id$")
diff --git a/ace/Utils/Method_Request.cpp b/ace/Utils/Method_Request.cpp
index 003d5acc4f7..a46a0a4bb6d 100644
--- a/ace/Utils/Method_Request.cpp
+++ b/ace/Utils/Method_Request.cpp
@@ -1,7 +1,7 @@
 // Method_Request.cpp
 // $Id$
 
-#include "ace/Method_Request.h"
+#include "ace/Utils/Method_Request.h"
 
 ACE_RCSID(ace, Method_Request, "$Id$")
 
diff --git a/ace/Utils/Method_Request.h b/ace/Utils/Method_Request.h
index b545648712a..d6899fb0535 100644
--- a/ace/Utils/Method_Request.h
+++ b/ace/Utils/Method_Request.h
@@ -16,7 +16,7 @@
 #define ACE_METHOD_REQUEST_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Utils/Object_Manager.cpp b/ace/Utils/Object_Manager.cpp
index 8b865c4038d..4137cea4302 100644
--- a/ace/Utils/Object_Manager.cpp
+++ b/ace/Utils/Object_Manager.cpp
@@ -1,28 +1,31 @@
 // $Id$
 
-#include "ace/Object_Manager.h"
+#include "ace/Utils/Object_Manager.h"
 #if !defined (ACE_LACKS_ACE_TOKEN)
-# include "ace/Token_Manager.h"
+# include "ace/Token/Token_Manager.h"
 #endif /* ! ACE_LACKS_ACE_TOKEN */
 #if defined (ACE_LACKS_ACE_SVCCONF)
 #  if !defined (ACE_HAS_WINCE)
-#    include "ace/Proactor.h"
+#    include "ace/Demux/Proactor.h"
 #  endif /* !ACE_HAS_WINCE */
-#  include "ace/Reactor.h"
-#  include "ace/Thread_Manager.h"
+#  include "ace/DemuxReactor.h"
+#  include "ace/Threads/Thread_Manager.h"
 #else  /* ! ACE_LACKS_ACE_SVCCONF */
-#  include "ace/Service_Manager.h"
-#  include "ace/Service_Config.h"
+#  include "ace/Svcconf/Service_Manager.h"
+#  include "ace/Svcconf/Service_Config.h"
 #endif /* ! ACE_LACKS_ACE_SVCCONF */
-#include "ace/Signal.h"
-#include "ace/Log_Msg.h"
-#include "ace/Containers.h"
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
-#include "ace/Signal.h"
+#include "ace/IPC/Signal.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
+
+#include "ace/Utils/Containers.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Memory/Malloc.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Object_Manager.i"
+# include "ace/Utils/Object_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Object_Manager, "$Id$")
@@ -148,6 +151,7 @@ ACE_Object_Manager::shutting_down (void)
   return ACE_Object_Manager::instance_  ?  instance_->shutting_down_i ()  :  1;
 }
 
+#ifdef ACE_SUBSET_0
 #if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS)
 // Instead of popping up a window for exceptions, just print something out
 LONG _stdcall ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo)
@@ -162,6 +166,7 @@ LONG _stdcall ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo)
   return EXCEPTION_EXECUTE_HANDLER;
 }
 #endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS */
+#endif /* ACE_SUBSET_0 */
 
 // Initialize an ACE_Object_Manager.  There can be instances of this object
 // other than The Instance.  This can happen if a user creates one for some
@@ -604,7 +609,9 @@ ACE_Object_Manager::fini (void)
       preallocations_ = 0;
 #endif /* ! ACE_LACKS_ACE_SVCCONF */
 
+#ifdef ACE_SUBSET_0
       ACE_Trace::stop_tracing ();
+#endif
 
 #if defined (ACE_LACKS_ACE_SVCCONF)
 
diff --git a/ace/Utils/Pair.cpp b/ace/Utils/Pair.cpp
index 7b595e8b3c7..1ee8544efb3 100644
--- a/ace/Utils/Pair.cpp
+++ b/ace/Utils/Pair.cpp
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#include "ace/Pair.h"
+#include "ace/Utils/Pair.h"
 
 ACE_RCSID(ace, Pair, "$Id$")
 
diff --git a/ace/Utils/Pair.h b/ace/Utils/Pair.h
index 4fb5693e948..6a7d98beb4a 100644
--- a/ace/Utils/Pair.h
+++ b/ace/Utils/Pair.h
@@ -15,14 +15,14 @@
 #define ACE_PAIR_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Include the templates here.
-#include "ace/Pair_T.h"
+#include "ace/Utils/Templates/Pair_T.h"
 
 #include "ace/post.h"
 #endif /* ACE_PAIR_H */
diff --git a/ace/Utils/Recyclable.cpp b/ace/Utils/Recyclable.cpp
index 483852486f1..3ca16dee94c 100644
--- a/ace/Utils/Recyclable.cpp
+++ b/ace/Utils/Recyclable.cpp
@@ -1,9 +1,9 @@
 //$Id$
-#include "ace/Recyclable.h"
+#include "ace/Utils/Recyclable.h"
 
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Recyclable.inl"
+#include "ace/Utils/Recyclable.inl"
 #endif /* __ACE_INLINE __ */
 
 ACE_RCSID(ace, Recyclable, "$Id$")
diff --git a/ace/Utils/Registry.cpp b/ace/Utils/Registry.cpp
index 16e4b7ef32d..d0c66d7ea74 100644
--- a/ace/Utils/Registry.cpp
+++ b/ace/Utils/Registry.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Registry.h"
+#include "ace/Utils/Registry.h"
 
 ACE_RCSID(ace, Registry, "$Id$")
 
diff --git a/ace/Utils/Registry.h b/ace/Utils/Registry.h
index c1fc45c5a19..19f7cc3c387 100644
--- a/ace/Utils/Registry.h
+++ b/ace/Utils/Registry.h
@@ -15,7 +15,7 @@
 #define ACE_REGISTRY_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,8 +24,8 @@
 #if defined (ACE_WIN32)
 // This only works on Win32 platforms
 
-#include "ace/Containers.h"
-#include "ace/SString.h"
+#include "ace/Utils/Containers.h"
+#include "ace/Utils/SString.h"
 
 /**
  * @class ACE_Registry
diff --git a/ace/Utils/SString.cpp b/ace/Utils/SString.cpp
index 770f5704ab2..a105aa0d341 100644
--- a/ace/Utils/SString.cpp
+++ b/ace/Utils/SString.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
-#include "ace/Malloc.h"
+#include "ace/Memory/Malloc.h"
 #if !defined (ACE_HAS_WINCE)
-# include "ace/Service_Config.h"
+# include "ace/Svcconf/Service_Config.h"
 #endif /* !ACE_HAS_WINCE */
-#include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
+#include "ace/Utils/SString.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-# include "ace/streams.h"
+# include "ace/Streams/streams.h"
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SString.i"
+#include "ace/Utils/SString.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SString, "SString.cpp,v 4.61 2001/03/04 00:55:30 brunsch Exp")
diff --git a/ace/Utils/Sample_History.cpp b/ace/Utils/Sample_History.cpp
index f6c08c55afe..7757592eb2e 100644
--- a/ace/Utils/Sample_History.cpp
+++ b/ace/Utils/Sample_History.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "ace/Sample_History.h"
-#include "ace/Basic_Stats.h"
-#include "ace/Log_Msg.h"
+#include "ace/Utils/Sample_History.h"
+#include "ace/Timer/Basic_Stats.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Sample_History.inl"
+#include "ace/Utils/Sample_History.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Sample_History, "$Id$")
@@ -34,6 +37,7 @@ ACE_Sample_History::sample_count (void) const
   return this->sample_count_;
 }
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Sample_History::dump_samples (const ACE_TCHAR *msg,
                                   ACE_UINT32 scale_factor) const
@@ -45,6 +49,7 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg,
       ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s: %d %u\n"), msg, i, val));
     }
 }
+#endif
 
 void
 ACE_Sample_History::collect_basic_stats (ACE_Basic_Stats &stats) const
diff --git a/ace/Utils/Sample_History.h b/ace/Utils/Sample_History.h
index 8d5dc913b52..767cd86e268 100644
--- a/ace/Utils/Sample_History.h
+++ b/ace/Utils/Sample_History.h
@@ -15,7 +15,7 @@
 #include "ace/pre.h"
 
 #include "ace/config-all.h"
-#include "ace/Basic_Types.h"
+#include "ace/OS/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -79,7 +79,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Sample_History.inl"
+#include "ace/Utils/Sample_History.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Templates/Map_T.cpp b/ace/Utils/Templates/Map_T.cpp
index e2329089630..dc59b1cfa2f 100644
--- a/ace/Utils/Templates/Map_T.cpp
+++ b/ace/Utils/Templates/Map_T.cpp
@@ -3,14 +3,14 @@
 #ifndef ACE_MAP_T_C
 #define ACE_MAP_T_C
 
-#include "ace/Map_T.h"
+#include "ace/Utils/Templates/Map_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Map_T.i"
+#include "ace/Utils/Templates/Map_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Map_T, "$Id$")
diff --git a/ace/Utils/Templates/Map_T.h b/ace/Utils/Templates/Map_T.h
index 9b4dd6038ad..7c7c12f86b1 100644
--- a/ace/Utils/Templates/Map_T.h
+++ b/ace/Utils/Templates/Map_T.h
@@ -14,11 +14,11 @@
 #define ACE_MAP_T_H
 #include "ace/pre.h"
 
-#include "ace/Map.h"
-#include "ace/Pair.h"
-#include "ace/Map_Manager.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Active_Map_Manager.h"
+#include "ace/Utils/Map.h"
+#include "ace/Utils/Pair.h"
+#include "ace/Utils/Templates/Map_Manager.h"
+#include "ace/Utils/Hash_Map_Manager.h"
+#include "ace/Utils/Active_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -1587,11 +1587,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Map_T.i"
+#include "ace/Utils/Templates/Map_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Map_T.cpp"
+#include "ace/Utils/Templates/Map_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Pair_T.cpp b/ace/Utils/Templates/Pair_T.cpp
index 27e7f6d34df..1337cf6f4a5 100644
--- a/ace/Utils/Templates/Pair_T.cpp
+++ b/ace/Utils/Templates/Pair_T.cpp
@@ -3,14 +3,14 @@
 #ifndef ACE_PAIR_T_C
 #define ACE_PAIR_T_C
 
-#include "ace/Pair_T.h"
+#include "ace/Utils/Templates/Pair_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Pair_T.i"
+#include "ace/Utils/Templates/Pair_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Pair_T, "$Id$")
diff --git a/ace/Utils/Templates/Pair_T.h b/ace/Utils/Templates/Pair_T.h
index 3d0a9a7575d..9b23caa0297 100644
--- a/ace/Utils/Templates/Pair_T.h
+++ b/ace/Utils/Templates/Pair_T.h
@@ -15,7 +15,7 @@
 #define ACE_PAIR_T_H
 #include "ace/pre.h"
 
-#include "ace/Pair.h"
+#include "ace/Utils/Pair.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -96,11 +96,11 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Pair_T.i"
+#include "ace/Utils/Templates/Pair_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Pair_T.cpp"
+#include "ace/Utils/Templates/Pair_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)