Committing work for the ACE Subsetting project.

Branch: ace_subset_0

42 files changed, 176 insertions, 138 deletions

diff --git a/ace/Makefile b/ace/Makefile
index 3cf435e992f..023c74ba980 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -24,7 +24,7 @@ SUBDIRS= \
   Svcconf \
   Threads \
   Token \
-  Utils
+  Utils 
 
 all:
 	@for subdir in $(SUBDIRS) ; do \
diff --git a/ace/Threads/File_Lock.cpp b/ace/Threads/File_Lock.cpp
index 7f9c3048aa7..5b8ac76f02f 100644
--- a/ace/Threads/File_Lock.cpp
+++ b/ace/Threads/File_Lock.cpp
@@ -1,16 +1,20 @@
 // $Id$
 
-#include "ace/File_Lock.h"
-#include "ace/Log_Msg.h"
+#include "ace/Threads/File_Lock.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/File_Lock.inl"
+#include "ace/Threads/File_Lock.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, File_Lock, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
 
+#ifdef ACE_SUBSET_0
 void
 ACE_File_Lock::dump (void) const
 {
@@ -20,6 +24,7 @@ ACE_File_Lock::dump (void) const
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h,
                               int unlink_in_destructor)
@@ -27,10 +32,14 @@ ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h,
     unlink_in_destructor_ (unlink_in_destructor)
 {
 // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock");
-  if (ACE_OS::flock_init (&this->lock_) == -1)
+#ifdef ACE_SUBSET_0
+	if (ACE_OS::flock_init (&this->lock_) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock")));
+#else
+	ACE_OS::flock_init(&this->lock_);
+#endif
   this->set_handle (h);
 }
 
@@ -42,11 +51,15 @@ ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name,
 {
 // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock");
 
+#ifdef ACE_SUBSET_0
   if (this->open (name, flags, perms) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p %s\n"),
                 ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"),
                 name));
+#else
+	this->open(name,flags,perms);
+#endif
 }
 
 int
diff --git a/ace/Threads/File_Lock.h b/ace/Threads/File_Lock.h
index afc549a0ff0..63f8cb33279 100644
--- a/ace/Threads/File_Lock.h
+++ b/ace/Threads/File_Lock.h
@@ -14,7 +14,7 @@
 #define ACE_FILE_LOCK_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -157,7 +157,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/File_Lock.inl"
+#include "ace/Threads/File_Lock.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Process.cpp b/ace/Threads/Process.cpp
index 932e355072a..49200f99a90 100644
--- a/ace/Threads/Process.cpp
+++ b/ace/Threads/Process.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
-#include "ace/OS.h"
-#include "ace/Process.h"
-#include "ace/ARGV.h"
-#include "ace/Signal.h"
-#include "ace/SString.h"
-#include "ace/Log_Msg.h"
+#include "ace/OS/OS.h"
+#include "ace/Threads/Process.h"
+#include "ace/Utils/ARGV.h"
+#include "ace/IPC/Signal.h"
+#include "ace/Utils/SString.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Process.i"
+#include "ace/Threads/Process.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace, Process, "$Id$")
diff --git a/ace/Threads/Process.h b/ace/Threads/Process.h
index 796cba44b4b..731848340c7 100644
--- a/ace/Threads/Process.h
+++ b/ace/Threads/Process.h
@@ -14,8 +14,8 @@
 #define ACE_PROCESS_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
-#include "ace/Handle_Set.h"
+#include "ace/OS/OS.h"
+#include "ace/OS/Handle_Set.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -547,10 +547,10 @@ private:
   // Keep G++ happy...
 };
 
-#include "ace/SString.h"
+#include "ace/Utils/SString.h"
 
 #if defined (__ACE_INLINE__)
-#include "ace/Process.i"
+#include "ace/Threads/Process.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Process_Manager.cpp b/ace/Threads/Process_Manager.cpp
index 46d5eb58c6d..654cc09f5fd 100644
--- a/ace/Threads/Process_Manager.cpp
+++ b/ace/Threads/Process_Manager.cpp
@@ -1,15 +1,18 @@
 // $Id$
 
 // Process_Manager.cpp
