Working on libACE_Utils

- Stopped at Utils/Future_Set

56 files changed, 210 insertions, 171 deletions

diff --git a/ace/Connection/Strategies_T.cpp b/ace/Connection/Strategies_T.cpp
index 70924c3bc31..ce1ce6c4858 100644
--- a/ace/Connection/Strategies_T.cpp
+++ b/ace/Connection/Strategies_T.cpp
@@ -3,20 +3,20 @@
 #ifndef ACE_STRATEGIES_T_C
 #define ACE_STRATEGIES_T_C
 
-#include "ace/Strategies_T.h"
+#include "ace/Connection/Strategies_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Repository.h"
-#include "ace/Synch.h"
-#include "ace/Service_Types.h"
-#include "ace/Thread_Manager.h"
-#include "ace/WFMO_Reactor.h"
+#include "ace/Svcconf/Service_Repository.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Svcconf/Service_Types.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/Demux/WFMO_Reactor.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/Strategies_T.i"
+#include "ace/Connection/Strategies_T.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 ACE_RCSID(ace, Strategies_T, "$Id$")
diff --git a/ace/Connection/Strategies_T.h b/ace/Connection/Strategies_T.h
index 4c9c327cffa..50bcf7e0689 100644
--- a/ace/Connection/Strategies_T.h
+++ b/ace/Connection/Strategies_T.h
@@ -14,20 +14,20 @@
 #define ACE_STRATEGIES_T_H
 #include "ace/pre.h"
 
-#include "ace/Hash_Map_Manager.h"
+#include "ace/Utils/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
-#include "ace/Reactor.h"
-#include "ace/Synch_Options.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Connection_Recycling_Strategy.h"
-#include "ace/Refcountable.h"
-#include "ace/Hashable.h"
-#include "ace/Recyclable.h"
+#include "ace/Svcconf/Service_Config.h"
+#include "ace/Demux/Reactor.h"
+#include "ace/Threads/Synch_Options.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/Utils/Connection_Recycling_Strategy.h"
+#include "ace/Utils/Refcountable.h"
+#include "ace/Utils/Hashable.h"
+#include "ace/Utils/Recyclable.h"
 
 // Needed for broken linkers that can't grok long symbols.
 #define ACE_Refcounted_Hash_Recyclable ARHR
@@ -956,11 +956,11 @@ protected:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/Strategies_T.i"
+#include "ace/Connection/Strategies_T.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Strategies_T.cpp"
+#include "ace/Connection/Strategies_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Demux/Reactor.cpp b/ace/Demux/Reactor.cpp
index 1ce3989b249..b3b463fb878 100644
--- a/ace/Demux/Reactor.cpp
+++ b/ace/Demux/Reactor.cpp
@@ -1,21 +1,21 @@
 // $Id$
 
-#include "ace/Reactor.h"
-#include "ace/Reactor_Impl.h"
-#include "ace/Handle_Set.h"
+#include "ace/Demux/Reactor.h"
+#include "ace/Demux/Reactor_Impl.h"
+#include "ace/OS/Handle_Set.h"
 #if !defined (ACE_HAS_WINCE)
 #  if !defined (ACE_LACKS_ACE_SVCCONF)
-#    include "ace/Service_Config.h"
+#    include "ace/Svcconf/Service_Config.h"
 #  endif /* !ACE_LACKS_ACE_SVCCONF */
-#  include "ace/WFMO_Reactor.h"
-#  include "ace/Msg_WFMO_Reactor.h"
+#  include "ace/Demux/WFMO_Reactor.h"
+#  include "ace/Other/Msg_WFMO_Reactor.h"
 #endif /* ! ACE_HAS_WINCE */
-#include "ace/Select_Reactor.h"
-#include "ace/TP_Reactor.h"
-#include "ace/Object_Manager.h"
+#include "ace/Demux/Select_Reactor.h"
+#include "ace/Other/TP_Reactor.h"
+#include "ace/Utils/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Reactor.i"
+#include "ace/Demux/Reactor.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Reactor, "$Id$")
diff --git a/ace/Demux/WFMO_Reactor.cpp b/ace/Demux/WFMO_Reactor.cpp
index b6a41d2e9d3..dab509f08c1 100644
--- a/ace/Demux/WFMO_Reactor.cpp
+++ b/ace/Demux/WFMO_Reactor.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "ace/WFMO_Reactor.h"
+#include "ace/Demux/WFMO_Reactor.h"
 
-#include "ace/Handle_Set.h"
-#include "ace/Timer_Heap.h"
-#include "ace/Thread.h"
+#include "ace/OS/Handle_Set.h"
+#include "ace/Timer/Timer_Heap.h"
+#include "ace/Threads/Thread.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/WFMO_Reactor.i"
+#include "ace/Demux/WFMO_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, WFMO_Reactor, "$Id$")
@@ -15,7 +15,7 @@ ACE_RCSID(ace, WFMO_Reactor, "$Id$")
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
-#include "ace/Auto_Ptr.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
 
 ACE_WFMO_Reactor_Handler_Repository::ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor)
   : wfmo_reactor_ (wfmo_reactor)
diff --git a/ace/Demux/WFMO_Reactor.h b/ace/Demux/WFMO_Reactor.h
index 02ed32ed6df..7d7288e1206 100644
--- a/ace/Demux/WFMO_Reactor.h
+++ b/ace/Demux/WFMO_Reactor.h
@@ -16,18 +16,18 @@
 #define ACE_WFMO_REACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Signal.h"
+#include "ace/IPC/Signal.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Timer_Queue.h"
-#include "ace/Event_Handler.h"
-#include "ace/Synch.h"
-#include "ace/Reactor_Impl.h"
-#include "ace/Message_Queue.h"
-#include "ace/Process_Mutex.h"
+#include "ace/Timer/Timer_Queue.h"
+#include "ace/Demux/Event_Handler.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Demux/Reactor_Impl.h"
+#include "ace/Streams/Message_Queue.h"
+#include "ace/Threads/Process_Mutex.h"
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 // If we don't have WinSOCK2, we need these defined
@@ -1318,7 +1318,7 @@ private:
 #endif /* ACE_WIN32 */
 
 #if defined (__ACE_INLINE__)
-#include "ace/WFMO_Reactor.i"
+#include "ace/Demux/WFMO_Reactor.i"
 #endif /* __ACE_INLINE__ */
 #include "ace/post.h"
 #endif /* ACE_WFMO_REACTOR_H */
diff --git a/ace/Demux/WFMO_Reactor.i b/ace/Demux/WFMO_Reactor.i
index d2a8481f886..37bf417e6ec 100644
--- a/ace/Demux/WFMO_Reactor.i
+++ b/ace/Demux/WFMO_Reactor.i
@@ -1,8 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/Handle_Set.h"
-#include "ace/Reactor.h"
+#include "ace/OS/Handle_Set.h"
+#include "ace/Demux/Reactor.h"
 /************************************************************/
 
 ACE_INLINE int
diff --git a/ace/Streams/Message_Queue.cpp b/ace/Streams/Message_Queue.cpp
index bd4189d2f3c..3357027a130 100644
--- a/ace/Streams/Message_Queue.cpp
+++ b/ace/Streams/Message_Queue.cpp
@@ -3,10 +3,10 @@
 #if !defined (ACE_MESSAGE_QUEUE_C)
 #define ACE_MESSAGE_QUEUE_C
 
-#include "ace/Message_Queue.h"
+#include "ace/Streams/Message_Queue.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Queue.i"
+#include "ace/Streams/Message_Queue.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Message_Queue, "$Id$")
diff --git a/ace/Streams/Message_Queue.h b/ace/Streams/Message_Queue.h
index ffa2bd77780..86f2c318651 100644
--- a/ace/Streams/Message_Queue.h
+++ b/ace/Streams/Message_Queue.h
@@ -14,13 +14,13 @@
 #define ACE_MESSAGE_QUEUE_H
 #include "ace/pre.h"
 
-#include "ace/Message_Block.h"
+#include "ace/Utils/Message_Block.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/IO_Cntl_Msg.h"
+#include "ace/Utils/IO_Cntl_Msg.h"
 
 // Forward decls.
 class ACE_Notification_Strategy;
@@ -173,7 +173,7 @@ private:
 };
 
 // Include the templates here.
-#include "ace/Message_Queue_T.h"
+#include "ace/Streams/Message_Queue_T.h"
 
 #if defined (VXWORKS)
 # include /**/ <msgQLib.h>
@@ -516,7 +516,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Queue.i"
+#include "ace/Streams/Message_Queue.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Streams/Message_Queue_T.cpp b/ace/Streams/Message_Queue_T.cpp
index 6b7a7dd288a..3d946d872b2 100644
--- a/ace/Streams/Message_Queue_T.cpp
+++ b/ace/Streams/Message_Queue_T.cpp
@@ -5,7 +5,7 @@
 
 // #include Message_Queue.h instead of Message_Queue_T.h to avoid
 // circular include problems.
-#include "ace/Message_Queue.h"
+#include "ace/Streams/Message_Queue.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -13,10 +13,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Queue_T.i"
+#include "ace/Streams/Message_Queue_T.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Notification_Strategy.h"
+#include "ace/Streams/Notification_Strategy.h"
 
 ACE_RCSID(ace, Message_Queue_T, "$Id$")
 
diff --git a/ace/Streams/Message_Queue_T.h b/ace/Streams/Message_Queue_T.h
index f8155eeed2c..fa3cc534f0b 100644
--- a/ace/Streams/Message_Queue_T.h
+++ b/ace/Streams/Message_Queue_T.h
@@ -14,8 +14,8 @@
 #define ACE_MESSAGE_QUEUE_T_H
 #include "ace/pre.h"
 