-#include "ace/Synch_T.h"
-#include "ace/Process.h"
-#include "ace/Signal.h"
-#include "ace/Process_Manager.h"
-#include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Threads/Process.h"
+#include "ace/IPC/Signal.h"
+#include "ace/Threads/Process_Manager.h"
+#include "ace/Utils/Object_Manager.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Process_Manager.i"
+#include "ace/Threads/Process_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Process_Manager, "$Id$")
diff --git a/ace/Threads/Process_Manager.h b/ace/Threads/Process_Manager.h
index dade19e1001..df4a18dc1a1 100644
--- a/ace/Threads/Process_Manager.h
+++ b/ace/Threads/Process_Manager.h
@@ -15,15 +15,15 @@
 #define ACE_PROCESS_MANAGER_H
 #include "ace/pre.h"
 
-#include "ace/Synch.h"
-#include "ace/Reactor.h"
-#include "ace/Event_Handler.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Demux/Reactor.h"
+#include "ace/Demux/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Process.h"
+#include "ace/Threads/Process.h"
 
 /**
  * @class ACE_Process_Descriptor
@@ -391,7 +391,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Process_Manager.i"
+#include "ace/Threads/Process_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/RW_Process_Mutex.cpp b/ace/Threads/RW_Process_Mutex.cpp
index 1b0aee4eb28..8c3377f1449 100644
--- a/ace/Threads/RW_Process_Mutex.cpp
+++ b/ace/Threads/RW_Process_Mutex.cpp
@@ -1,13 +1,17 @@
 // $Id$
 
-#include "ace/RW_Process_Mutex.h"
+#include "ace/Threads/RW_Process_Mutex.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
+
 #include "ace/ACE.h"
 
 ACE_RCSID(ace, RW_Process_Mutex, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/RW_Process_Mutex.inl"
+#include "ace/Threads/RW_Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex)
@@ -36,6 +40,7 @@ ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex (void)
 // ACE_TRACE ("ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex");
 }
 
+#ifdef ACE_SUBSET_0
 void
 ACE_RW_Process_Mutex::dump (void) const
 {
@@ -44,6 +49,7 @@ ACE_RW_Process_Mutex::dump (void) const
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 //
 // These are instantiated both with and without ACE_HAS_THREADS.
diff --git a/ace/Threads/RW_Process_Mutex.h b/ace/Threads/RW_Process_Mutex.h
index 77500d19aa3..af9364a4529 100644
--- a/ace/Threads/RW_Process_Mutex.h
+++ b/ace/Threads/RW_Process_Mutex.h
@@ -14,7 +14,7 @@
 #define ACE_RW_PROCESS_MUTEX_H
 #include "ace/pre.h"
 
-#include "ace/File_Lock.h"
+#include "ace/Threads/File_Lock.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -107,7 +107,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/RW_Process_Mutex.inl"
+#include "ace/Threads/RW_Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Synch.cpp b/ace/Threads/Synch.cpp
index 6b81248db41..f990e81d145 100644
--- a/ace/Threads/Synch.cpp
+++ b/ace/Threads/Synch.cpp
@@ -3,20 +3,23 @@
 #ifndef ACE_SYNCH_C
 #define ACE_SYNCH_C
 
-#include "ace/Thread.h"
+#include "ace/Threads/Thread.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch_T.h"
-#include "ace/Synch.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Threads/Synch.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Synch, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Synch.i"
+#include "ace/Threads/Synch.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
diff --git a/ace/Threads/Thread.cpp b/ace/Threads/Thread.cpp
index 7fa156c2488..ba2275c4d48 100644
--- a/ace/Threads/Thread.cpp
+++ b/ace/Threads/Thread.cpp
@@ -1,10 +1,10 @@
 // Thread.cpp
 // $Id$
 
-#include "ace/Thread.h"
+#include "ace/Threads/Thread.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Thread.i"
+#include "ace/Threads/Thread.i"
 #endif /* !defined (__ACE_INLINE__) */
 
 ACE_RCSID(ace, Thread, "$Id$")