-#include "ace/Message_Queue.h"
-#include "ace/Synch.h"
+#include "ace/Streams/Message_Queue.h"
+#include "ace/Threads/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -1038,11 +1038,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Queue_T.i"
+#include "ace/Streams/Message_Queue_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Message_Queue_T.cpp"
+#include "ace/Streams/Message_Queue_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Streams/Notification_Strategy.cpp b/ace/Streams/Notification_Strategy.cpp
index 77d5dc235b0..954e20d1a6b 100644
--- a/ace/Streams/Notification_Strategy.cpp
+++ b/ace/Streams/Notification_Strategy.cpp
@@ -1,4 +1,4 @@
-#include "ace/Notification_Strategy.h"
+#include "ace/Streams/Notification_Strategy.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Notification_Strategy.inl"
diff --git a/ace/Streams/Notification_Strategy.h b/ace/Streams/Notification_Strategy.h
index e1ec8b3f034..293958446a0 100644
--- a/ace/Streams/Notification_Strategy.h
+++ b/ace/Streams/Notification_Strategy.h
@@ -12,7 +12,7 @@
 #define ACE_NOTIFICATION_STRATEGY_H
 #include "ace/pre.h"
 
-#include "ace/Event_Handler.h"
+#include "ace/Demux/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -56,7 +56,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Notification_Strategy.inl"
+#include "ace/Streams/Notification_Strategy.inl"
 #endif /* __ACE_INLINE __ */
 
 #include "ace/post.h"
diff --git a/ace/Svcconf/Service_Repository.cpp b/ace/Svcconf/Service_Repository.cpp
index 21e7c47c6e6..34062fb3bcc 100644
--- a/ace/Svcconf/Service_Repository.cpp
+++ b/ace/Svcconf/Service_Repository.cpp
@@ -1,12 +1,15 @@
 // Service_Repository.cpp
 // $Id$
 
-#include "ace/Service_Repository.h"
-#include "ace/Object_Manager.h"
+#include "ace/Svcconf/Service_Repository.h"
+#include "ace/Utils/Object_Manager.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Repository.i"
+#include "ace/Svcconf/Service_Repository.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Service_Repository, "$Id$")
diff --git a/ace/Svcconf/Service_Repository.h b/ace/Svcconf/Service_Repository.h
index 46685807437..0901643ce36 100644
--- a/ace/Svcconf/Service_Repository.h
+++ b/ace/Svcconf/Service_Repository.h
@@ -14,7 +14,7 @@
 #define ACE_SERVICE_REPOSITORY_H
 #include "ace/pre.h"
 
-#include "ace/Service_Types.h"
+#include "ace/Svcconf/Service_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -196,7 +196,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Repository.i"
+#include "ace/Svcconf/Service_Repository.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Svcconf/Service_Types.cpp b/ace/Svcconf/Service_Types.cpp
index 4b66a1cb0d8..cb6c6b51c28 100644
--- a/ace/Svcconf/Service_Types.cpp
+++ b/ace/Svcconf/Service_Types.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ace/Service_Types.h"
-#include "ace/Stream_Modules.h"
-#include "ace/Stream.h"
+#include "ace/Svcconf/Service_Types.h"
+#include "ace/Svcconf/Stream_Modules.h"
+#include "ace/Streams/Stream.h"
 
 ACE_RCSID(ace, Service_Types, "$Id$")
 
@@ -11,7 +11,7 @@ typedef ACE_Module<ACE_SYNCH> MT_Module;
 typedef ACE_Task<ACE_SYNCH> MT_Task;
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Types.i"
+#include "ace/Svcconf/Service_Types.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type_Impl)
diff --git a/ace/Svcconf/Service_Types.h b/ace/Svcconf/Service_Types.h
index 54cac6e4604..72a32810f8b 100644
--- a/ace/Svcconf/Service_Types.h
+++ b/ace/Svcconf/Service_Types.h
@@ -14,13 +14,13 @@
 #define ACE_SERVICE_TYPE_H
 #include "ace/pre.h"
 
-#include "ace/Service_Object.h"
+#include "ace/Svcconf/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch.h"
+#include "ace/Threads/Synch.h"
 
 /**
  * @class ACE_Service_Type_Impl
@@ -189,7 +189,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Types.i"
+#include "ace/Svcconf/Service_Types.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Process_Mutex.cpp b/ace/Threads/Process_Mutex.cpp
index 3930903967c..88868a0bb52 100644
--- a/ace/Threads/Process_Mutex.cpp
+++ b/ace/Threads/Process_Mutex.cpp
@@ -1,8 +1,11 @@
 // $Id$
 
-#include "ace/Process_Mutex.h"
-#include "ace/Synch.h"
+#include "ace/Threads/Process_Mutex.h"
+#include "ace/Threads/Synch.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Process_Mutex.inl"
@@ -12,6 +15,7 @@ ACE_RCSID(ace, Process_Mutex, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Mutex)
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Process_Mutex::dump (void) const
 {
@@ -20,6 +24,7 @@ ACE_Process_Mutex::dump (void) const
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif /* ACE_SUBSET_0 */
 
 #if defined (_ACE_USE_SV_SEM)
 const ACE_TCHAR *
diff --git a/ace/Threads/Process_Mutex.h b/ace/Threads/Process_Mutex.h
index 8167570f0aa..a0ead43202b 100644
--- a/ace/Threads/Process_Mutex.h
+++ b/ace/Threads/Process_Mutex.h
@@ -30,10 +30,10 @@
 #  undef _ACE_USE_SV_SEM
 #endif /* _ACE_USE_SV_SEM */
 #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_USES_MUTEX_FOR_PROCESS_MUTEX)
-#  include "ace/SV_Semaphore_Complex.h"
+#  include "ace/IPC/SV_Semaphore_Complex.h"
 #  define _ACE_USE_SV_SEM
 #else
-#  include "ace/Synch.h"
+#  include "ace/Threads/Synch.h"
 #endif /* ACE_HAS_SYSV_IPC && !ACE_USES_MUTEX_FOR_PROCESS_MUTEX */
 
 /**
@@ -187,7 +187,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Process_Mutex.inl"
+#include "ace/Threads/Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Synch_Options.cpp b/ace/Threads/Synch_Options.cpp
index 0febeccfb29..9977718e277 100644
--- a/ace/Threads/Synch_Options.cpp
+++ b/ace/Threads/Synch_Options.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Synch_Options.h"
+#include "ace/Threads/Synch_Options.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Synch_Options.i"
+#include "ace/Threads/Synch_Options.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Synch_Options, "$Id$")
diff --git a/ace/Threads/Synch_Options.h b/ace/Threads/Synch_Options.h
index 3af324bca28..d3333f4f564 100644
--- a/ace/Threads/Synch_Options.h
+++ b/ace/Threads/Synch_Options.h
@@ -147,7 +147,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Synch_Options.i"
+#include "ace/Threads/Synch_Options.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Thread_Manager.cpp b/ace/Threads/Thread_Manager.cpp
index fdf9c1b532a..d83987760b2 100644
--- a/ace/Threads/Thread_Manager.cpp
+++ b/ace/Threads/Thread_Manager.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "ace/Synch_T.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Dynamic.h"
-#include "ace/Object_Manager.h"
-#include "ace/Singleton.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Thread_Exit.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/Utils/Dynamic.h"
+#include "ace/Utils/Object_Manager.h"
+#include "ace/Utils/Templates/Singleton.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
+#include "ace/Threads/Thread_Exit.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Thread_Manager.i"
+#include "ace/Threads/Thread_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Thread_Manager, "$Id$")
@@ -26,6 +26,7 @@ ACE_Thread_Manager *ACE_Thread_Manager::thr_mgr_ = 0;
 int ACE_Thread_Manager::delete_thr_mgr_ = 0;
 #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Thread_Manager::dump (void)
 {
@@ -46,6 +47,7 @@ ACE_Thread_Manager::dump (void)
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif /* ACE_SUBSET_0 */
 
 ACE_Thread_Descriptor::~ACE_Thread_Descriptor (void)
 {
diff --git a/ace/Threads/Thread_Manager.h b/ace/Threads/Thread_Manager.h
index e2c6d190db1..889164bbf97 100644
--- a/ace/Threads/Thread_Manager.h
+++ b/ace/Threads/Thread_Manager.h
@@ -14,19 +14,22 @@
 #define ACE_THREAD_MANAGER_H
 #include "ace/pre.h"
 
-#include "ace/Thread.h"
-#include "ace/Thread_Adapter.h"
+#include "ace/Threads/Thread.h"
+#include "ace/Threads/Thread_Adapter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch.h"
-#include "ace/Unbounded_Queue.h"
-#include "ace/Containers.h"
-#include "ace/Free_List.h"
-#include "ace/Singleton.h"
-#include "ace/Log_Msg.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Utils/Unbounded_Queue.h"
+#include "ace/Utils/Containers.h"
+#include "ace/Utils/Templates/Free_List.h"
+#include "ace/Utils/Templates/Singleton.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/LoggingLog_Msg.h"
+#endif
 
 // The following macros control how a Thread Manager manages a pool of
 // Thread_Descriptor.  Currently, the default behavior is not to
@@ -1001,7 +1004,7 @@ typedef ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX> ACE_THREAD_MANAGER_SI
 #endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Thread_Manager.i"
+#include "ace/Threads/Thread_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Configuration.cpp b/ace/Utils/Configuration.cpp
index 80f14b2a154..38c8f0be9fa 100644
--- a/ace/Utils/Configuration.cpp
+++ b/ace/Utils/Configuration.cpp
@@ -1,10 +1,10 @@
 // $Id$
-#include "ace/Configuration.h"
-#include "ace/Auto_Ptr.h"
+#include "ace/Utils/Configuration.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
 
 // Can remove this when import_config and export_config are removed from
 // ACE_Configuration. They're deprecated at ACE 5.2.
-#include "ace/Configuration_Import_Export.h"
+#include "ace/Utils/Configuration_Import_Export.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/ace/Utils/Configuration.h b/ace/Utils/Configuration.h
index a4e30d1b43c..d3c4fc67a91 100644
--- a/ace/Utils/Configuration.h
+++ b/ace/Utils/Configuration.h
@@ -32,9 +32,9 @@
 #include "ace/pre.h"
 
 #include "ace/ACE.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_With_Allocator_T.h"
-#include "ace/Malloc.h"
+#include "ace/Utils/SString.h"
+#include "ace/Utils/Templates/Hash_Map_With_Allocator_T.h"
+#include "ace/Memory/Malloc.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Utils/Configuration_Import_Export.cpp b/ace/Utils/Configuration_Import_Export.cpp
index ec4648731c8..8e30045a09b 100644
--- a/ace/Utils/Configuration_Import_Export.cpp
+++ b/ace/Utils/Configuration_Import_Export.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Configuration_Import_Export.h"
+#include "ace/Utils/Configuration_Import_Export.h"
 
 ACE_Config_ImpExp_Base::ACE_Config_ImpExp_Base (ACE_Configuration& config)
   : config_ (config)
diff --git a/ace/Utils/Configuration_Import_Export.h b/ace/Utils/Configuration_Import_Export.h
index fdb90ae6373..fa6f00f1b35 100644
--- a/ace/Utils/Configuration_Import_Export.h
+++ b/ace/Utils/Configuration_Import_Export.h
@@ -25,8 +25,8 @@
 #define ACE_CONFIGURATION_IMPORT_EXPORT_H
 #include "ace/pre.h"
 
-#include "ace/Configuration.h"
-#include "ace/SString.h"
+#include "ace/Utils/Configuration.h"
+#include "ace/Utils/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Utils/Connection_Recycling_Strategy.cpp b/ace/Utils/Connection_Recycling_Strategy.cpp
index 351dde2ea52..81c8ea3604c 100644
--- a/ace/Utils/Connection_Recycling_Strategy.cpp
+++ b/ace/Utils/Connection_Recycling_Strategy.cpp
@@ -1,4 +1,4 @@
-#include "ace/Connection_Recycling_Strategy.h"
+#include "ace/Utils/Connection_Recycling_Strategy.h"
 
 
 ACE_RCSID(ace, Connection_Recycling_Strategy, "$Id$")
diff --git a/ace/Utils/Connection_Recycling_Strategy.h b/ace/Utils/Connection_Recycling_Strategy.h
index 71a328e7d10..a00f2725895 100644
--- a/ace/Utils/Connection_Recycling_Strategy.h
+++ b/ace/Utils/Connection_Recycling_Strategy.h
@@ -13,7 +13,7 @@
 #define ACE_CONNECTION_RECYCLING_STRATEGY_H
 #include "ace/pre.h"
 
-#include "ace/Recyclable.h"
+#include "ace/Utils/Recyclable.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Utils/Containers.cpp b/ace/Utils/Containers.cpp
index 9fb16735ea4..d9bd6a90504 100644
--- a/ace/Utils/Containers.cpp
+++ b/ace/Utils/Containers.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "ace/OS.h"
-#include "ace/Containers.h"
+#include "ace/OS/OS.h"
+#include "ace/Utils/Containers.h"
 
 ACE_RCSID(ace, Containers, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Containers.i"
+#include "ace/Utils/Containers.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Utils/Dirent.cpp b/ace/Utils/Dirent.cpp
index d8a283a7368..589922540a4 100644
--- a/ace/Utils/Dirent.cpp
+++ b/ace/Utils/Dirent.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Dirent.h"
+#include "ace/Utils/Dirent.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Dirent.i"
+#include "ace/Utils/Dirent.i"
 #else
 #if defined (__hpux) && !defined (__GNUG__)
 static int shut_up_aCC = 0;
diff --git a/ace/Utils/Dirent.h b/ace/Utils/Dirent.h
index 0764011cd4d..94ff17650fa 100644
--- a/ace/Utils/Dirent.h
+++ b/ace/Utils/Dirent.h
@@ -16,7 +16,7 @@
 #define ACE_DIRENT_H
 #include "ace/pre.h"
 
-#include "ace/OS_Dirent.h"
+#include "ace/OS/OS_Dirent.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -108,7 +108,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Dirent.i"
+#include "ace/Utils/Dirent.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Dirent.i b/ace/Utils/Dirent.i
index 4c731311c29..c19aba18a42 100644
--- a/ace/Utils/Dirent.i
+++ b/ace/Utils/Dirent.i
@@ -1,7 +1,9 @@
 /* -*- C++ -*- */
 // $Id$
 
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
 
 ACE_INLINE int
 ACE_Dirent::open (const ACE_TCHAR *dirname) 
@@ -33,10 +35,14 @@ ACE_INLINE
 ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) 
   : dirp_ (0)
 {
+#ifdef ACE_SUBSET_0
   if (this->open (dirname) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"), 
                 ACE_LIB_TEXT ("Dirent::Dirent")));
+#else
+  this->open (dirname);
+#endif /* ACE_SUBSET_0 */
 }
 
 ACE_INLINE 