diff --git a/ace/Threads/Thread_Adapter.cpp b/ace/Threads/Thread_Adapter.cpp
index 91357bfc58f..98e99af10f7 100644
--- a/ace/Threads/Thread_Adapter.cpp
+++ b/ace/Threads/Thread_Adapter.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "ace/Thread_Adapter.h"
-#include "ace/OS.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Thread_Exit.h"
-#include "ace/Thread_Hook.h"
+#include "ace/Threads/Thread_Adapter.h"
+#include "ace/OS/OS.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/Threads/Thread_Exit.h"
+#include "ace/OS/Thread_Hook.h"
 
 ACE_RCSID(ace, Thread_Adapter, "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/Thread_Adapter.inl"
+# include "ace/Threads/Thread_Adapter.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
 ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
diff --git a/ace/Threads/Thread_Control.cpp b/ace/Threads/Thread_Control.cpp
index e5fff02d507..de6a5e09d93 100644
--- a/ace/Threads/Thread_Control.cpp
+++ b/ace/Threads/Thread_Control.cpp
@@ -5,17 +5,17 @@
 #if defined (ACE_LEGACY_MODE)
 // This silly include breaks a cycle when compiling in backwards
 // compatibility mode
-#  include "ace/Thread_Exit.h"
+#  include "ace/Threads/Thread_Exit.h"
 #endif  /* ACE_LEGACY_MODE */
 // </HACK OFF>
 
-#include "ace/Thread_Control.h"
-#include "ace/Thread_Manager.h"
+#include "ace/Threads/Thread_Control.h"
+#include "ace/Threads/Thread_Manager.h"
 
 ACE_RCSID(ace, Thread_Control, "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/Thread_Control.inl"
+# include "ace/Threads/Thread_Control.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
 void
diff --git a/ace/Threads/Thread_Control.h b/ace/Threads/Thread_Control.h
index fbf8f0f213f..d125b5457b1 100644
--- a/ace/Threads/Thread_Control.h
+++ b/ace/Threads/Thread_Control.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (ACE_LEGACY_MODE)
-#  include "ace/OS.h"
+#  include "ace/OS/OS.h"
 #endif  /* ACE_LEGACY_MODE */
 
 class ACE_Thread_Manager;
@@ -94,7 +94,7 @@ private:
 #     undef ACE_INLINE
 #   endif /* ACE_INLINE */
 #   define ACE_INLINE inline
-#   include "ace/Thread_Control.inl"
+#   include "ace/Threads/Thread_Control.inl"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
 #include "ace/post.h"
diff --git a/ace/Threads/Thread_Exit.cpp b/ace/Threads/Thread_Exit.cpp
index 2128ac148f5..9e65b472a2b 100644
--- a/ace/Threads/Thread_Exit.cpp
+++ b/ace/Threads/Thread_Exit.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Thread_Exit.h"
-#include "ace/OS.h"
-#include "ace/Synch.h"
-#include "ace/Managed_Object.h"
+#include "ace/Threads/Thread_Exit.h"
+#include "ace/OS/OS.h"
+#include "ace/Threads/Synch.h"
+#include "ace/Utils/Templates/Managed_Object.h"
 
 ACE_RCSID(ace, Thread_Exit, "$Id$")
 
diff --git a/ace/Threads/Thread_Exit.h b/ace/Threads/Thread_Exit.h
index 5b87817ffaa..d10f6b742d9 100644
--- a/ace/Threads/Thread_Exit.h
+++ b/ace/Threads/Thread_Exit.h
@@ -20,8 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS.h"
-#include "ace/Thread_Control.h"
+#include "ace/OS/OS.h"
+#include "ace/Threads/Thread_Control.h"
 
 /**
  * @class ACE_Thread_Exit
diff --git a/ace/Threads/Token.cpp b/ace/Threads/Token.cpp
index cb2b2d2c618..1313b738ad8 100644
--- a/ace/Threads/Token.cpp
+++ b/ace/Threads/Token.cpp
@@ -1,8 +1,11 @@
 // $Id$
 
-#include "ace/Thread.h"
-#include "ace/Token.h"
-#include "ace/Log_Msg.h"
+#include "ace/Threads/Thread.h"
+#include "ace/Threads/Token.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if defined (DEBUGGING)
 #include "ace/streams.h"
@@ -13,13 +16,13 @@ ACE_RCSID(ace, Token, "$Id$")
 #if defined (ACE_HAS_THREADS)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Synch_T.h"
-#include "ace/Token.i"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Threads/Token.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Token)
 
-
+#ifdef ACE_SUBSET_0
 void
 ACE_Token::dump (void) const
 {
@@ -36,6 +39,7 @@ ACE_Token::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnesting level = %d"), this->nesting_level_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry (ACE_Thread_Mutex &m,
                                                          ACE_thread_t t_id)
diff --git a/ace/Token/Remote_Tokens.cpp b/ace/Token/Remote_Tokens.cpp
index 86aec7547d8..56b6b49ece6 100644
--- a/ace/Token/Remote_Tokens.cpp
+++ b/ace/Token/Remote_Tokens.cpp
@@ -1,11 +1,11 @@
 // Remote_Tokens.cpp
 // $Id$
 
-#include "ace/Remote_Tokens.h"
-#include "ace/Singleton.h"
+#include "ace/Token/Remote_Tokens.h"
+#include "ace/Utils/Templates/Singleton.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Remote_Tokens.i"
+#include "ace/Token/Remote_Tokens.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token/Remote_Tokens.h b/ace/Token/Remote_Tokens.h
index 6ec934027cb..692b0d502cc 100644
--- a/ace/Token/Remote_Tokens.h
+++ b/ace/Token/Remote_Tokens.h
@@ -15,17 +15,17 @@
 #define ACE_REMOTE_MUTEX_H
 #include "ace/pre.h"
 
-#include "ace/INET_Addr.h"
+#include "ace/IPC/INET_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Synch_Options.h"
-#include "ace/Local_Tokens.h"
-#include "ace/Token_Request_Reply.h"
+#include "ace/Sockets/SOCK_Connector.h"
+#include "ace/Sockets/SOCK_Stream.h"
+#include "ace/Threads/Synch_Options.h"
+#include "ace/Token/Local_Tokens.h"
+#include "ace/Token/Token_Request_Reply.h"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
@@ -309,7 +309,7 @@ private:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Remote_Tokens.i"
+#include "ace/Token/Remote_Tokens.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Token/Token_Collection.cpp b/ace/Token/Token_Collection.cpp
index e362d9e2aed..5e2e973b101 100644
--- a/ace/Token/Token_Collection.cpp
+++ b/ace/Token/Token_Collection.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Token_Collection.h"
+#include "ace/Token/Token_Collection.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token_Collection.i"
+#include "ace/Token/Token_Collection.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token/Token_Collection.h b/ace/Token/Token_Collection.h
index 3c6e4297214..d7fbc99be64 100644
--- a/ace/Token/Token_Collection.h
+++ b/ace/Token/Token_Collection.h
@@ -24,14 +24,14 @@
 #define ACE_TOKEN_COLLECTION_H
 #include "ace/pre.h"
 
-#include "ace/Map_Manager.h"
+#include "ace/Utils/Templates/Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Local_Tokens.h"
-#include "ace/SString.h"
+#include "ace/Token/Local_Tokens.h"
+#include "ace/Utils/SString.h"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
@@ -227,7 +227,7 @@ protected:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token_Collection.i"
+#include "ace/Token/Token_Collection.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Token/Token_Invariants.cpp b/ace/Token/Token_Invariants.cpp
index e709e1ea65b..861615beff0 100644
--- a/ace/Token/Token_Invariants.cpp
+++ b/ace/Token/Token_Invariants.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ace/Token_Invariants.h"
-#include "ace/Object_Manager.h"
+#include "ace/Token/Token_Invariants.h"
+#include "ace/Utils/Object_Manager.h"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
diff --git a/ace/Token/Token_Invariants.h b/ace/Token/Token_Invariants.h
index e5c10ebaed6..5fd007b13b3 100644
--- a/ace/Token/Token_Invariants.h
+++ b/ace/Token/Token_Invariants.h
@@ -20,14 +20,14 @@
 #define ACE_TOKEN_INVARIANTS_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)
 
diff --git a/ace/Token/Token_Request_Reply.cpp b/ace/Token/Token_Request_Reply.cpp
index 9fecb01e443..32a1138c582 100644
--- a/ace/Token/Token_Request_Reply.cpp
+++ b/ace/Token/Token_Request_Reply.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Token_Request_Reply.h"
+#include "ace/Token/Token_Request_Reply.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token_Request_Reply.i"
+#include "ace/Token/Token_Request_Reply.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token/Token_Request_Reply.h b/ace/Token/Token_Request_Reply.h
index 1c3aa88d09c..0a5e64019d1 100644
--- a/ace/Token/Token_Request_Reply.h
+++ b/ace/Token/Token_Request_Reply.h
@@ -20,13 +20,13 @@
 #define ACE_TOKEN_REQUEST_REPLY_H
 #include "ace/pre.h"
 
-#include "ace/Local_Tokens.h"
+#include "ace/Token/Local_Tokens.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"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
@@ -240,7 +240,7 @@ private:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token_Request_Reply.i"
+#include "ace/Token/Token_Request_Reply.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Sample_History.cpp b/ace/Utils/Sample_History.cpp
index 7757592eb2e..ef72e972da8 100644
--- a/ace/Utils/Sample_History.cpp
+++ b/ace/Utils/Sample_History.cpp
@@ -17,7 +17,9 @@ ACE_Sample_History::ACE_Sample_History (size_t max_samples)
   : max_samples_ (max_samples)
   , sample_count_ (0)
 {
+#ifdef NOT_GCC3
   ACE_NEW(this->samples_, ACE_UINT64[this->max_samples_]);
+#endif
 }
 
 ACE_Sample_History::~ACE_Sample_History (void)
diff --git a/ace/Utils/Templates/Auto_IncDec_T.cpp b/ace/Utils/Templates/Auto_IncDec_T.cpp
index 2ca06874a2e..1e04a1270f3 100644
--- a/ace/Utils/Templates/Auto_IncDec_T.cpp
+++ b/ace/Utils/Templates/Auto_IncDec_T.cpp
@@ -3,17 +3,22 @@
 #ifndef ACE_AUTO_INCDEC_T_C
 #define ACE_AUTO_INCDEC_T_C
 
+#ifdef ACE_SUBSET_0
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+#endif
 
-#include "ace/Auto_IncDec_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Utils/Templates/Auto_IncDec_T.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Auto_IncDec_T, "Auto_IncDec_T.cpp, by Edan Ayal")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Auto_IncDec_T.i"
+#include "ace/Utils/Templates/Auto_IncDec_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Auto_IncDec)
diff --git a/ace/Utils/Templates/Auto_IncDec_T.h b/ace/Utils/Templates/Auto_IncDec_T.h
index f2a10e498f8..6ad7c1dc9f9 100644
--- a/ace/Utils/Templates/Auto_IncDec_T.h
+++ b/ace/Utils/Templates/Auto_IncDec_T.h
@@ -15,7 +15,7 @@
 #define ACE_AUTO_INCDEC_T_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -60,12 +60,12 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Auto_IncDec_T.i"
+#include "ace/Utils/Templates/Auto_IncDec_T.i"
 // On non-Win32 platforms, this code will be inlined
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Auto_IncDec_T.cpp"
+#include "ace/Utils/Templates/Auto_IncDec_T.cpp"
 // On Win32 platforms, this code will be included as template source
 // code and will not be inlined. Therefore, we first turn off
 // ACE_INLINE, set it to be nothing, include the code, and then turn
diff --git a/ace/Utils/Templates/Cache_Map_Manager_T.cpp b/ace/Utils/Templates/Cache_Map_Manager_T.cpp
index 9460c2df16d..04dc841b282 100644
--- a/ace/Utils/Templates/Cache_Map_Manager_T.cpp
+++ b/ace/Utils/Templates/Cache_Map_Manager_T.cpp
@@ -3,16 +3,16 @@
 #ifndef ACE_CACHE_MAP_MANAGER_T_C
 #define ACE_CACHE_MAP_MANAGER_T_C
 
-#include "ace/Cache_Map_Manager_T.h"
+#include "ace/Utils/Templates/Cache_Map_Manager_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc.h"
+#include "ace/Memory/Malloc.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Cache_Map_Manager_T.i"
+#include "ace/Utils/Templates/Cache_Map_Manager_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$")
diff --git a/ace/Utils/Templates/Cache_Map_Manager_T.h b/ace/Utils/Templates/Cache_Map_Manager_T.h
index cef4f7ab99f..817819cecab 100644
--- a/ace/Utils/Templates/Cache_Map_Manager_T.h
+++ b/ace/Utils/Templates/Cache_Map_Manager_T.h
@@ -15,13 +15,13 @@
 #define CACHE_MAP_MANAGER_T_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Pair_T.h"
+#include "ace/Utils/Templates/Pair_T.h"
 
 // Forward declaration.
 class ACE_Allocator;
@@ -410,11 +410,11 @@ protected:
 #undef ACE_T2
 
 #if defined (__ACE_INLINE__)
-#include "ace/Cache_Map_Manager_T.i"
+#include "ace/Utils/Templates/Cache_Map_Manager_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Cache_Map_Manager_T.cpp"
+#include "ace/Utils/Templates/Cache_Map_Manager_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Cached_Connect_Strategy_T.cpp b/ace/Utils/Templates/Cached_Connect_Strategy_T.cpp
index 0086f9d001f..d036ba97d3b 100644
--- a/ace/Utils/Templates/Cached_Connect_Strategy_T.cpp
+++ b/ace/Utils/Templates/Cached_Connect_Strategy_T.cpp
@@ -3,19 +3,19 @@
 #ifndef CACHED_CONNECT_STRATEGY_T_C
 #define CACHED_CONNECT_STRATEGY_T_C
 
-#include "ace/Cached_Connect_Strategy_T.h"
+#include "ace/Utils/Templates/Cached_Connect_Strategy_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/ACE.h"
-#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/Pair_T.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"
+#include "ace/Utils/Templates/Pair_T.h"
 
 ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$")
 
diff --git a/ace/Utils/Templates/Cached_Connect_Strategy_T.h b/ace/Utils/Templates/Cached_Connect_Strategy_T.h
index 56ec72b1606..90cf02ef52e 100644
--- a/ace/Utils/Templates/Cached_Connect_Strategy_T.h
+++ b/ace/Utils/Templates/Cached_Connect_Strategy_T.h
@@ -14,18 +14,18 @@
 #define CACHED_CONNECT_STRATEGY_T_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Strategies_T.h"
-#include "ace/Hash_Cache_Map_Manager_T.h"
-#include "ace/Caching_Strategies_T.h"
-#include "ace/Functor_T.h"
-#include "ace/Pair_T.h"
-#include "ace/Synch.h"
+#include "ace/Connection/Strategies_T.h"
+#include "ace/Utils/Templates/Hash_Cache_Map_Manager_T.h"
+#include "ace/Connection/Caching_Strategies_T.h"
+#include "ace/Utils/Functor_T.h"
+#include "ace/Utils/Templates/Pair_T.h"
+#include "ace/Threads/Synch.h"
 
 // For linkers which cant grok long names...
 #define ACE_Cached_Connect_Strategy_Ex ACCSE
@@ -248,7 +248,7 @@ template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1,
 
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Cached_Connect_Strategy_T.cpp"
+#include "ace/Utils/Templates/Cached_Connect_Strategy_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Env_Value_T.cpp b/ace/Utils/Templates/Env_Value_T.cpp
index d99819ec6b9..b618f2cbf66 100644
--- a/ace/Utils/Templates/Env_Value_T.cpp
+++ b/ace/Utils/Templates/Env_Value_T.cpp
@@ -3,10 +3,10 @@
 #if !defined (ACE_ENV_VALUE_T_C)
 #define ACE_ENV_VALUE_T_C
 
-#include "ace/Env_Value_T.h"
+#include "ace/Utils/Templates/Env_Value_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ace/Env_Value_T.i"
+#include "ace/Utils/Templates/Env_Value_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Env_Value_T, "$Id$")
diff --git a/ace/Utils/Templates/Env_Value_T.h b/ace/Utils/Templates/Env_Value_T.h
index c38e5deac86..efa57875565 100644
--- a/ace/Utils/Templates/Env_Value_T.h
+++ b/ace/Utils/Templates/Env_Value_T.h
@@ -19,7 +19,7 @@
 #define ACE_ENV_VALUE_T_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"             // Need to get ACE_static_cast definition
+#include "ace/OS/OS.h"             // Need to get ACE_static_cast definition
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -78,11 +78,11 @@ template <class T> void ACE_Convert (const ACE_TCHAR *s, T &t);
 // Function to convert a string <s> into type <T>.
 
 #if defined (__ACE_INLINE__)
-#include "ace/Env_Value_T.i"
+#include "ace/Utils/Templates/Env_Value_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Env_Value_T.cpp"
+#include "ace/Utils/Templates/Env_Value_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 
diff --git a/ace/Utils/Templates/Hash_Cache_Map_Manager_T.cpp b/ace/Utils/Templates/Hash_Cache_Map_Manager_T.cpp
index e632924334e..e600d23de69 100644
--- a/ace/Utils/Templates/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Utils/Templates/Hash_Cache_Map_Manager_T.cpp
@@ -3,14 +3,14 @@
 #ifndef ACE_HASH_CACHE_MAP_MANAGER_T_C
 #define ACE_HASH_CACHE_MAP_MANAGER_T_C
 
-#include "ace/Hash_Cache_Map_Manager_T.h"
+#include "ace/Utils/Templates/Hash_Cache_Map_Manager_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Hash_Cache_Map_Manager_T.i"
+#include "ace/Utils/Templates/Hash_Cache_Map_Manager_T.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Hash_Cache_Map_Manager_T, "$Id$")
diff --git a/ace/Utils/Templates/Hash_Cache_Map_Manager_T.h b/ace/Utils/Templates/Hash_Cache_Map_Manager_T.h
index d2eb1e37c7c..cb581bbe604 100644
--- a/ace/Utils/Templates/Hash_Cache_Map_Manager_T.h
+++ b/ace/Utils/Templates/Hash_Cache_Map_Manager_T.h
@@ -15,8 +15,8 @@
 #define HASH_CACHE_MAP_MANAGER_T_H
 #include "ace/pre.h"
 
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Cache_Map_Manager_T.h"
+#include "ace/Utils/Templates/Hash_Map_Manager_T.h"
+#include "ace/Utils/Templates/Cache_Map_Manager_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define  ACE_LACKS_PRAGMA_ONCE
@@ -200,11 +200,11 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Hash_Cache_Map_Manager_T.i"
+#include "ace/Utils/Templates/Hash_Cache_Map_Manager_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Hash_Cache_Map_Manager_T.cpp"
+#include "ace/Utils/Templates/Hash_Cache_Map_Manager_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Intrusive_List.cpp b/ace/Utils/Templates/Intrusive_List.cpp
index 7a23921288b..cea0adba195 100644
--- a/ace/Utils/Templates/Intrusive_List.cpp
+++ b/ace/Utils/Templates/Intrusive_List.cpp
@@ -3,14 +3,14 @@
 #ifndef ACE_INTRUSIVE_LIST_C
 #define ACE_INTRUSIVE_LIST_C
 
-#include "ace/Intrusive_List.h"
+#include "ace/Utils/Templates/Intrusive_List.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Intrusive_List.inl"
+#include "ace/Utils/Templates/Intrusive_List.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Intrusive_List, "$Id$")
diff --git a/ace/Utils/Templates/Intrusive_List.h b/ace/Utils/Templates/Intrusive_List.h
index 1340c654355..5e36b72b3d6 100644
--- a/ace/Utils/Templates/Intrusive_List.h
+++ b/ace/Utils/Templates/Intrusive_List.h
@@ -116,11 +116,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Intrusive_List.inl"
+#include "ace/Utils/Templates/Intrusive_List.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Intrusive_List.cpp"
+#include "ace/Utils/Templates/Intrusive_List.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Utils/Templates/Intrusive_List_Node.cpp b/ace/Utils/Templates/Intrusive_List_Node.cpp
index 58002653d2e..5375b1d5f9b 100644
--- a/ace/Utils/Templates/Intrusive_List_Node.cpp
+++ b/ace/Utils/Templates/Intrusive_List_Node.cpp
@@ -3,14 +3,14 @@
 #ifndef ACE_INTRUSIVE_LIST_NODE_C
 #define ACE_INTRUSIVE_LIST_NODE_C
 
-#include "ace/Intrusive_List_Node.h"
+#include "ace/Utils/Templates/Intrusive_List_Node.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Intrusive_List_Node.inl"
+#include "ace/Utils/Templates/Intrusive_List_Node.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Intrusive_List_Node, "$Id$")
diff --git a/ace/Utils/Templates/Intrusive_List_Node.h b/ace/Utils/Templates/Intrusive_List_Node.h
index b376b3f97d2..1c906cc70f5 100644
--- a/ace/Utils/Templates/Intrusive_List_Node.h
+++ b/ace/Utils/Templates/Intrusive_List_Node.h
@@ -66,11 +66,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Intrusive_List_Node.inl"
+#include "ace/Utils/Templates/Intrusive_List_Node.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Intrusive_List_Node.cpp"
+#include "ace/Utils/Templates/Intrusive_List_Node.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 d0c490c6c34..7b5095e51d1 100644
--- a/ace/Utils/Templates/Message_Block_T.cpp
+++ b/ace/Utils/Templates/Message_Block_T.cpp
@@ -3,7 +3,6 @@
 #if !defined (ACE_MESSAGE_BLOCK_T_C)
 #define ACE_MESSAGE_BLOCK_T_C
 
-
 ACE_RCSID(ace, Message_Block_T, "$Id$")
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/Utils/libACE_Utils.a b/ace/Utils/libACE_Utils.a
index 8b277f0dd5d..21d80fe132e 100644
--- a/ace/Utils/libACE_Utils.a
+++ b/ace/Utils/libACE_Utils.a