diff --git a/ace/Utils/Dirent_Selector.cpp b/ace/Utils/Dirent_Selector.cpp
index bef6c40a8d1..0c2c6af43d8 100644
--- a/ace/Utils/Dirent_Selector.cpp
+++ b/ace/Utils/Dirent_Selector.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/OS.h"
-#include "ace/Dirent_Selector.h"
+#include "ace/OS/OS.h"
+#include "ace/Utils/Dirent_Selector.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Dirent_Selector.inl"
+#include "ace/Utils/Dirent_Selector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Utils/Dirent_Selector.h b/ace/Utils/Dirent_Selector.h
index 4dcfd945b5b..33d6503be0e 100644
--- a/ace/Utils/Dirent_Selector.h
+++ b/ace/Utils/Dirent_Selector.h
@@ -59,7 +59,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Dirent_Selector.inl"
+#include "ace/Utils/Dirent_Selector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Dynamic.cpp b/ace/Utils/Dynamic.cpp
index 7dce958461d..fe819b23c5e 100644
--- a/ace/Utils/Dynamic.cpp
+++ b/ace/Utils/Dynamic.cpp
@@ -1,12 +1,12 @@
 // Dynamic.cpp
 // $Id$
 
-#include "ace/Dynamic.h"
-#include "ace/Singleton.h"
-#include "ace/Synch_T.h"
+#include "ace/Utils/Dynamic.h"
+#include "ace/Utils/Templates/Singleton.h"
+#include "ace/Threads/Synch_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Dynamic.i"
+#include "ace/Utils/Dynamic.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Dynamic, "$Id$")
diff --git a/ace/Utils/Dynamic.h b/ace/Utils/Dynamic.h
index ad8db6f7615..480d8f55854 100644
--- a/ace/Utils/Dynamic.h
+++ b/ace/Utils/Dynamic.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch_T.h"
-#include "ace/Singleton.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Utils/Templates/Singleton.h"
 
 /**
  * @class ACE_Dynamic
@@ -67,7 +67,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Dynamic.i"
+#include "ace/Utils/Dynamic.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Filecache.cpp b/ace/Utils/Filecache.cpp
index b37a9ca20da..8e3ee9a08d5 100644
--- a/ace/Utils/Filecache.cpp
+++ b/ace/Utils/Filecache.cpp
@@ -1,8 +1,11 @@
 // $Id$
 
-#include "ace/Filecache.h"
-#include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Utils/Filecache.h"
+#include "ace/Utils/Object_Manager.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Filecache, "$Id$")
 
@@ -238,8 +241,9 @@ ACE_Filecache::insert_i (const ACE_TCHAR *filename,
       ACE_NEW_RETURN (handle,
                       ACE_Filecache_Object (filename, filelock, 0, mapit),
                       0);
-
+#ifdef ACE_SUBSET_0
       ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("   (%t) CVF: creating %s\n"), filename));
+#endif
 
       if (this->hash_.bind (filename, handle) == -1)
         {
@@ -362,7 +366,10 @@ ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit)
               filelock.release ();
           }
         }
+
+#ifdef ACE_SUBSET_0
       ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("   (%t) CVF: found %s\n"), filename));
+#endif
     }
 
   return handle;
diff --git a/ace/Utils/Filecache.h b/ace/Utils/Filecache.h
index 7e8df017878..15a22ce2286 100644
--- a/ace/Utils/Filecache.h
+++ b/ace/Utils/Filecache.h
@@ -15,15 +15,15 @@
 #define ACE_FILECACHE_H
 #include "ace/pre.h"
 
-#include "ace/Mem_Map.h"
+#include "ace/Memory/Mem_Map.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch_T.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/SString.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Utils/Hash_Map_Manager.h"
+#include "ace/Utils/SString.h"
 
 enum ACE_Filecache_Flag
 {
diff --git a/ace/Utils/Flag_Manip.cpp b/ace/Utils/Flag_Manip.cpp
index 0b644d88f9d..d37d21ede0a 100644
--- a/ace/Utils/Flag_Manip.cpp
+++ b/ace/Utils/Flag_Manip.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Flag_Manip.h"
+#include "ace/Utils/Flag_Manip.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/Flag_Manip.i"
+#include "ace/Utils/Flag_Manip.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 ACE_RCSID(ace, Flag_Manip, "$Id$")
diff --git a/ace/Utils/Flag_Manip.h b/ace/Utils/Flag_Manip.h
index 1359966b9ba..9f9f4ed321b 100644
--- a/ace/Utils/Flag_Manip.h
+++ b/ace/Utils/Flag_Manip.h
@@ -40,7 +40,7 @@ class ACE_Export ACE_Flag_Manip
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "Flag_Manip.i"
+#include "ace/Utils/Flag_Manip.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Functor.cpp b/ace/Utils/Functor.cpp
index d83ef473c6f..fab3131f85f 100644
--- a/ace/Utils/Functor.cpp
+++ b/ace/Utils/Functor.cpp
@@ -32,11 +32,11 @@
 #if !defined (ACE_FUNCTOR_C)
 #define ACE_FUNCTOR_C
 
-#include "ace/Functor_T.h"
-#include "ace/Functor.h"
+#include "ace/Utils/Functor_T.h"
+#include "ace/Utils/Functor.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Functor.i"
+#include "ace/Utils/Functor.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Functor, "$Id$")
diff --git a/ace/Utils/Future.cpp b/ace/Utils/Future.cpp
index d0c263ee473..8bc986efb0b 100644
--- a/ace/Utils/Future.cpp
+++ b/ace/Utils/Future.cpp
@@ -3,7 +3,7 @@
 #ifndef ACE_FUTURE_CPP
 #define ACE_FUTURE_CPP
 
-#include "ace/Future.h"
+#include "ace/Utils/Future.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Utils/Future.h b/ace/Utils/Future.h
index 451f5908327..992de17669d 100644
--- a/ace/Utils/Future.h
+++ b/ace/Utils/Future.h
@@ -17,9 +17,9 @@
 #define ACE_FUTURE_H
 #include "ace/pre.h"
 
-#include "ace/Unbounded_Set.h"
-#include "ace/Synch.h"
-#include "ace/Strategies_T.h"
+#include "ace/Utils/Unbounded_Set.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Connection/Strategies_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -359,7 +359,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Future.cpp"
+#include "ace/Utils/Future.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Hashable.cpp b/ace/Utils/Hashable.cpp
index c07ec6d0d65..4c2fbc52d4b 100644
--- a/ace/Utils/Hashable.cpp
+++ b/ace/Utils/Hashable.cpp
@@ -1,8 +1,8 @@
 //$Id$
-#include "ace/Hashable.h"
+#include "ace/Utils/Hashable.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Hashable.inl"
+#include "ace/Utils/Hashable.inl"
 #endif /* __ACE_INLINE __ */
 
 ACE_RCSID(ace, Hashable, "$Id$")
diff --git a/ace/Utils/Hashable.h b/ace/Utils/Hashable.h
index ff12aed4ec6..ff6af3ff914 100644
--- a/ace/Utils/Hashable.h
+++ b/ace/Utils/Hashable.h
@@ -15,7 +15,7 @@
 
 // @@todo: Hate to do this. Looks like we have less luck here as
 // compilers complain for type u_long unknowns
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -57,7 +57,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Hashable.inl"
+#include "ace/Utils/Hashable.inl"
 #endif /* __ACE_INLINE __ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Object_Manager.h b/ace/Utils/Object_Manager.h
index 91307cfd635..ecbec466fe9 100644
--- a/ace/Utils/Object_Manager.h
+++ b/ace/Utils/Object_Manager.h
@@ -444,10 +444,10 @@ public:
 
 
 #if defined (__ACE_INLINE__)
-#include "Object_Manager.i"
+#include "ace/Utils/Object_Manager.i"
 #endif /* __ACE_INLINE__ */
 
-#include "Managed_Object.h"
+#include "ace/Utils/Templates/Managed_Object.h"
 
 #if !defined (ACE_LACKS_ACE_SVCCONF)
 // We can't use the ACE_SVC_FACTORY_DECLARE macro here because this
diff --git a/ace/Utils/Recyclable.h b/ace/Utils/Recyclable.h
index bcf47ef937b..da6066f4e83 100644
--- a/ace/Utils/Recyclable.h
+++ b/ace/Utils/Recyclable.h
@@ -71,7 +71,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Recyclable.inl"
+#include "ace/Utils/Recyclable.inl"
 #endif /* __ACE_INLINE __ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Refcountable.cpp b/ace/Utils/Refcountable.cpp
index 19c95cb990a..376ef91e2ee 100644
--- a/ace/Utils/Refcountable.cpp
+++ b/ace/Utils/Refcountable.cpp
@@ -1,8 +1,8 @@
 //$Id$
-#include "ace/Refcountable.h"
+#include "ace/Utils/Refcountable.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Refcountable.inl"
+#include "ace/Utils/Refcountable.inl"
 #endif /* __ACE_INLINE __ */
 
 ACE_RCSID(ace, Refcountable, "$Id$")
diff --git a/ace/Utils/Refcountable.h b/ace/Utils/Refcountable.h
index d194dd13a84..cb8d995be6e 100644
--- a/ace/Utils/Refcountable.h
+++ b/ace/Utils/Refcountable.h
@@ -51,7 +51,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Refcountable.inl"
+#include "ace/Utils/Refcountable.inl"
 #endif /* __ACE_INLINE __ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Templates/Containers_T.cpp b/ace/Utils/Templates/Containers_T.cpp
index 3b79707f09f..a23848e82b3 100644
--- a/ace/Utils/Templates/Containers_T.cpp
+++ b/ace/Utils/Templates/Containers_T.cpp
@@ -436,6 +436,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void)
     return 0;
 }
 
+#ifdef ACE_SUBSET_0
 template <class T> void
 ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
 {
@@ -443,6 +444,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("current_ = %x"), this->current_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 //--------------------------------------------------
 ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator)
diff --git a/ace/Utils/Templates/Hash_Map_With_Allocator_T.cpp b/ace/Utils/Templates/Hash_Map_With_Allocator_T.cpp
index fa2a44ca06d..8e8ed5c8fd9 100644
--- a/ace/Utils/Templates/Hash_Map_With_Allocator_T.cpp
+++ b/ace/Utils/Templates/Hash_Map_With_Allocator_T.cpp
@@ -4,14 +4,14 @@
 #ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP
 #define ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP
 
-#include "ace/Hash_Map_With_Allocator_T.h"
+#include "ace/Utils/Templates/Hash_Map_With_Allocator_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Hash_Map_With_Allocator_T.i"
+#include "ace/Utils/Templates/Hash_Map_With_Allocator_T.i"
 #endif /* __ACE_INLINE__ */
 
 template <class EXT_ID, class INT_ID>
diff --git a/ace/Utils/Templates/Hash_Map_With_Allocator_T.h b/ace/Utils/Templates/Hash_Map_With_Allocator_T.h
index 0b04fe130d8..77eddb1f851 100644
--- a/ace/Utils/Templates/Hash_Map_With_Allocator_T.h
+++ b/ace/Utils/Templates/Hash_Map_With_Allocator_T.h
@@ -14,7 +14,7 @@
 #define ACE_HASH_MAP_WITH_ALLOCATOR_T_H
 #include "ace/pre.h"
 
-#include "ace/Hash_Map_Manager.h"
+#include "ace/Utils/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -86,11 +86,11 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Hash_Map_With_Allocator_T.i"
+#include "ace/Utils/Templates/Hash_Map_With_Allocator_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Hash_Map_With_Allocator_T.cpp"
+#include "ace/Utils/Templates/Hash_Map_With_Allocator_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Managed_Object.h b/ace/Utils/Templates/Managed_Object.h
index ea65f7c7a6b..a4ffbe7be09 100644
--- a/ace/Utils/Templates/Managed_Object.h
+++ b/ace/Utils/Templates/Managed_Object.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Object_Manager.h"
+#include "ace/Utils/Object_Manager.h"
 
 /**
  * @class ACE_Cleanup_Adapter
@@ -145,11 +145,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "Managed_Object.i"
+#include "ace/Utils/Templates/Managed_Object.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Managed_Object.cpp"
+#include "ace/Utils/Templates/Managed_Object.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Message_Block_T.cpp b/ace/Utils/Templates/Message_Block_T.cpp
index 4916fd211e7..d0c490c6c34 100644
--- a/ace/Utils/Templates/Message_Block_T.cpp
+++ b/ace/Utils/Templates/Message_Block_T.cpp
@@ -7,7 +7,7 @@
 ACE_RCSID(ace, Message_Block_T, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Block_T.i"
+#include "ace/Utils/Templates/Message_Block_T.i"
 #endif /* __ACE_INLINE__ */
 
 template<class L>
diff --git a/ace/Utils/Templates/Message_Block_T.h b/ace/Utils/Templates/Message_Block_T.h
index 93dc5505b8d..992e0ec7cc8 100644
--- a/ace/Utils/Templates/Message_Block_T.h
+++ b/ace/Utils/Templates/Message_Block_T.h
@@ -15,7 +15,7 @@
 #define ACE_MESSAGE_BLOCK_T_H
 #include "ace/pre.h"
 
-#include "ace/Message_Block.h"
+#include "ace/Utils/Message_Block.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -68,11 +68,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Block_T.i"
+#include "ace/Utils/Templates/Message_Block_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Message_Block_T.cpp"
+#include "ace/Utils/Templates/Message_Block_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Singleton.cpp b/ace/Utils/Templates/Singleton.cpp
index aada3c07206..cf69a05bb4a 100644
--- a/ace/Utils/Templates/Singleton.cpp
+++ b/ace/Utils/Templates/Singleton.cpp
@@ -3,24 +3,28 @@
 #ifndef ACE_SINGLETON_C
 #define ACE_SINGLETON_C
 
-#include "ace/Singleton.h"
+#include "ace/Utils/Templates/Singleton.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch_T.h"
-#include "ace/Object_Manager.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Utils/Object_Manager.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Singleton.i"
+#include "ace/Utils/Templates/Singleton.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
            Singleton,
            "$Id$")
 
+#ifdef ACE_SUBSET_0
 template <class TYPE, class ACE_LOCK> void
 ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
@@ -32,6 +36,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }
+#endif /* ACE_SUBSET_0 */
 
 template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *&
 ACE_Singleton<TYPE, ACE_LOCK>::instance_i (void)
@@ -115,6 +120,7 @@ template <class TYPE, class ACE_LOCK> ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *
 ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
+#ifdef ACE_SUBSET_0
 template <class TYPE, class ACE_LOCK> void
 ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
@@ -126,6 +132,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }
+#endif
 
 template <class TYPE, class ACE_LOCK>
 ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&
@@ -200,6 +207,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void)
     singleton->cleanup ();
 }
 
+#ifdef ACE_SUBSET_0
 template <class TYPE, class ACE_LOCK> void
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
@@ -211,6 +219,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }
+#endif
 
 template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton<TYPE, ACE_LOCK> *&
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
@@ -286,6 +295,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
   ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
 }
 
+#ifdef ACE_SUBSET_0
 template <class TYPE, class ACE_LOCK> void
 ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
@@ -297,6 +307,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }
+#endif
 
 template <class TYPE, class ACE_LOCK>
 ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&