ChangeLogTag: Thu Oct 12 18:19:46 2000 Priyanka Gontla <pgontla@ece.uci.edu>

68 files changed, 6367 insertions, 4165 deletions

diff --git a/ChangeLog b/ChangeLog
index c8ce16d4ad5..aab544df710 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,126 @@
+Thu Oct 12 18:19:46 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+	* ace/Makefile: 
+	  Made the corresponding changes.
+
+	* ace/System_Time.cpp: 
+	* ace/UPIPE_Connector.cpp : 
+	* ace/Timer_Queue_T.h : 
+	* ace/Task.cpp : 
+	* ace/POSIX_Asynch_IO.cpp: 
+	* ace/OS.h: 
+	* ace/Memory_Pool.cpp: 
+	* ace/MEM_SAP.h: 
+	* ace/MEM_Acceptor.cpp: 
+	* ace/Logging_Strategy.cpp:
+	* ace/FIFO.h: 
+	* ace/DLL.cpp: 
+	* ace/IO_SAP.h: 
+	* ace/Malloc_T.h : 
+          Cosmetic changes. Ex: Change the included header files to the
+	  new header files and similar changes.
+	
+	* ace/Naming_Context.h: 
+	* ace/Naming_Context.cpp:
+	* ace/Object_Manager.cpp: 
+	  
+	  Removed the dependency of Object_Manager on Naming_Context.
+	
+	* ace/Test_and_Set.h: 
+	* ace/Test_and_Set.cpp: 
+	* ace/Test_and_Set.i: 
+
+	  Moved the class Test_and_Set from Synch_T to here. This helped
+	  remove the dependency on Event_Handler.
+
+	* ace/Service_Templates.h: 
+	* ace/Service_Templates.cpp: 
+	  
+	  Moved the template instantiations from Service_Config.cpp and
+	  Service_Types.cpp since these templates were not needed by the
+	  respective files.
+	
+	* ace/Malloc_Allocator.h :
+	* ace/Malloc_Allocator.cpp: 
+	* ace/Malloc_Allocator.i : 
+
+	* ace/PI_Malloc.h  : 
+	* ace/PI_Malloc.cpp: 
+	* ace/PI_Malloc.i  : 
+	
+	* ace/Malloc.h   : 
+	* ace/Malloc.cpp :
+	* ace/Malloc.i   : 
+
+	  Moved the ACE_PI_Control_Block, ACE_New_Allocator and
+	  ACE_Static_Allocator_Base classes to new files: PI_Malloc and
+	  Malloc_Allocator. 
+	  
+	  This move helps in reduction in size of Malloc.i since the
+	  template instantiations which were included only for
+	  ACE_PI_Control_Block are now moved to the new file: PI_Malloc.
+	  In addition, is the effect of clear and minimized dependencies.
+	
+	* ace/ACE.h   : 
+	* ace/ACE.cpp : 
+	* ace/ACE.i   : 
+
+	  Moved several functions in ACE to new classes to minimize the
+	  dependencies on and by ACE. Each of the following files
+	  have the listed functions.
+	
+	* ace/Malloc_Instantiations.cpp: 
+	  Moved the template instantiations to this file.
+
+	* ace/ACE_Sock_Connect.h   : 
+	* ace/ACE_Sock_Connect.cpp : 
+	* ace/ACE_Sock_Connect.i   :
+
+	  Has the socket connection establishment function calls :
+	  bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces
+	  and get_handle.
+
+	  Helps remove the dependency on INET_Addr.
+	
+	* ace/ACE_Handle_Ops.h: 
+	* ace/ACE_Handle_Ops.cpp: 
+	* ace/ACE_Handle_Ops.i: 
+	  
+	  Has the <handle_timed_open> operation on handles.
+	  Helps remove the dependency of FILE_Connector, SPIPE_COnenctor,
+	  UPIPE_Conenctpr and DEV_Connector on ACE.
+	  
+	* ace/ACE_Lib_Find.h   : 
+	* ace/ACE_Lib_Find.cpp : 
+	* ace/ACE_Lib_Find.i   : 
+
+	  Includes all the functions to search and open shared 
+	  libraries and realted functions :
+	  ldfind, ldopen, ldname, get_temp_dir, open_temp_file,
+	  strrepl, strsplit_r.
+
+	  Removes the dependency of DLL, Logging_Strategy and FILE_Addr on
+	  ACE. Effects few other classes too but doesnt remove the
+	  dependency on ACE for those classes.
+	
+	* ace/ACE_Flag_Manip.h  : 	
+	* ace/ACE_Flag_Manip.cpp: 
+	* ace/ACE_Flag_Manip.i  :
+	  
+	  The Flag Manipulation functions: 
+	  set_flags (), clr_flags () and get_flags ().
+
+	  Removes the dependency of IO_SAP and IPC_SAP on ACE.
+
+	* ace/ACE_Init.h  : 
+	* ace/ACE_Init.cpp: 
+	* ace/ACE_Init.i  : 
+
+	  The init () and fini () functions which are used
+	  for the initialization and shutting down of ACE.
+
+	  Removes dependency on Object_Manager.
+	
 Thu Oct 12 15:41:46 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * include/makeinclude/rules.bin.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index c8ce16d4ad5..aab544df710 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,126 @@
+Thu Oct 12 18:19:46 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+	* ace/Makefile: 
+	  Made the corresponding changes.
+
+	* ace/System_Time.cpp: 
+	* ace/UPIPE_Connector.cpp : 
+	* ace/Timer_Queue_T.h : 
+	* ace/Task.cpp : 
+	* ace/POSIX_Asynch_IO.cpp: 
+	* ace/OS.h: 
+	* ace/Memory_Pool.cpp: 
+	* ace/MEM_SAP.h: 
+	* ace/MEM_Acceptor.cpp: 
+	* ace/Logging_Strategy.cpp:
+	* ace/FIFO.h: 
+	* ace/DLL.cpp: 
+	* ace/IO_SAP.h: 
+	* ace/Malloc_T.h : 
+          Cosmetic changes. Ex: Change the included header files to the
+	  new header files and similar changes.
+	
+	* ace/Naming_Context.h: 
+	* ace/Naming_Context.cpp:
+	* ace/Object_Manager.cpp: 
+	  
+	  Removed the dependency of Object_Manager on Naming_Context.
+	
+	* ace/Test_and_Set.h: 
+	* ace/Test_and_Set.cpp: 
+	* ace/Test_and_Set.i: 
+
+	  Moved the class Test_and_Set from Synch_T to here. This helped
+	  remove the dependency on Event_Handler.
+
+	* ace/Service_Templates.h: 
+	* ace/Service_Templates.cpp: 
+	  
+	  Moved the template instantiations from Service_Config.cpp and
+	  Service_Types.cpp since these templates were not needed by the
+	  respective files.
+	
+	* ace/Malloc_Allocator.h :
+	* ace/Malloc_Allocator.cpp: 
+	* ace/Malloc_Allocator.i : 
+
+	* ace/PI_Malloc.h  : 
+	* ace/PI_Malloc.cpp: 
+	* ace/PI_Malloc.i  : 
+	
+	* ace/Malloc.h   : 
+	* ace/Malloc.cpp :
+	* ace/Malloc.i   : 
+
+	  Moved the ACE_PI_Control_Block, ACE_New_Allocator and
+	  ACE_Static_Allocator_Base classes to new files: PI_Malloc and
+	  Malloc_Allocator. 
+	  
+	  This move helps in reduction in size of Malloc.i since the
+	  template instantiations which were included only for
+	  ACE_PI_Control_Block are now moved to the new file: PI_Malloc.
+	  In addition, is the effect of clear and minimized dependencies.
+	
+	* ace/ACE.h   : 
+	* ace/ACE.cpp : 
+	* ace/ACE.i   : 
+
+	  Moved several functions in ACE to new classes to minimize the
+	  dependencies on and by ACE. Each of the following files
+	  have the listed functions.
+	
+	* ace/Malloc_Instantiations.cpp: 
+	  Moved the template instantiations to this file.
+
+	* ace/ACE_Sock_Connect.h   : 
+	* ace/ACE_Sock_Connect.cpp : 
+	* ace/ACE_Sock_Connect.i   :
+
+	  Has the socket connection establishment function calls :
+	  bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces
+	  and get_handle.
+
+	  Helps remove the dependency on INET_Addr.
+	
+	* ace/ACE_Handle_Ops.h: 
+	* ace/ACE_Handle_Ops.cpp: 
+	* ace/ACE_Handle_Ops.i: 
+	  
+	  Has the <handle_timed_open> operation on handles.
+	  Helps remove the dependency of FILE_Connector, SPIPE_COnenctor,
+	  UPIPE_Conenctpr and DEV_Connector on ACE.
+	  
+	* ace/ACE_Lib_Find.h   : 
+	* ace/ACE_Lib_Find.cpp : 
+	* ace/ACE_Lib_Find.i   : 
+
+	  Includes all the functions to search and open shared 
+	  libraries and realted functions :
+	  ldfind, ldopen, ldname, get_temp_dir, open_temp_file,
+	  strrepl, strsplit_r.
+
+	  Removes the dependency of DLL, Logging_Strategy and FILE_Addr on
+	  ACE. Effects few other classes too but doesnt remove the
+	  dependency on ACE for those classes.
+	
+	* ace/ACE_Flag_Manip.h  : 	
+	* ace/ACE_Flag_Manip.cpp: 
+	* ace/ACE_Flag_Manip.i  :
+	  
+	  The Flag Manipulation functions: 
+	  set_flags (), clr_flags () and get_flags ().
+
+	  Removes the dependency of IO_SAP and IPC_SAP on ACE.
+
+	* ace/ACE_Init.h  : 
+	* ace/ACE_Init.cpp: 
+	* ace/ACE_Init.i  : 
+
+	  The init () and fini () functions which are used
+	  for the initialization and shutting down of ACE.
+
+	  Removes dependency on Object_Manager.
+	
 Thu Oct 12 15:41:46 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * include/makeinclude/rules.bin.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index c8ce16d4ad5..aab544df710 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,126 @@
+Thu Oct 12 18:19:46 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+	* ace/Makefile: 
+	  Made the corresponding changes.
+
+	* ace/System_Time.cpp: 
+	* ace/UPIPE_Connector.cpp : 
+	* ace/Timer_Queue_T.h : 
+	* ace/Task.cpp : 
+	* ace/POSIX_Asynch_IO.cpp: 
+	* ace/OS.h: 
+	* ace/Memory_Pool.cpp: 
+	* ace/MEM_SAP.h: 
+	* ace/MEM_Acceptor.cpp: 
+	* ace/Logging_Strategy.cpp:
+	* ace/FIFO.h: 
+	* ace/DLL.cpp: 
+	* ace/IO_SAP.h: 
+	* ace/Malloc_T.h : 
+          Cosmetic changes. Ex: Change the included header files to the
+	  new header files and similar changes.
+	
+	* ace/Naming_Context.h: 
+	* ace/Naming_Context.cpp:
+	* ace/Object_Manager.cpp: 
+	  
+	  Removed the dependency of Object_Manager on Naming_Context.
+	
+	* ace/Test_and_Set.h: 
+	* ace/Test_and_Set.cpp: 
+	* ace/Test_and_Set.i: 
+
+	  Moved the class Test_and_Set from Synch_T to here. This helped
+	  remove the dependency on Event_Handler.
+
+	* ace/Service_Templates.h: 
+	* ace/Service_Templates.cpp: 
+	  
+	  Moved the template instantiations from Service_Config.cpp and
+	  Service_Types.cpp since these templates were not needed by the
+	  respective files.
+	
+	* ace/Malloc_Allocator.h :
+	* ace/Malloc_Allocator.cpp: 
+	* ace/Malloc_Allocator.i : 
+
+	* ace/PI_Malloc.h  : 
+	* ace/PI_Malloc.cpp: 
+	* ace/PI_Malloc.i  : 
+	
+	* ace/Malloc.h   : 
+	* ace/Malloc.cpp :
+	* ace/Malloc.i   : 
+
+	  Moved the ACE_PI_Control_Block, ACE_New_Allocator and
+	  ACE_Static_Allocator_Base classes to new files: PI_Malloc and
+	  Malloc_Allocator. 
+	  
+	  This move helps in reduction in size of Malloc.i since the
+	  template instantiations which were included only for
+	  ACE_PI_Control_Block are now moved to the new file: PI_Malloc.
+	  In addition, is the effect of clear and minimized dependencies.
+	
+	* ace/ACE.h   : 
+	* ace/ACE.cpp : 
+	* ace/ACE.i   : 
+
+	  Moved several functions in ACE to new classes to minimize the
+	  dependencies on and by ACE. Each of the following files
+	  have the listed functions.
+	
+	* ace/Malloc_Instantiations.cpp: 
+	  Moved the template instantiations to this file.
+
+	* ace/ACE_Sock_Connect.h   : 
+	* ace/ACE_Sock_Connect.cpp : 
+	* ace/ACE_Sock_Connect.i   :
+
+	  Has the socket connection establishment function calls :
+	  bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces
+	  and get_handle.
+
+	  Helps remove the dependency on INET_Addr.
+	
+	* ace/ACE_Handle_Ops.h: 
+	* ace/ACE_Handle_Ops.cpp: 
+	* ace/ACE_Handle_Ops.i: 
+	  
+	  Has the <handle_timed_open> operation on handles.
+	  Helps remove the dependency of FILE_Connector, SPIPE_COnenctor,
+	  UPIPE_Conenctpr and DEV_Connector on ACE.
+	  
+	* ace/ACE_Lib_Find.h   : 
+	* ace/ACE_Lib_Find.cpp : 
+	* ace/ACE_Lib_Find.i   : 
+
+	  Includes all the functions to search and open shared 
+	  libraries and realted functions :
+	  ldfind, ldopen, ldname, get_temp_dir, open_temp_file,
+	  strrepl, strsplit_r.
+
+	  Removes the dependency of DLL, Logging_Strategy and FILE_Addr on
+	  ACE. Effects few other classes too but doesnt remove the
+	  dependency on ACE for those classes.
+	
+	* ace/ACE_Flag_Manip.h  : 	
+	* ace/ACE_Flag_Manip.cpp: 
+	* ace/ACE_Flag_Manip.i  :
+	  
+	  The Flag Manipulation functions: 
+	  set_flags (), clr_flags () and get_flags ().
+
+	  Removes the dependency of IO_SAP and IPC_SAP on ACE.
+
+	* ace/ACE_Init.h  : 
+	* ace/ACE_Init.cpp: 
+	* ace/ACE_Init.i  : 
+
+	  The init () and fini () functions which are used
+	  for the initialization and shutting down of ACE.
+
+	  Removes dependency on Object_Manager.
+	
 Thu Oct 12 15:41:46 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * include/makeinclude/rules.bin.GNU:
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 0a43eaa9e49..c18c1a1415d 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -3,8 +3,6 @@
 #include "ace/ACE.h"
 #include "ace/Handle_Set.h"
 #include "ace/Auto_Ptr.h"
-#include "ace/INET_Addr.h"
-#include "ace/Object_Manager.h"
 #include "ace/SString.h"
 #include "ace/Version.h"
 #include "ace/Message_Block.h"
@@ -17,7 +15,6 @@
 ACE_RCSID(ace, ACE, "$Id$")
 
   // Static data members.
-  u_int ACE::init_fini_count_ = 0;
 
 // Keeps track of whether we're in some global debug mode.
 char ACE::debug_ = 0;
@@ -66,37 +63,6 @@ ACE::out_of_handles (int error)
     return 0;
 }
 
-int
-ACE::init (void)
-{
-  // Don't use ACE_TRACE, because Object_Manager might not have been
-  // instantiated yet.
-  // ACE_TRACE ("ACE::init");
-
-  ++init_fini_count_;
-
-  return ACE_Object_Manager::instance ()->init ();
-}
-
-int
-ACE::fini (void)
-{
-  ACE_TRACE ("ACE::fini");
-
-  if (init_fini_count_ > 0)
-    {
-      if (--init_fini_count_ == 0)
-        return ACE_Object_Manager::instance ()->fini ();
-      else
-        // Wait for remaining fini () calls.
-        return 1;
-    }
-  else
-    // More ACE::fini () calls than ACE::init () calls.  Bad
-    // application!
-    return -1;
-}
-
 u_int
 ACE::major_version (void)
 {
@@ -240,77 +206,6 @@ ACE::process_active (pid_t pid)
 #endif /* ACE_HAS_PACE */
 }
 
-// Split a string up into 'token'-delimited pieces, ala Perl's
-// "split".
-
-char *
-ACE::strsplit_r (char *str,
-                 const char *token,
-                 char *&next_start)
-{
-  char *result = 0;
-
-  if (str != 0)
-    next_start = str;
-
-  if (next_start != 0)
-    {
-      char *tok_loc = ACE_OS::strstr (next_start, token);
-
-      if (tok_loc != 0)
-        {
-          // Return the beginning of the string.
-          result = next_start;
-
-          // Insure it's terminated.
-          *tok_loc = '\0';
-          next_start = tok_loc + ACE_OS::strlen (token);
-        }
-      else
-        {
-          result = next_start;
-          next_start = (char *) 0;
-        }
-    }
-
-  return result;
-}
-
-#if defined (ACE_HAS_WCHAR)
-wchar_t *
-ACE::strsplit_r (wchar_t *str,
-                 const wchar_t *token,
-                 wchar_t *&next_start)
-{
-  wchar_t *result = 0;
-
-  if (str != 0)
-    next_start = str;
-
-  if (next_start != 0)
-    {
-      wchar_t *tok_loc = ACE_OS::strstr (next_start, token);
-
-      if (tok_loc != 0)
-        {
-          // Return the beginning of the string.
-          result = next_start;
-
-          // Insure it's terminated.
-          *tok_loc = '\0';
-          next_start = tok_loc + ACE_OS::strlen (token);
-        }
-      else
-        {
-          result = next_start;
-          next_start = (wchar_t *) 0;
-        }
-    }
-
-  return result;
-}
-#endif
-
 const ACE_TCHAR *
 ACE::execname (const ACE_TCHAR *old_name)
 {
@@ -548,23 +443,6 @@ ACE::crc32 (const char *buffer, ACE_UINT32 len)
 
 #undef COMPUTE
 
-size_t
-ACE::strrepl (char *s, char search, char replace)
-{
-  ACE_TRACE ("ACE::strrepl");
-
-  size_t replaced = 0;
-
-  for (size_t i = 0; s[i] != '\0'; i++)
-    if (s[i] == search)
-      {
-        s[i] = replace;
-        replaced++;
-      }
-
-  return replaced;
-}
-
 #if defined (ACE_HAS_WCHAR)
 size_t
 ACE::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
@@ -612,445 +490,6 @@ netsvc.so            netsvc.so + warning   libnetsvc.so
 
 */
 
-#if ! defined (ACE_PSOS_DIAB_MIPS)
-int
-ACE::ldfind (const ACE_TCHAR filename[],
-             ACE_TCHAR pathname[],
-             size_t maxpathnamelen)
-{
-  ACE_TRACE ("ACE::ldfind");
-
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \
-    !defined (ACE_HAS_PHARLAP)
-  ACE_TCHAR expanded_filename[MAXPATHLEN];
-  if (ACE_TEXT_ExpandEnvironmentStrings (filename,
-                                         expanded_filename,
-                                         sizeof expanded_filename
-                                         / sizeof (ACE_TCHAR)))
-    filename = expanded_filename;
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */
-
-  ACE_TCHAR tempcopy[MAXPATHLEN + 1];
-  ACE_TCHAR searchpathname[MAXPATHLEN + 1];
-  ACE_TCHAR searchfilename[MAXPATHLEN + 2];
-
-  // Create a copy of filename to work with.
-  if (ACE_OS::strlen (filename) + 1
-      > (sizeof tempcopy / sizeof (ACE_TCHAR)))
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-  else
-    ACE_OS::strcpy (tempcopy, filename);
-
-  // Insert canonical directory separators.
-  ACE_TCHAR *separator_ptr;
-
-#if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
-  // Make all the directory separators "canonical" to simplify
-  // subsequent code.
-  ACE::strrepl (tempcopy, ACE_DIRECTORY_SEPARATOR_CHAR, '/');
-#endif /* ACE_DIRECTORY_SEPARATOR_CHAR */
-
-  // Separate filename from pathname.
-  separator_ptr = ACE_OS::strrchr (tempcopy, '/');
-
-  // This is a relative path.
-  if (separator_ptr == 0)
-    {
-      searchpathname[0] = '\0';
-      ACE_OS::strcpy (searchfilename, tempcopy);
-    }
-  else // This is an absolute path.
-    {
-      ACE_OS::strcpy (searchfilename, separator_ptr + 1);
-      separator_ptr[1] = '\0';
-      ACE_OS::strcpy (searchpathname, tempcopy);
-    }
-
-  int got_suffix = 0;
-
-  // Check to see if this has an appropriate DLL suffix for the OS
-  // platform.
-  ACE_TCHAR *s = ACE_OS::strrchr (searchfilename, '.');
-
-  const ACE_TCHAR *dll_suffix = ACE_DLL_SUFFIX;
-
-  if (s != 0)
-    {
-      // If we have a dot, we have a suffix
-      got_suffix = 1;
-
-      // Check whether this matches the appropriate platform-specific
-      // suffix.
-      if (ACE_OS::strcmp (s, dll_suffix) != 0)
-        {
-          ACE_ERROR ((LM_WARNING,
-                      ACE_LIB_TEXT ("Warning: improper suffix for a ")
-                      ACE_LIB_TEXT ("shared library on this platform: %s\n"),
-                      s));
-        }
-    }
-
-  // Make sure we've got enough space in searchfilename.
-  if (ACE_OS::strlen (searchfilename)
-      + ACE_OS::strlen (ACE_DLL_PREFIX)
-      + got_suffix ? 0 : ACE_OS::strlen (dll_suffix) >= (sizeof searchfilename /
-                                                         sizeof (ACE_TCHAR)))
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-#if defined (ACE_WIN32) && defined (_DEBUG) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-  size_t len_searchfilename = ACE_OS::strlen (searchfilename);
-  if (! got_suffix)
-    {
-      searchfilename [len_searchfilename] = 'd';
-      searchfilename [len_searchfilename+1] = 0;
-    }
-
-  for (int tag = 1; tag >= 0; tag --)
-    {
-      if (tag == 0)
-        searchfilename [len_searchfilename] = 0;
-
-#endif /* ACE_WIN32 && _DEBUG && !ACE_DISABLE_DEBUG_DLL_CHECK */
-      // Use absolute pathname if there is one.
-      if (ACE_OS::strlen (searchpathname) > 0)
-        {
-          if (ACE_OS::strlen (searchfilename)
-              + ACE_OS::strlen (searchpathname) >= maxpathnamelen)
-            {
-              errno = ENOMEM;
-              return -1;
-            }
-          else
-            {
-#if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
-              // Revert to native path name separators.
-              ACE::strrepl (searchpathname,
-                            '/',
-                            ACE_DIRECTORY_SEPARATOR_CHAR);
-#endif /* ACE_DIRECTORY_SEPARATOR_CHAR */
-              // First, try matching the filename *without* adding a
-              // prefix.
-#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
-              ACE_OS::sprintf (pathname,
-                               ACE_LIB_TEXT ("%s%s%s"),
-                               searchpathname,
-                               searchfilename,
-                               got_suffix ? ACE_static_cast (ACE_TCHAR *,
-                                                             ACE_LIB_TEXT (""))
-                               : ACE_static_cast (ACE_TCHAR *,
-                                                  dll_suffix));
-#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-              ACE_OS::sprintf (pathname,
-                               ACE_LIB_TEXT ("%s%s%s"),
-                               searchpathname,
-                               searchfilename,
-                               got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
-#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-              if (ACE_OS::access (pathname, F_OK) == 0)
-                return 0;
-
-              // Second, try matching the filename *with* adding a prefix.
-#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
-              ACE_OS::sprintf (pathname,
-                               ACE_LIB_TEXT ("%s%s%s%s"),
-                               searchpathname,
-                               ACE_DLL_PREFIX,
-                               searchfilename,
-                               got_suffix ? ACE_static_cast (ACE_TCHAR *,
-                                                             ACE_LIB_TEXT (""))
-                               : ACE_static_cast (ACE_TCHAR *,
-                                                  dll_suffix));
-#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-              ACE_OS::sprintf (pathname,
-                               ACE_LIB_TEXT ("%s%s%s%s"),
-                               searchpathname,
-                               ACE_DLL_PREFIX,
-                               searchfilename,
-                               got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
-#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-              if (ACE_OS::access (pathname, F_OK) == 0)
-                return 0;
-            }
-        }
-
-      // Use relative filenames via LD_LIBRARY_PATH or PATH (depending on
-      // OS platform).
-      else
-        {
-          ACE_TCHAR *ld_path =
-#if defined ACE_DEFAULT_LD_SEARCH_PATH
-            ACE_DEFAULT_LD_SEARCH_PATH;
-#else
-            ACE_OS::getenv (ACE_LD_SEARCH_PATH);
-#endif /* ACE_DEFAULT_LD_SEARCH_PATH */
-
-#if defined (ACE_WIN32)
-          ACE_TCHAR *ld_path_temp = 0;
-          if (ld_path != 0)
-            {
-              ld_path_temp = (ACE_TCHAR *) ACE_OS::malloc ((ACE_OS::strlen (ld_path) + 2)
-                                                           * sizeof (ACE_TCHAR));
-              if (ld_path_temp != 0)
-                {
-                  ACE_OS::strcpy (ld_path_temp, ACE_LD_SEARCH_PATH_SEPARATOR_STR);
-                  ACE_OS::strcat (ld_path_temp, ld_path);
-                  ld_path = ld_path_temp;
-                }
-              else
-                {
-                  ACE_OS::free ((void *) ld_path_temp);
-                  ld_path = ld_path_temp = 0;
-                }
-            }
-#endif /* ACE_WIN32 */
-
-          if (ld_path != 0
-              && (ld_path = ACE_OS::strdup (ld_path)) != 0)
-            {
-              // strtok has the strange behavior of not separating the
-              // string ":/foo:/bar" into THREE tokens.  One would expect
-              // that the first iteration the token would be an empty
-              // string, the second iteration would be "/foo", and the
-              // third iteration would be "/bar".  However, this is not
-              // the case; one only gets two iterations: "/foo" followed
-              // by "/bar".
-
-              // This is especially a problem in parsing Unix paths
-              // because it is permissible to specify 'the current
-              // directory' as an empty entry.  So, we introduce the
-              // following special code to cope with this:
-
-              // Look at each dynamic lib directory in the search path.
-
-              ACE_TCHAR *nextholder = 0;
-              const ACE_TCHAR *path_entry =
-                ACE::strsplit_r (ld_path,
-                                 ACE_LD_SEARCH_PATH_SEPARATOR_STR,
-                                 nextholder);
-              int result = 0;
-
-              for (;;)
-                {
-                  // Check if at end of search path.
-                  if (path_entry == 0)
-                    {
-                      errno = ENOENT;
-                      result = -1;
-                      break;
-                    }
-                  else if (ACE_OS::strlen (path_entry)
-                           + 1
-                           + ACE_OS::strlen (searchfilename)
-                           >= maxpathnamelen)
-                    {
-                      errno = ENOMEM;
-                      result = -1;
-                      break;
-                    }
-                  // This works around the issue where a path might have
-                  // an empty component indicating 'current directory'.
-                  // We need to do it here rather than anywhere else so
-                  // that the loop condition will still work.
-                  else if (path_entry[0] == '\0')
-                    path_entry = ACE_LIB_TEXT (".");
-
-                  // First, try matching the filename *without* adding a
-                  // prefix.
-#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
-                  ACE_OS::sprintf (pathname,
-                                   ACE_LIB_TEXT ("%s%c%s%s"),
-                                   path_entry,
-                                   ACE_DIRECTORY_SEPARATOR_CHAR,
-                                   searchfilename,
-                                   got_suffix ? ACE_static_cast (ACE_TCHAR *,
-                                                                 ACE_LIB_TEXT (""))
-                                   : ACE_static_cast (ACE_TCHAR *,
-                                                      dll_suffix));
-#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-                  ACE_OS::sprintf (pathname,
-                                   ACE_LIB_TEXT ("%s%c%s%s"),
-                                   path_entry,
-                                   ACE_DIRECTORY_SEPARATOR_CHAR,
-                                   searchfilename,
-                                   got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
-#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-                  if (ACE_OS::access (pathname, F_OK) == 0)
-                    break;
-
-                  // Second, try matching the filename *with* adding a
-                  // prefix.
-#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
-                  ACE_OS::sprintf (pathname,
-                                   ACE_LIB_TEXT ("%s%c%s%s%s"),
-                                   path_entry,
-                                   ACE_DIRECTORY_SEPARATOR_CHAR,
-                                   ACE_DLL_PREFIX,
-                                   searchfilename,
-                                   got_suffix ? ACE_static_cast (ACE_TCHAR *,
-                                                                 ACE_LIB_TEXT (""))
-                                   : ACE_static_cast (ACE_TCHAR *,
-                                                      dll_suffix));
-#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-                  ACE_OS::sprintf (pathname,
-                                   ACE_LIB_TEXT ("%s%c%s%s%s"),
-                                   path_entry,
-                                   ACE_DIRECTORY_SEPARATOR_CHAR,
-                                   ACE_DLL_PREFIX,
-                                   searchfilename,
-                                   got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
-#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
-                  if (ACE_OS::access (pathname, F_OK) == 0)
-                    break;
-
-                  // Fetch the next item in the path
-                  path_entry = ACE::strsplit_r (0,
-                                                ACE_LD_SEARCH_PATH_SEPARATOR_STR,
-                                                nextholder);
-                }
-
-#if defined (ACE_WIN32)
-              if (ld_path_temp != 0)
-                ACE_OS::free (ld_path_temp);
-#endif /* ACE_WIN32 */
-              ACE_OS::free ((void *) ld_path);
-#if defined (ACE_WIN32) && defined (_DEBUG) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-              if (result == 0 || tag == 0)
-#endif /* ACE_WIN32 && _DEBUG && !ACE_DISABLE_DEBUG_DLL_CHECK */
-                return result;
-            }
-        }
-#if defined (ACE_WIN32) && defined (_DEBUG) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    }
-#endif /* ACE_WIN32 && _DEBUG && !ACE_DISABLE_DEBUG_DLL_CHECK */
-
-  errno = ENOENT;
-  return -1;
-}
-
-FILE *
-ACE::ldopen (const ACE_TCHAR *filename,
-             const ACE_TCHAR *type)
-{
-  ACE_TRACE ("ACE::ldopen");
-
-  ACE_TCHAR buf[MAXPATHLEN + 1];
-  if (ACE::ldfind (filename,
-                   buf,
-                   sizeof (buf) /sizeof (ACE_TCHAR)) == -1)
-    return 0;
-  else
-    return ACE_OS::fopen (buf, type);
-}
-
-ACE_TCHAR *
-ACE::ldname (const ACE_TCHAR *entry_point)
-{
-  ACE_TRACE ("ACE::ldname");
-
-#if defined (__BORLANDC__)
-  size_t size =
-    1 // leading '_'
-    + ACE_OS::strlen (entry_point)
-    + 1;
-
-  ACE_TCHAR *new_name;
-  ACE_NEW_RETURN (new_name,
-                  ACE_TCHAR[size],
-                  0);
-
-  ACE_OS::strcpy (new_name, ACE_LIB_TEXT ("_"));
-  ACE_OS::strcat (new_name, entry_point);
-
-  return new_name;
-#else /* __BORLANDC__ */
-  size_t size =
-    ACE_OS::strlen (entry_point)
-    + 1;
-
-  ACE_TCHAR *new_name;
-  ACE_NEW_RETURN (new_name,
-                  ACE_TCHAR[size],
-                  0);
-
-  ACE_OS::strcpy (new_name, entry_point);
-
-  return new_name;
-#endif /* __BORLANDC__ */
-}
-
-int
-ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
-{
-  int result;
-#if defined (ACE_WIN32)
-  result = ACE_TEXT_GetTempPath (buffer_len, buffer);
-
-  // Make sure to return -1 if there is an error
-  if (result == 0 && ::GetLastError () != ERROR_SUCCESS
-      || result > ACE_static_cast (int, buffer_len))
-    result = -1;
-
-#else /* ACE_WIN32 */
-
-  // On non-win32 platforms, check to see what the TMPDIR environment
-  // variable is defined to be.  If it doesn't exist, just use /tmp
-  const ACE_TCHAR *tmpdir = ACE_OS::getenv (ACE_LIB_TEXT ("TMPDIR"));
-
-  if (tmpdir == NULL)
-    tmpdir = ACE_LIB_TEXT ("/tmp");
-
-  size_t len = ACE_OS::strlen (tmpdir);
-
-  // Check to see if the buffer is large enough for the string,
-  // another /, and its null character (hence the + 2)
-  if ((len + 2) > buffer_len)
-    {
-      result = -1;
-    }
-  else
-    {
-      ACE_OS::strcpy (buffer, tmpdir);
-
-      // Add a trailing slash because we cannot assume there is already one
-      // at the end.  And having an extra one should not cause problems.
-      buffer[len] = '/';
-      buffer[len + 1] = 0;
-      result = 0;
-    }
-#endif /* ACE_WIN32 */
-  return result;
-}
-
-ACE_HANDLE
-ACE::open_temp_file (const ACE_TCHAR *name, int mode, int perm)
-{
-#if defined (ACE_WIN32)
-  return ACE_OS::open (name,
-                       mode | _O_TEMPORARY);
-#else
-  // Open it.
-  ACE_HANDLE handle = ACE_OS::open (name, mode, perm);
-
-  if (handle == ACE_INVALID_HANDLE)
-    return ACE_INVALID_HANDLE;
-
-  // Unlink it so that the file will be removed automatically when the
-  // process goes away.
-  if (ACE_OS::unlink (name) == -1)
-    return -1;
-  else
-    // Return the handle.
-    return handle;
-#endif /* ACE_WIN32 */
-}
-#endif /* ! ACE_PSOS_DIAB_MIPS */
-
 const ACE_TCHAR *
 ACE::basename (const ACE_TCHAR *pathname, ACE_TCHAR delim)
 {
@@ -3185,32 +2624,6 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   return h;
 }
 
-ACE_HANDLE
-ACE::handle_timed_open (ACE_Time_Value *timeout,
-                        const ACE_TCHAR *name,
-                        int flags,
-                        int perms)
-{
-  ACE_TRACE ("ACE::handle_timed_open");
-
-  if (timeout != 0)
-    {
-      // Open the named pipe or file using non-blocking mode...
-      ACE_HANDLE handle = ACE_OS::open (name,
-                                        flags | ACE_NONBLOCK,
-                                        perms);
-      if (handle == ACE_INVALID_HANDLE
-          && (errno == EWOULDBLOCK
-              && (timeout->sec () > 0 || timeout->usec () > 0)))
-        // This expression checks if we were polling.
-        errno = ETIMEDOUT;
-
-      return handle;
-    }
-  else
-    return ACE_OS::open (name, flags, perms);
-}
-
 // Wait up to <timeout> amount of time to accept a connection.
 
 int
@@ -3280,70 +2693,6 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
   ACE_NOTREACHED (return 0);
 }
 
-// Bind socket to an unused port.
-
-int
-ACE::bind_port (ACE_HANDLE handle,
-                ACE_UINT32 ip_addr)
-{
-  ACE_TRACE ("ACE::bind_port");
-
-  sockaddr_in sock_addr;
-
-  ACE_OS::memset ((void *) &sock_addr, 0, sizeof sock_addr);
-  sock_addr.sin_family = AF_INET;
-#if defined (ACE_HAS_SIN_LEN)
-  sock_addr.sin_len = sizeof sock_addr;
-#endif /* ACE_HAS_SIN_LEN */
-  sock_addr.sin_addr.s_addr = ip_addr;
-
-#if !defined (ACE_LACKS_WILDCARD_BIND)
-  // The OS kernel should select a free port for us.
-  sock_addr.sin_port = 0;
-  return ACE_OS::bind (handle,
-                       ACE_reinterpret_cast(sockaddr *, &sock_addr),
-                       sizeof sock_addr);
-#else
-  static u_short upper_limit = ACE_MAX_DEFAULT_PORT;
-  int round_trip = upper_limit;
-  int lower_limit = IPPORT_RESERVED;
-
-  // We have to select the port explicitly.
-
-  for (;;)
-    {
-      sock_addr.sin_port = htons (upper_limit);
-
-      if (ACE_OS::bind (handle,
-                        ACE_reinterpret_cast(sockaddr *, &sock_addr),
-                        sizeof sock_addr) >= 0)
-        {
-#if defined (ACE_WIN32)
-          upper_limit--;
-#endif /* ACE_WIN32 */
-          return 0;
-        }
-      else if (errno != EADDRINUSE)
-        return -1;
-      else
-        {
-          upper_limit--;
-
-          // Wrap back around when we reach the bottom.
-          if (upper_limit <= lower_limit)
-            upper_limit = ACE_MAX_DEFAULT_PORT;
-
-          // See if we have already gone around once!
-          if (upper_limit == round_trip)
-            {
-              errno = EAGAIN;
-              return -1;
-            }
-        }
-    }
-#endif /* ACE_HAS_WILDCARD_BIND */
-}
-
 // Make the current process a UNIX daemon.  This is based on Stevens
 // code from APUE.
 
@@ -3539,77 +2888,6 @@ ACE::set_handle_limit (int new_limit)
   ACE_NOTREACHED (return 0);
 }
 
-// Flags are file status flags to turn on.
-
-int
-ACE::set_flags (ACE_HANDLE handle, int flags)
-{
-  ACE_TRACE ("ACE::set_flags");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
-  switch (flags)
-    {
-    case ACE_NONBLOCK:
-      // nonblocking argument (1)
-      // blocking:            (0)
-      {
-        u_long nonblock = 1;
-        return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
-      }
-    default:
-      ACE_NOTSUP_RETURN (-1);
-    }
-#else
-  int val = ACE_OS::fcntl (handle, F_GETFL, 0);
-
-  if (val == -1)
-    return -1;
-
-  // Turn on flags.
-  ACE_SET_BITS (val, flags);
-
-  if (ACE_OS::fcntl (handle, F_SETFL, val) == -1)
-    return -1;
-  else
-    return 0;
-#endif /* ACE_WIN32 || ACE_LACKS_FCNTL */
-}
-
-// Flags are the file status flags to turn off.
-
-int
-ACE::clr_flags (ACE_HANDLE handle, int flags)
-{
-  ACE_TRACE ("ACE::clr_flags");
-
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
-  switch (flags)
-    {
-    case ACE_NONBLOCK:
-      // nonblocking argument (1)
-      // blocking:            (0)
-      {
-        u_long nonblock = 0;
-        return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
-      }
-    default:
-      ACE_NOTSUP_RETURN (-1);
-    }
-#else
-  int val = ACE_OS::fcntl (handle, F_GETFL, 0);
-
-  if (val == -1)
-    return -1;
-
-  // Turn flags off.
-  ACE_CLR_BITS (val, flags);
-
-  if (ACE_OS::fcntl (handle, F_SETFL, val) == -1)
-    return -1;
-  else
-    return 0;
-#endif /* ACE_WIN32 || ACE_LACKS_FCNTL */
-}
-
 int
 ACE::map_errno (int error)
 {
@@ -3805,306 +3083,6 @@ ACE::sock_error (int error)
 #endif /* ACE_WIN32 */
 }
 
-int
-ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
-                     const ACE_TCHAR *host_name,
-                     ACE_UINT32 host_addr,
-                     ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE::get_bcast_addr");
-
-#if !defined(ACE_WIN32)
-  ACE_HANDLE s = handle;
-
-  if (s == ACE_INVALID_HANDLE)
-    s = ACE_OS::socket (AF_INET, SOCK_STREAM, 0);
-
-  if (s == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("ACE_OS::socket")),
-                      -1);
-
-  struct ifconf ifc;
-  char buf[BUFSIZ];
-
-  ifc.ifc_len = sizeof buf;
-  ifc.ifc_buf = buf;
-
-  // Get interface structure and initialize the addresses using UNIX
-  // techniques
-#if defined (AIX)
-  int cmd = CSIOCGIFCONF;
-#else
-  int cmd = SIOCGIFCONF;
-#endif /* AIX */
-  if (ACE_OS::ioctl (s, cmd, (char *) &ifc) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("ACE::get_bcast_addr:")
-                       ACE_LIB_TEXT ("ioctl (get interface configuration)")),
-                      -1);
-
-  struct ifreq *ifr = ifc.ifc_req;
-
-  struct sockaddr_in ip_addr;
-
-  // Get host ip address if necessary.
-  if (host_name)
-    {
-      hostent *hp = ACE_OS::gethostbyname (host_name);
-
-      if (hp == 0)
-        return -1;
-      else
-#if !defined(_UNICOS)
-        ACE_OS::memcpy ((char *) &ip_addr.sin_addr.s_addr,
-                        (char *) hp->h_addr,
-                        hp->h_length);
-#else /* _UNICOS */
-      {
-        ACE_UINT64 haddr;  // a place to put the address
-        char * haddrp = (char *) &haddr;  // convert to char pointer
-        ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length);
-        ip_addr.sin_addr.s_addr = haddr;
-      }
-#endif /* ! _UNICOS */
-    }
-  else
-    {
-      ACE_OS::memset ((void *) &ip_addr, 0, sizeof ip_addr);
-#if !defined(_UNICOS)
-      ACE_OS::memcpy ((void *) &ip_addr.sin_addr,
-                      (void*) &host_addr,
-                      sizeof ip_addr.sin_addr);
-#else /* _UNICOS */
-      ip_addr.sin_addr.s_addr = host_addr;   // just copy to the bitfield
-#endif /* ! _UNICOS */
-    }
-
-  for (int n = ifc.ifc_len / sizeof (struct ifreq);
-       n > 0;
-#if !defined(CHORUS_4)
-       n--, ifr++)
-#else
-       n--,
-           ((ifr->ifr_addr.sa_len <= sizeof (struct sockaddr)) ?
-             ifr++ :
-             ifr = (struct ifreq *)
-             (ifr->ifr_addr.sa_len + (caddr_t) &ifr->ifr_addr)))
-#endif /* CHORUS_4 */
-    {
-      struct sockaddr_in if_addr;
-
-      // Compare host ip address with interface ip address.
-      ACE_OS::memcpy (&if_addr,
-                      &ifr->ifr_addr,
-                      sizeof if_addr);
-
-      if (ip_addr.sin_addr.s_addr != if_addr.sin_addr.s_addr)
-        continue;
-
-      if (ifr->ifr_addr.sa_family != AF_INET)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE::get_bcast_addr:")
-                      ACE_LIB_TEXT ("Not AF_INET")));
-          continue;
-        }
-
-      struct ifreq flags = *ifr;
-      struct ifreq if_req = *ifr;
-
-      if (ACE_OS::ioctl (s, SIOCGIFFLAGS, (char *) &flags) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE::get_bcast_addr:")
-                      ACE_LIB_TEXT (" ioctl (get interface flags)")));
-          continue;
-        }
-
-      if (ACE_BIT_DISABLED (flags.ifr_flags, IFF_UP))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE::get_bcast_addr:")
-                      ACE_LIB_TEXT ("Network interface is not up")));
-          continue;
-        }
-
-      if (ACE_BIT_ENABLED (flags.ifr_flags, IFF_LOOPBACK))
-        continue;
-
-      if (ACE_BIT_ENABLED (flags.ifr_flags, IFF_BROADCAST))
-        {
-          if (ACE_OS::ioctl (s,
-                             SIOCGIFBRDADDR,
-                             (char *) &if_req) == -1)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_LIB_TEXT ("%p\n"),
-                        ACE_LIB_TEXT ("ACE::get_bcast_addr:")
-                        ACE_LIB_TEXT ("ioctl (get broadaddr)")));
-          else
-            {
-              ACE_OS::memcpy (ACE_reinterpret_cast(sockaddr_in *, &ip_addr),
-                              ACE_reinterpret_cast(sockaddr_in *, &if_req.ifr_broadaddr),
-                              sizeof if_req.ifr_broadaddr);
-
-              ACE_OS::memcpy ((void *) &host_addr,
-                              (void *) &ip_addr.sin_addr,
-                              sizeof host_addr);
-
-              if (handle == ACE_INVALID_HANDLE)
-                ACE_OS::close (s);
-
-              bcast_addr = host_addr;
-              return 0;
-            }
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("%p\n"),
-                    ACE_LIB_TEXT ("ACE::get_bcast_addr:")
-                    ACE_LIB_TEXT ("Broadcast is not enable for this interface.")));
-
-      if (handle == ACE_INVALID_HANDLE)
-        ACE_OS::close (s);
-
-      bcast_addr = host_addr;
-      return 0;
-    }
-
-  return 0;
-#else
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (host_addr);
-  ACE_UNUSED_ARG (host_name);
-  bcast_addr = (ACE_UINT32 (INADDR_BROADCAST));
-  return 0;
-#endif /* !ACE_WIN32 */
-}
-
-// Helper routine for get_ip_interfaces, differs by UNIX platform so
-// put into own subroutine.  perform some ioctls to retrieve ifconf
-// list of ifreq structs.
-
-int
-ACE::count_interfaces (ACE_HANDLE handle,
-                       size_t &how_many)
-{
-#if defined (sparc) && defined (SIOCGIFNUM)
-  int tmp_how_many; // For 64 bit Solaris
-  if (ACE_OS::ioctl (handle,
-                     SIOCGIFNUM,
-                     (caddr_t) &tmp_how_many) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("ACE::get_ip_interfaces:")
-                       ACE_LIB_TEXT ("ioctl - SIOCGIFNUM failed")),
-                      -1);
-  how_many = (size_t) tmp_how_many;
-  return 0;
-#elif defined (__unix) || defined (__Lynx__) || defined (_AIX)
-  // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
-  // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
-  // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan
-  // algorithm
-
-  // Probably hard to put this many ifs in a unix box..
-  const int MAX_IF = 50;
-
-  // HACK - set to an unreasonable number
-  int num_ifs = MAX_IF;
-
-  struct ifconf ifcfg;
-  size_t ifreq_size = num_ifs * sizeof (struct ifreq);
-  struct ifreq *p_ifs =
-    (struct ifreq *) ACE_OS::malloc (ifreq_size);
-
-  if (!p_ifs)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-  ACE_OS::memset (p_ifs, 0, ifreq_size);
-  ACE_OS::memset (&ifcfg, 0, sizeof (struct ifconf));
-
-  ifcfg.ifc_req = p_ifs;
-  ifcfg.ifc_len = ifreq_size;
-
-#if defined (AIX)
-  int cmd = CSIOCGIFCONF;
-#else
-  int cmd = SIOCGIFCONF;
-#endif /* AIX */
-  if (ACE_OS::ioctl (handle,
-                     cmd,
-                     (caddr_t) &ifcfg) == -1)
-    {
-      ACE_OS::free (ifcfg.ifc_req);
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("count_interfaces:ioctl:")
-                         ACE_LIB_TEXT ("SIOCGIFCONF failed")),
-                        -1);
-    }
-
-  int if_count = 0, i;
-
-  // get if address out of ifreq buffers.  ioctl puts a blank-named
-  // interface to mark the end of the returned interfaces.
-  for (i = 0;
-       i < num_ifs;
-       i++)
-    {
-      if (p_ifs->ifr_name[0] == '\0')
-        break;
-
-      if_count++;
-#if !defined(CHORUS_4)
-      p_ifs++;
-#else
-     if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr))
-       {
-          p_ifs++;
-       }
-       else
-       {
-          p_ifs = (struct ifreq *)
-              (p_ifs->ifr_addr.sa_len + (caddr_t) &p_ifs->ifr_addr);
-       }
-#endif /* CHORUS_4 */
-    }
-
-  ACE_OS::free (ifcfg.ifc_req);
-  how_many = if_count;
-  return 0;
-#else
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (how_many);
-  ACE_NOTSUP_RETURN (-1);; // no implmentation
-#endif /* sparc && SIOCGIFNUM */
-}
-
-// Routine to return a handle from which ioctl() requests can be made.
-
-ACE_HANDLE
-ACE::get_handle (void)
-{
-  // Solaris 2.x
-  ACE_HANDLE handle = ACE_INVALID_HANDLE;
-#if defined (sparc) && ! defined (CHORUS)
-  handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__Lynx__) || defined (_AIX)
-  // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
-  // AIX, SunOS 4.x
-
-  handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0);
-#endif /* sparc */
-  return handle;
-}
-
 #if defined (ACE_WIN32)
 // Return value in buffer for a key/name pair from the Windows
 // Registry up to buf_len size.
@@ -4145,384 +3123,6 @@ get_reg_value (const ACE_TCHAR *key,
 }
 #endif /* ACE_WIN32 */
 
-// return an array of all configured IP interfaces on this host, count
-// rc = 0 on success (count == number of interfaces else -1 caller is
-// responsible for calling delete [] on parray
-
-int
-ACE::get_ip_interfaces (size_t &count,
-                        ACE_INET_Addr *&addrs)
-{
-  ACE_TRACE ("ACE::get_ip_interfaces");
-
-  count = 0;
-  addrs = 0;
-
-#if defined (ACE_WIN32)
-  // Win32 can do this by a simple API call if MSVC 5 or later is the compiler.
-  // Not sure if Borland supplies the needed header/lib, but it might.
-# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-#if 0
-  // If this also needs to be predicated on MSVC 5 or later, add the
-  // following condition to the #if above.  It tests ok at Riverace w/ 4.2,
-  // but this isn't a virgin install of 4.2 so there's a minimal risk that
-  // it may need work later.
-  defined (_MSC_VER) && (_MSC_VER >= 1100)
-#endif /* 0 */
-
-    int i, n_interfaces, status;
-  INTERFACE_INFO info[64];
-  LPINTERFACE_INFO lpii;
-  SOCKET sock;
-
-  // Get an (overlapped) DGRAM socket to test with
-  sock = socket (AF_INET, SOCK_DGRAM, 0);
-  if (sock == INVALID_SOCKET)
-    return -1;
-
-  DWORD bytes;
-  status = WSAIoctl(sock,
-                    SIO_GET_INTERFACE_LIST,
-                    0, 0,
-                    info, sizeof(info),
-                    &bytes,
-                    0,
-                    0);
-  closesocket (sock);
-  if (status == SOCKET_ERROR)
-    return -1;
-
-  n_interfaces = bytes / sizeof(INTERFACE_INFO);
-  if (n_interfaces == 0)
-    return 0;
-
-  ACE_NEW_RETURN (addrs,
-                  ACE_INET_Addr[n_interfaces],
-                  -1);
-
-  // Now go through the list and transfer the good ones to the list of
-  // because they're down or don't have an IP address.
-  for (count = 0, i = 0; i < n_interfaces; i++)
-    {
-      struct sockaddr_in *addrp;
-
-      lpii = &info[i];
-      if (!(lpii->iiFlags & IFF_UP))
-        continue;
-
-      // We assume IPv4 addresses here
-      addrp = ACE_reinterpret_cast(struct sockaddr_in *, &(lpii->iiAddress));
-      if (addrp->sin_addr.s_addr == INADDR_ANY)
-        continue;
-
-      // Set the address for the caller.
-      addrs[count].set(addrp, sizeof(lpii->iiAddress));
-      ++count;
-    }
-
-  if (count == 0)
-    {
-      delete [] addrs;
-      addrs = 0;
-    }
-
-  return 0;
-
-#else /* Winsock 2 && MSVC 5 or later */
-
-  // PharLap ETS has kernel routines to rummage through the device
-  // configs and extract the interface info. Sort of a pain in the
-  // butt, but better than trying to figure out where it moved to in
-  // the registry... :-|
-#  if defined (ACE_HAS_PHARLAP)
-#    if !defined (ACE_HAS_PHARLAP_RT)
-  ACE_NOTSUP_RETURN (-1);
-#    endif /* ACE_HAS_PHARLAP_RT */
-
-  // Locate all of the IP devices in the system, saving a DEVHANDLE
-  // for each. Then allocate the ACE_INET_Addrs needed and fetch all
-  // the IP addresses.  To locate the devices, try the available
-  // device name roots and increment the device number until the
-  // kernel says there are no more of that type.
-  const size_t ACE_MAX_ETS_DEVICES = 64;  // Arbitrary, but should be enough.
-  DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES];
-  EK_TCPIPCFG *devp;
-  size_t i, j;
-  ACE_TCHAR dev_name[16];
-
-  count = 0;
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // Ethernet.
-      ACE_OS::sprintf (dev_name,
-                       "ether%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // SLIP.
-      ACE_OS::sprintf (dev_name,
-                       "sl%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // PPP.
-      ACE_OS::sprintf (dev_name,
-                       "ppp%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-
-  if (count > 0)
-    ACE_NEW_RETURN (addrs,
-                    ACE_INET_Addr[count],
-                    -1);
-  else
-    addrs = 0;
-
-  for (i = 0, j = 0; i < count; i++)
-    {
-      devp = EtsTCPGetDeviceCfg (ip_dev[i]);
-      if (devp != 0)
-        {
-          addrs[j].set (0,
-                        devp->nwIPAddress,
-                        0); // Already in net order.
-          j++;
-        }
-      // There's no call to close the DEVHANDLE.
-    }
-
-  count = j;
-  if (count == 0 && addrs != 0)
-    {
-      delete [] addrs;
-      addrs = 0;
-    }
-
-  return 0;
-
-#  else /* ACE_HAS_PHARLAP */
-
-  const ACE_TCHAR *SVCS_KEY1 =
-    ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\");
-  const ACE_TCHAR *LINKAGE_KEY1 =
-    ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage");
-  const ACE_TCHAR *TCP_PARAM_SUBKEY = ACE_LIB_TEXT ("\\Parameters\\Tcpip");
-  const ACE_TCHAR *BIND_NAME_ID =  ACE_LIB_TEXT ("Bind");
-  const ACE_TCHAR *IPADDR_NAME_ID = ACE_LIB_TEXT ("IPAddress");
-  const ACE_TCHAR *INVALID_TCPIP_DEVICE_ADDR = ACE_LIB_TEXT ("0.0.0.0");
-
-  ACE_TCHAR raw_buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
-  DWORD raw_buflen = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
-  ACE_TCHAR buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
-  DWORD buf_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
-
-  if (::get_reg_value (LINKAGE_KEY1,
-                       BIND_NAME_ID,
-                       raw_buffer,
-                       raw_buflen))
-    return -1;
-  // return buffer contains 0 delimited strings
-
-  ACE_Tokenizer dev_names (raw_buffer);
-  dev_names.delimiter (ACE_LIB_TEXT ('\0'));
-  int n_interfaces = 0;
-
-  // Count the number of interfaces
-  while (dev_names.next () != 0)
-    n_interfaces ++;
-
-  // case 1. no interfaces present, empty string? OS version change?
-  if (n_interfaces == 0)
-    return 0;
-
-  ACE_NEW_RETURN (addrs,
-                  ACE_INET_Addr[n_interfaces],
-                  -2);
-  count = 0;
-  for (int i = 0; i < n_interfaces; i++)
-    {
-      // a. construct name to access IPAddress for this interface
-      ACE_TString ifdevkey (SVCS_KEY1);
-      ACE_TString the_dev = dev_names.next ();
-
-      // chop off the "\Device" and keep last name.
-      if (the_dev.length() < 8)
-        return -3;              // Something's wrong
-      else
-        {
-          // rest of string from offset 8
-          the_dev = the_dev.substring (8);
-          ifdevkey += the_dev;
-          ifdevkey += TCP_PARAM_SUBKEY;
-
-          // b. extract value
-          // Gets overwritten on each call
-          buf_len = sizeof(buffer);
-          if (get_reg_value (ifdevkey.fast_rep (),
-                             IPADDR_NAME_ID,
-                             buffer,
-                             buf_len))
-            return -4;
-
-          if (ACE_OS::strcmp (buffer,
-                              INVALID_TCPIP_DEVICE_ADDR) == 0)
-            continue; // Don't count this device
-
-          // c. store in hostinfo object array and up the counter
-          addrs[count++] =
-            ACE_INET_Addr ((u_short) 0, buffer);
-        }
-    }
-  return 0;
-#  endif /* ACE_HAS_PHARLAP */
-# endif /* Winsock 2 && MSVC 5 or later */
-
-#elif defined (__unix) || defined (__Lynx__) || defined (_AIX)
-  // COMMON (SVR4 and BSD) UNIX CODE
-
-  size_t num_ifs;
-
-  // Call specific routine as necessary.
-  ACE_HANDLE handle = get_handle();
-
-  if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")),
-                      -1);
-  if (ACE::count_interfaces (handle, num_ifs))
-    {
-      ACE_OS::close (handle);
-      return -1;
-    }
-
-  // ioctl likes to have an extra ifreq structure to mark the end of
-  // what it returned, so increase the num_ifs by one.
-  ++num_ifs;
-
-  struct ifreq *ifs = 0;
-  ACE_NEW_RETURN (ifs,
-                  struct ifreq[num_ifs],
-                  -1);
-  ACE_OS::memset (ifs, 0, num_ifs * sizeof (struct ifreq));
-
-  ACE_Auto_Array_Ptr<struct ifreq> p_ifs (ifs);
-
-  if (p_ifs.get() == 0)
-    {
-      ACE_OS::close (handle);
-      errno = ENOMEM;
-      return -1;
-    }
-
-  struct ifconf ifcfg;
-  ACE_OS::memset (&ifcfg, 0, sizeof (struct ifconf));
-  ifcfg.ifc_req = p_ifs.get ();
-  ifcfg.ifc_len = num_ifs * sizeof (struct ifreq);
-
-#if defined (AIX)
-  int cmd = CSIOCGIFCONF;
-#else
-  int cmd = SIOCGIFCONF;
-#endif /* AIX */
-  if (ACE_OS::ioctl (handle,
-                     cmd,
-                     (caddr_t) &ifcfg) == -1)
-    {
-      ACE_OS::close (handle);
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("%p\n"),
-                         ACE_LIB_TEXT ("is_address_local:")
-                         ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")),
-                        -1);
-    }
-
-  ACE_OS::close (handle);
-
-  // Now create and initialize output array.
-
-  ACE_NEW_RETURN (addrs,
-                  ACE_INET_Addr[num_ifs],
-                  -1); // caller must free
-
-  struct ifreq *pcur = p_ifs.get ();
-  // Pull the address out of each INET interface.  Not every interface
-  // is for IP, so be careful to count properly.  When setting the
-  // INET_Addr, note that the 3rd arg (0) says to leave the byte order
-  // (already in net byte order from the interface structure) as is.
-  count = 0;
-
-  for (size_t i = 0;
-       i < num_ifs;
-       i++)
-    {
-      if (pcur->ifr_addr.sa_family == AF_INET)
-        {
-#if !defined(_UNICOS)
-          struct sockaddr_in *addr =
-            ACE_reinterpret_cast(sockaddr_in *, &pcur->ifr_addr);
-
-          // Sometimes the kernel returns 0.0.0.0 as the interface
-          // address, skip those...
-          if (addr->sin_addr.s_addr != 0)
-            {
-              addrs[count].set ((u_short) 0,
-                                addr->sin_addr.s_addr,
-                                0);
-              count++;
-            }
-#else /* ! _UNICOS */
-          // need to explicitly copy on the Cray, since the bitfields kinda
-          // screw things up here
-          struct sockaddr_in inAddr;
-
-          inAddr.sin_len = pcur->ifr_addr.sa_len;
-          inAddr.sin_family = pcur->ifr_addr.sa_family;
-          memcpy((void *)&(inAddr.sin_addr),
-                 (const void *)&(pcur->ifr_addr.sa_data[8]),
-                 sizeof(struct in_addr));
-
-          if (inAddr.sin_addr.s_addr != 0)
-            {
-              addrs[count].set(&inAddr, sizeof(struct sockaddr_in));
-              count++;
-            }
-#endif /* ! _UNICOS */
-        }
-
-#if !defined(CHORUS_4)
-      pcur++;
-#else
-      if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr))
-        {
-           pcur++;
-        }
-      else
-        {
-           pcur = (struct ifreq *)
-               (pcur->ifr_addr.sa_len + (caddr_t) &pcur->ifr_addr);
-        }
-#endif
-    }
-  return 0;
-#else
-  ACE_UNUSED_ARG (count);
-  ACE_UNUSED_ARG (addrs);
-  ACE_NOTSUP_RETURN (-1);;                      // no implementation
-#endif /* ACE_WIN32 */
-}
-
 char *
 ACE::strndup (const char *str, size_t n)
 {
@@ -4637,37 +3237,6 @@ ACE::strend (const wchar_t *s)
 }
 #endif
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> >;
-
-// Explicitly instantiate these templates in the multithreaded case
-// since some classes need them.
-# if defined (ACE_HAS_THREADS)
-template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >;
-# endif  /* ACE_HAS_THREADS */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
-
-// Explicitly instantiate these templates in the multithreaded case
-// since some classes need them.
-# if defined (ACE_HAS_THREADS)
-#  pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>
-#  pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#  pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >
-# endif  /* ACE_HAS_THREADS */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && (defined (__unix) || defined (__Lynx__) || defined (_AIX))
 template class ACE_Auto_Array_Ptr<struct ifreq>;
 template class ACE_Auto_Basic_Array_Ptr<struct ifreq>;
diff --git a/ace/ACE.h b/ace/ACE.h
index 08ca633c3ac..9cb4ec48641 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -24,12 +24,19 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/ACE_Flag_Manip.h"
+#include "ace/ACE_Handle_Ops.h"
+#include "ace/ACE_Lib_Find.h"
+#include "ace/ACE_Init.h"
+#include "ace/ACE_Sock_Connect.h"
+
 // Forward declarations.
 class ACE_Time_Value;
-class ACE_INET_Addr;
 class ACE_Message_Block;
 
-class ACE_Export ACE
+class ACE_Export ACE : public ACE_Flag_Manip, public ACE_Handle_Ops,
+                       public ACE_Lib_Find, public ACE_Init, 
+                       public ACE_Sock_Connect
 {
   // = TITLE
   //     Contains value added ACE methods that extend the behavior
@@ -43,15 +50,6 @@ class ACE_Export ACE
 
   ACE_CLASS_IS_NAMESPACE (ACE);
 public:
-  // Initialize ACE library services.  Can be called only once per
-  // program invocation.
-  static int init (void);
-  // Returns 0 on success, -1 on failure, and 1 if it had already been called.
-
-  // Shut down ACE library services.  Can be called only once per
-  // program invocation.
-  static int fini (void);
-  // Returns 0 on success, -1 on failure, and 1 if it had already been called.
 
   // = ACE version information.
   static u_int major_version (void);
@@ -303,39 +301,6 @@ public:
                            int iovcnt,
                            size_t *bytes_transferred = 0);
 
-  // = Socket connection establishment calls.
-
-  static int bind_port (ACE_HANDLE handle,
-                        ACE_UINT32 ip_addr = INADDR_ANY);
-  // Bind a new unused port to <handle>.
-
-  static int get_bcast_addr (ACE_UINT32 &bcast_addr,
-                             const ACE_TCHAR *hostname = 0,
-                             ACE_UINT32 host_addr = 0,
-                             ACE_HANDLE handle = ACE_INVALID_HANDLE);
-  // Get our broadcast address based on our <host_addr>.  If
-  // <hostname> is non-0 we'll use it to determine our IP address.  If
-  // <handle> is not <ACE_INVALID_HANDLE> then we'll use this to
-  // determine our broadcast address, otherwise we'll have to create a
-  // socket internally (and free it).  Returns -1 on failure and 0 on
-  // success.
-
-  static int get_ip_interfaces (size_t &count,
-                                ACE_INET_Addr *&addr_array);
-  // Return count and array of all configured IP interfaces on this
-  // host, rc = 0 on success (count == number of interfaces else -1).
-  // Caller is responsible for calling delete [] on <addr_array>.
-
-  static int count_interfaces (ACE_HANDLE handle,
-                               size_t &how_many);
-  // Helper routine for get_ip_interfaces, differs by UNIX platform so
-  // put into own subroutine.  perform some ioctls to retrieve ifconf
-  // list of ifreq structs.
-
-  static ACE_HANDLE get_handle (void);
-  // Routine to return a handle from which <ioctl> requests can be
-  // made.  Caller must <close> the handle.
-
   static int handle_timed_accept (ACE_HANDLE listener,
                                   ACE_Time_Value *timeout,
                                   int restart);
@@ -351,28 +316,6 @@ public:
   // we are being called by a TLI wrapper (which behaves slightly
   // differently from a socket wrapper).
 
-  // = Operations on HANDLEs.
-
-  static ACE_HANDLE handle_timed_open (ACE_Time_Value *timeout,
-                                       const ACE_TCHAR *name,
-                                       int flags,
-                                       int perms);
-  // Wait up to <timeout> amount of time to actively open a device.
-  // This method doesn't perform the <connect>, it just does the timed
-  // wait...
-
-  // = Set/get/clear various flags related to I/O HANDLE.
-  static int set_flags (ACE_HANDLE handle,
-                        int flags);
-  // Set flags associated with <handle>.
-
-  static int clr_flags (ACE_HANDLE handle,
-                        int flags);
-  // Clear flags associated with <handle>.
-
-  static int get_flags (ACE_HANDLE handle);
-  // Return the current setting of flags associated with <handle>.
-
   static int set_handle_limit (int new_limit = -1);
   // Reset the limit on the number of open handles.  If <new_limit> ==
   // -1 set the limit to the maximum allowable.  Otherwise, set it to
@@ -408,17 +351,6 @@ public:
   // Create a fresh new copy of <str>, up to <n> chars long.  Uses
   // <ACE_OS::malloc> to allocate the new string.
 
-  static char *strsplit_r (char *s, const char *token, char *&next_start);
-  // Splits string <s> into pieces separated by the string <token>.
-  // <next_start> is an opaque cookie handed back by the call to store
-  // its state for the next invocation, thus making it re-entrant.
-  // This operates very similar to Perl's <split> function except that
-  // it returns pieces one at a time instead of into an array.
-
-  static size_t strrepl (char *s, char search, char replace);
-  // Replace all instances of <search> in <s> with <replace>.  Returns
-  // the number of replacements made.
-
 #if defined (ACE_HAS_WCHAR)
   static const wchar_t *strend (const wchar_t *s);
 
@@ -428,12 +360,6 @@ public:
 
   static wchar_t *strnnew (const wchar_t *str, size_t n);
 
-  static wchar_t *strsplit_r (wchar_t *s,
-                              const wchar_t *token,
-                              wchar_t *&next_start);
-
-  static size_t strrepl (wchar_t *s, wchar_t search, wchar_t replace);
-
 #endif /* ACE_HAS_WCHAR */
 
   static const ACE_TCHAR *execname (const ACE_TCHAR *pathname);
@@ -481,43 +407,6 @@ public:
   // <close_all_handles> is non-zero then all open file handles are
   // closed.
 
-  // = Methods for searching and opening shared libraries.
-
-  static int ldfind (const ACE_TCHAR *filename,
-                     ACE_TCHAR *pathname,
-                     size_t maxlen);
-  // Finds the file <filename> either using an absolute path or using
-  // a relative path in conjunction with ACE_LD_SEARCH_PATH (e.g.,
-  // $LD_LIBRARY_PATH on UNIX or $PATH on Win32).  This function will
-  // add appropriate suffix (e.g., .dll on Win32 or .so on UNIX)
-  // according to the OS platform.  In addition, this function will
-  // apply the appropriate prefix (e.g., "lib" on UNIX and "" on
-  // Win32) if the <filename> doesn't match directly.
-
-  static FILE *ldopen (const ACE_TCHAR *filename,
-                       const ACE_TCHAR *type);
-  // Uses <ldopen> to locate and open the appropriate <filename> and
-  // returns a pointer to the file, else it returns a NULL
-  // pointer. <type> specifies how the file should be open.
-
-  static ACE_TCHAR *ldname (const ACE_TCHAR *entry_point);
-  // Transforms <entry_point> into a form that can be located in a
-  // dynamic library using <dlsym>. For example, with Win32/Borland
-  // extern "C" functions which use the default calling convention
-  // have a '_' prepended. Always returns a buffer that has been
-  // dynamically allocated using <operator new>.
-
-  static int get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len);
-  // Returns the temporary directory including the trailing slash in
-  // <buffer>.  Returns -1 for an error or if the buffer_len is not
-  // long enough.
-
-  static ACE_HANDLE open_temp_file (const ACE_TCHAR *name,
-                                    int mode,
-                                    int perm = 0);
-  // Opening the temp file.  File is automagically unlinked when it is
-  // closed.  This is useful for have temp files.
-
   // = Shield us from Win32's inability to select on STDIN.
 
   // = Miscelleous functions.
@@ -777,11 +666,6 @@ private:
                             const ACE_Time_Value *timeout,
                             size_t *bytes_transferred);
 
-  static u_int init_fini_count_;
-  // Counter to match <init>/<fini> calls.  <init> must increment it;
-  // <fini> must decrement it.  <fini> then does nothing until it
-  // reaches 0.
-
   static size_t pagesize_;
   // Size of a VM page.
 
diff --git a/ace/ACE.i b/ace/ACE.i
index 792cc8056ff..24809acd383 100644
--- a/ace/ACE.i
+++ b/ace/ACE.i
@@ -268,24 +268,6 @@ ACE::unique_name (const void *object,
   ACE_OS::unique_name (object, name, length);
 }
 
-// Return flags currently associated with handle.
-
-ASYS_INLINE int
-ACE::get_flags (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE::get_flags");
-
-#if defined (ACE_LACKS_FCNTL)
-  // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
-  // would be better to store ACE's notion of the flags
-  // associated with the handle, but this works for now.
-  ACE_UNUSED_ARG (handle);
-  return 0;
-#else
-  return ACE_OS::fcntl (handle, F_GETFL, 0);
-#endif /* ACE_LACKS_FCNTL */
-}
-
 ASYS_INLINE u_long
 ACE::log2 (u_long num)
 {
diff --git a/ace/ACE_Flag_Manip.cpp b/ace/ACE_Flag_Manip.cpp
new file mode 100644
index 00000000000..2d8b1326c2e
--- /dev/null
+++ b/ace/ACE_Flag_Manip.cpp
@@ -0,0 +1,80 @@
+// $Id$
+
+#include "ACE_Flag_Manip.h"
+
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Flag_Manip.i"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+ACE_RCSID(ace, ACE, "$Id$")
+
+// Flags are file status flags to turn on.
+
+int
+ACE_Flag_Manip::set_flags (ACE_HANDLE handle, int flags)
+{
+  ACE_TRACE ("ACE_Flag_Manip::set_flags");
+#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+  switch (flags)
+    {
+    case ACE_NONBLOCK:
+      // nonblocking argument (1)
+      // blocking:            (0)
+      {
+        u_long nonblock = 1;
+        return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
+      }
+    default:
+      ACE_NOTSUP_RETURN (-1);
+    }
+#else
+  int val = ACE_OS::fcntl (handle, F_GETFL, 0);
+
+  if (val == -1)
+    return -1;
+
+  // Turn on flags.
+  ACE_SET_BITS (val, flags);
+
+  if (ACE_OS::fcntl (handle, F_SETFL, val) == -1)
+    return -1;
+  else
+    return 0;
+#endif /* ACE_WIN32 || ACE_LACKS_FCNTL */
+}
+
+// Flags are the file status flags to turn off.
+
+int
+ACE_Flag_Manip::clr_flags (ACE_HANDLE handle, int flags)
+{
+  ACE_TRACE ("ACE_Flag_Manip::clr_flags");
+
+#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+  switch (flags)
+    {
+    case ACE_NONBLOCK:
+      // nonblocking argument (1)
+      // blocking:            (0)
+      {
+        u_long nonblock = 0;
+        return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
+      }
+    default:
+      ACE_NOTSUP_RETURN (-1);
+    }
+#else
+  int val = ACE_OS::fcntl (handle, F_GETFL, 0);
+
+  if (val == -1)
+    return -1;
+
+  // Turn flags off.
+  ACE_CLR_BITS (val, flags);
+
+  if (ACE_OS::fcntl (handle, F_SETFL, val) == -1)
+    return -1;
+  else
+    return 0;
+#endif /* ACE_WIN32 || ACE_LACKS_FCNTL */
+}
diff --git a/ace/ACE_Flag_Manip.h b/ace/ACE_Flag_Manip.h
new file mode 100644
index 00000000000..d38073e2ac9
--- /dev/null
+++ b/ace/ACE_Flag_Manip.h
@@ -0,0 +1,49 @@
+// $Id$
+
+// FILENAME
+//   ACE_Flag_Manip.h
+//
+// DESCRIPTION
+//   IPC_SAP uses only two functions in ACE and hence is linking the
+//   entire ACE. Splitting the functions that are used in IPC_SAP to a */
+//   different class and linking to that class instead of the whole
+//   thing would result in reduced dependency on ACE and ultimately
+//   reduced FP.
+//
+// =======================================================================
+
+#ifndef ACE_ACE_FLAG_MANIP_H
+#define ACE_ACE_FLAG_MANIP_H
+#include "pre.h"
+
+#include "OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class ACE_Export ACE_Flag_Manip
+{
+ public:
+
+  // = Set/get/clear various flags related to I/O HANDLE.
+  static int set_flags (ACE_HANDLE handle,
+                        int flags);
+  // Set flags associated with <handle>.
+
+  static int clr_flags (ACE_HANDLE handle,
+                        int flags);
+  // Clear flags associated with <handle>.
+
+  static int get_flags (ACE_HANDLE handle);
+  // Return the current setting of flags associated with <handle>.
+
+
+};
+
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Flag_Manip.i"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+#include "ace/post.h"
+#endif  /* ACE_ACE_FLAG_MANIP_H */
diff --git a/ace/ACE_Flag_Manip.i b/ace/ACE_Flag_Manip.i
new file mode 100644
index 00000000000..e477f235d23
--- /dev/null
+++ b/ace/ACE_Flag_Manip.i
@@ -0,0 +1,20 @@
+/* -*- C++ -*- */
+// $Id$
+
+// Return flags currently associated with handle.
+
+ASYS_INLINE int
+ACE_Flag_Manip::get_flags (ACE_HANDLE handle)
+{
+  ACE_TRACE ("ACE::get_flags");
+
+#if defined (ACE_LACKS_FCNTL)
+  // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
+  // would be better to store ACE's notion of the flags
+  // associated with the handle, but this works for now.
+  ACE_UNUSED_ARG (handle);
+  return 0;
+#else
+  return ACE_OS::fcntl (handle, F_GETFL, 0);
+#endif /* ACE_LACKS_FCNTL */
+}
diff --git a/ace/ACE_Handle_Ops.cpp b/ace/ACE_Handle_Ops.cpp
new file mode 100644
index 00000000000..0174ac3ef9d
--- /dev/null
+++ b/ace/ACE_Handle_Ops.cpp
@@ -0,0 +1,35 @@
+// $Id$
+
+#include "ace/ACE_Handle_Ops.h"
+
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Handle_Ops.h"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+ACE_RCSID(ace, ACE, "$Id$")
+
+ACE_HANDLE
+ACE_Handle_Ops::handle_timed_open (ACE_Time_Value *timeout,
+                                   const ACE_TCHAR *name,
+                                   int flags,
+                                   int perms)
+{
+  ACE_TRACE ("ACE_Handle_Ops::handle_timed_open");
+  
+  if (timeout != 0)
+    {
+      // Open the named pipe or file using non-blocking mode...
+      ACE_HANDLE handle = ACE_OS::open (name,
+                                        flags | ACE_NONBLOCK,
+                                        perms);
+      if (handle == ACE_INVALID_HANDLE
+          && (errno == EWOULDBLOCK
+              && (timeout->sec () > 0 || timeout->usec () > 0)))
+        // This expression checks if we were polling.
+        errno = ETIMEDOUT;
+
+      return handle;
+    }
+  else
+    return ACE_OS::open (name, flags, perms);
+}
diff --git a/ace/ACE_Handle_Ops.h b/ace/ACE_Handle_Ops.h
new file mode 100644
index 00000000000..129da6f03d5
--- /dev/null
+++ b/ace/ACE_Handle_Ops.h
@@ -0,0 +1,40 @@
+// $Id$
+
+// ========================================================================
+// LIBRARY
+//   ACE.so
+//
+// DESCRIPTION
+//   This class consolidates the operations on the Handles.
+//
+// AUTHOR
+//   Priyanka Gontla <pgontla@ece.uci.edu>
+//
+// =========================================================================
+
+#ifndef ACE_ACE_HANDLE_OPS_H
+#define ACE_ACE_HANDLE_OPS_H
+#include "ace/pre.h"
+
+#include "ace/OS.h"
+
+class ACE_Export ACE_Handle_Ops
+{
+ public:
+    // = Operations on HANDLEs.
+
+  static ACE_HANDLE handle_timed_open (ACE_Time_Value *timeout,
+                                       const ACE_TCHAR *name,
+                                       int flags,
+                                       int perms);
+  // Wait up to <timeout> amount of time to actively open a device.
+  // This method doesn't perform the <connect>, it just does the timed
+  // wait...
+};
+
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Handle_Ops.i"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+#include "ace/post.h"
+#endif /* ACE_ACE_HANDLE_OPS_H */
diff --git a/ace/ACE_Handle_Ops.i b/ace/ACE_Handle_Ops.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/ace/ACE_Handle_Ops.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/ace/ACE_Init.cpp b/ace/ACE_Init.cpp
new file mode 100644
index 00000000000..bedca21cbc7
--- /dev/null
+++ b/ace/ACE_Init.cpp
@@ -0,0 +1,44 @@
+// $Id$
+
+#include "ace/ACE_Init.h"
+
+#include "ace/Object_Manager.h"
+
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Init.i"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+ACE_RCSID(ace, ACE, "$Id$")
+
+  // Static data members.
+  u_int ACE_Init::init_fini_count_ = 0;
+int
+ACE_Init::init (void)
+{
+  // Don't use ACE_TRACE, because Object_Manager might not have been
+  // instantiated yet.
+  // ACE_TRACE ("ACE_Init::init");
+
+  ++init_fini_count_;
+
+  return ACE_Object_Manager::instance ()->init ();
+}
+
+int
+ACE_Init::fini (void)
+{
+  ACE_TRACE ("ACE_Init::fini");
+
+  if (init_fini_count_ > 0)
+    {
+      if (--init_fini_count_ == 0)
+        return ACE_Object_Manager::instance ()->fini ();
+      else
+        // Wait for remaining fini () calls.
+        return 1;
+    }
+  else
+    // More ACE_Init::fini () calls than ACE_Init::init () calls.  Bad
+    // application!
+    return -1;
+}
diff --git a/ace/ACE_Init.h b/ace/ACE_Init.h
new file mode 100644
index 00000000000..837855228b2
--- /dev/null
+++ b/ace/ACE_Init.h
@@ -0,0 +1,45 @@
+// $Id$
+
+#ifndef ACE_ACE_INVOKE_H
+#define ACE_ACE_INVOKE_H
+#include "ace/pre.h"
+
+#include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class ACE_Export ACE_Init
+{
+
+  // DESCRIPTION: This class implements the fucntions for the
+  //              initialization and shutting down ACE.
+  //              These functions are called only once per ACE
+  //              invokation.
+ public:
+    // Initialize ACE library services.  Can be called only once per
+  // program invocation.
+  static int init (void);
+  // Returns 0 on success, -1 on failure, and 1 if it had already been called.
+
+  // Shut down ACE library services.  Can be called only once per
+  // program invocation.
+  static int fini (void);
+  // Returns 0 on success, -1 on failure, and 1 if it had already been called.
+
+ private:
+
+  static u_int init_fini_count_;
+  // Counter to match <init>/<fini> calls.  <init> must increment it;
+  // <fini> must decrement it.  <fini> then does nothing until it
+  // reaches 0.
+
+};
+
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Init.i"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+#include "ace/post.h"
+#endif  /* ACE_ACE_INVOKE_H */
diff --git a/ace/ACE_Init.i b/ace/ACE_Init.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/ace/ACE_Init.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/ace/ACE_Lib_Find.cpp b/ace/ACE_Lib_Find.cpp
new file mode 100644
index 00000000000..d7fd621a4a5
--- /dev/null
+++ b/ace/ACE_Lib_Find.cpp
@@ -0,0 +1,532 @@
+// $Id$
+
+#include "ace/ACE_Lib_Find.h"
+#include "ace/Log_Msg.h"
+
+#if ! defined (ACE_PSOS_DIAB_MIPS)
+int
+ACE_Lib_Find::ldfind (const ACE_TCHAR filename[],
+                      ACE_TCHAR pathname[],
+                      size_t maxpathnamelen)
+{
+  ACE_TRACE ("ACE_Lib_Find::ldfind");
+
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \
+    !defined (ACE_HAS_PHARLAP)
+  ACE_TCHAR expanded_filename[MAXPATHLEN];
+  if (ACE_TEXT_ExpandEnvironmentStrings (filename,
+                                         expanded_filename,
+                                         sizeof expanded_filename
+                                         / sizeof (ACE_TCHAR)))
+    filename = expanded_filename;
+#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */
+
+  ACE_TCHAR tempcopy[MAXPATHLEN + 1];
+  ACE_TCHAR searchpathname[MAXPATHLEN + 1];
+  ACE_TCHAR searchfilename[MAXPATHLEN + 2];
+
+  // Create a copy of filename to work with.
+  if (ACE_OS::strlen (filename) + 1
+      > (sizeof tempcopy / sizeof (ACE_TCHAR)))
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+  else
+    ACE_OS::strcpy (tempcopy, filename);
+
+  // Insert canonical directory separators.
+  ACE_TCHAR *separator_ptr;
+
+#if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
+  // Make all the directory separators "canonical" to simplify
+  // subsequent code.
+  ACE_Lib_Find::strrepl (tempcopy, ACE_DIRECTORY_SEPARATOR_CHAR, '/');
+#endif /* ACE_DIRECTORY_SEPARATOR_CHAR */
+
+  // Separate filename from pathname.
+  separator_ptr = ACE_OS::strrchr (tempcopy, '/');
+
+  // This is a relative path.
+  if (separator_ptr == 0)
+    {
+      searchpathname[0] = '\0';
+      ACE_OS::strcpy (searchfilename, tempcopy);
+    }
+  else // This is an absolute path.
+    {
+      ACE_OS::strcpy (searchfilename, separator_ptr + 1);
+      separator_ptr[1] = '\0';
+      ACE_OS::strcpy (searchpathname, tempcopy);
+    }
+
+  int got_suffix = 0;
+
+  // Check to see if this has an appropriate DLL suffix for the OS
+  // platform.
+  ACE_TCHAR *s = ACE_OS::strrchr (searchfilename, '.');
+
+  const ACE_TCHAR *dll_suffix = ACE_DLL_SUFFIX;
+
+  if (s != 0)
+    {
+      // If we have a dot, we have a suffix
+      got_suffix = 1;
+
+      // Check whether this matches the appropriate platform-specific
+      // suffix.
+      if (ACE_OS::strcmp (s, dll_suffix) != 0)
+        {
+          ACE_ERROR ((LM_WARNING,
+                      ACE_LIB_TEXT ("Warning: improper suffix for a ")
+                      ACE_LIB_TEXT ("shared library on this platform: %s\n"),
+                      s));
+        }
+    }
+
+  // Make sure we've got enough space in searchfilename.
+  if (ACE_OS::strlen (searchfilename)
+      + ACE_OS::strlen (ACE_DLL_PREFIX)
+      + got_suffix ? 0 : ACE_OS::strlen (dll_suffix) >= (sizeof searchfilename /
+                                                         sizeof (ACE_TCHAR)))
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+
+#if defined (ACE_WIN32) && defined (_DEBUG) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
+  size_t len_searchfilename = ACE_OS::strlen (searchfilename);
+  if (! got_suffix)
+    {
+      searchfilename [len_searchfilename] = 'd';
+      searchfilename [len_searchfilename+1] = 0;
+    }
+
+  for (int tag = 1; tag >= 0; tag --)
+    {
+      if (tag == 0)
+        searchfilename [len_searchfilename] = 0;
+
+#endif /* ACE_WIN32 && _DEBUG && !ACE_DISABLE_DEBUG_DLL_CHECK */
+      // Use absolute pathname if there is one.
+      if (ACE_OS::strlen (searchpathname) > 0)
+        {
+          if (ACE_OS::strlen (searchfilename)
+              + ACE_OS::strlen (searchpathname) >= maxpathnamelen)
+            {
+              errno = ENOMEM;
+              return -1;
+            }
+          else
+            {
+#if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
+              // Revert to native path name separators.
+              ACE_Lib_Find::strrepl (searchpathname,
+                                     '/',
+                                     ACE_DIRECTORY_SEPARATOR_CHAR);
+#endif /* ACE_DIRECTORY_SEPARATOR_CHAR */
+              // First, try matching the filename *without* adding a
+              // prefix.
+#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
+              ACE_OS::sprintf (pathname,
+                               ACE_LIB_TEXT ("%s%s%s"),
+                               searchpathname,
+                               searchfilename,
+                               got_suffix ? ACE_static_cast (ACE_TCHAR *,
+                                                             ACE_LIB_TEXT (""))
+                               : ACE_static_cast (ACE_TCHAR *,
+                                                  dll_suffix));
+#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+              ACE_OS::sprintf (pathname,
+                               ACE_LIB_TEXT ("%s%s%s"),
+                               searchpathname,
+                               searchfilename,
+                               got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
+#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+              if (ACE_OS::access (pathname, F_OK) == 0)
+                return 0;
+
+              // Second, try matching the filename *with* adding a prefix.
+#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
+              ACE_OS::sprintf (pathname,
+                               ACE_LIB_TEXT ("%s%s%s%s"),
+                               searchpathname,
+                               ACE_DLL_PREFIX,
+                               searchfilename,
+                               got_suffix ? ACE_static_cast (ACE_TCHAR *,
+                                                             ACE_LIB_TEXT (""))
+                               : ACE_static_cast (ACE_TCHAR *,
+                                                  dll_suffix));
+#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+              ACE_OS::sprintf (pathname,
+                               ACE_LIB_TEXT ("%s%s%s%s"),
+                               searchpathname,
+                               ACE_DLL_PREFIX,
+                               searchfilename,
+                               got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
+#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+              if (ACE_OS::access (pathname, F_OK) == 0)
+                return 0;
+            }
+        }
+
+      // Use relative filenames via LD_LIBRARY_PATH or PATH (depending on
+      // OS platform).
+      else
+        {
+          ACE_TCHAR *ld_path =
+#if defined ACE_DEFAULT_LD_SEARCH_PATH
+            ACE_DEFAULT_LD_SEARCH_PATH;
+#else
+            ACE_OS::getenv (ACE_LD_SEARCH_PATH);
+#endif /* ACE_DEFAULT_LD_SEARCH_PATH */
+
+#if defined (ACE_WIN32)
+          ACE_TCHAR *ld_path_temp = 0;
+          if (ld_path != 0)
+            {
+              ld_path_temp = (ACE_TCHAR *) ACE_OS::malloc ((ACE_OS::strlen (ld_path) + 2)
+                                                           * sizeof (ACE_TCHAR));
+              if (ld_path_temp != 0)
+                {
+                  ACE_OS::strcpy (ld_path_temp, ACE_LD_SEARCH_PATH_SEPARATOR_STR);
+                  ACE_OS::strcat (ld_path_temp, ld_path);
+                  ld_path = ld_path_temp;
+                }
+              else
+                {
+                  ACE_OS::free ((void *) ld_path_temp);
+                  ld_path = ld_path_temp = 0;
+                }
+            }
+#endif /* ACE_WIN32 */
+
+          if (ld_path != 0
+              && (ld_path = ACE_OS::strdup (ld_path)) != 0)
+            {
+              // strtok has the strange behavior of not separating the
+              // string ":/foo:/bar" into THREE tokens.  One would expect
+              // that the first iteration the token would be an empty
+              // string, the second iteration would be "/foo", and the
+              // third iteration would be "/bar".  However, this is not
+              // the case; one only gets two iterations: "/foo" followed
+              // by "/bar".
+
+              // This is especially a problem in parsing Unix paths
+              // because it is permissible to specify 'the current
+              // directory' as an empty entry.  So, we introduce the
+              // following special code to cope with this:
+
+              // Look at each dynamic lib directory in the search path.
+
+              ACE_TCHAR *nextholder = 0;
+              const ACE_TCHAR *path_entry =
+                ACE_Lib_Find::strsplit_r (ld_path,
+                                          ACE_LD_SEARCH_PATH_SEPARATOR_STR,
+                                          nextholder);
+              int result = 0;
+
+              for (;;)
+                {
+                  // Check if at end of search path.
+                  if (path_entry == 0)
+                    {
+                      errno = ENOENT;
+                      result = -1;
+                      break;
+                    }
+                  else if (ACE_OS::strlen (path_entry)
+                           + 1
+                           + ACE_OS::strlen (searchfilename)
+                           >= maxpathnamelen)
+                    {
+                      errno = ENOMEM;
+                      result = -1;
+                      break;
+                    }
+                  // This works around the issue where a path might have
+                  // an empty component indicating 'current directory'.
+                  // We need to do it here rather than anywhere else so
+                  // that the loop condition will still work.
+                  else if (path_entry[0] == '\0')
+                    path_entry = ACE_LIB_TEXT (".");
+
+                  // First, try matching the filename *without* adding a
+                  // prefix.
+#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
+                  ACE_OS::sprintf (pathname,
+                                   ACE_LIB_TEXT ("%s%c%s%s"),
+                                   path_entry,
+                                   ACE_DIRECTORY_SEPARATOR_CHAR,
+                                   searchfilename,
+                                   got_suffix ? ACE_static_cast (ACE_TCHAR *,
+                                                                 ACE_LIB_TEXT (""))
+                                   : ACE_static_cast (ACE_TCHAR *,
+                                                      dll_suffix));
+#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+                  ACE_OS::sprintf (pathname,
+                                   ACE_LIB_TEXT ("%s%c%s%s"),
+                                   path_entry,
+                                   ACE_DIRECTORY_SEPARATOR_CHAR,
+                                   searchfilename,
+                                   got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
+#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+                  if (ACE_OS::access (pathname, F_OK) == 0)
+                    break;
+
+                  // Second, try matching the filename *with* adding a
+                  // prefix.
+#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
+                  ACE_OS::sprintf (pathname,
+                                   ACE_LIB_TEXT ("%s%c%s%s%s"),
+                                   path_entry,
+                                   ACE_DIRECTORY_SEPARATOR_CHAR,
+                                   ACE_DLL_PREFIX,
+                                   searchfilename,
+                                   got_suffix ? ACE_static_cast (ACE_TCHAR *,
+                                                                 ACE_LIB_TEXT (""))
+                                   : ACE_static_cast (ACE_TCHAR *,
+                                                      dll_suffix));
+#else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+                  ACE_OS::sprintf (pathname,
+                                   ACE_LIB_TEXT ("%s%c%s%s%s"),
+                                   path_entry,
+                                   ACE_DIRECTORY_SEPARATOR_CHAR,
+                                   ACE_DLL_PREFIX,
+                                   searchfilename,
+                                   got_suffix ? ACE_LIB_TEXT ("") : dll_suffix);
+#endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+                  if (ACE_OS::access (pathname, F_OK) == 0)
+                    break;
+
+                  // Fetch the next item in the path
+                  path_entry = ACE_Lib_Find::strsplit_r (0,
+                                                         ACE_LD_SEARCH_PATH_SEPARATOR_STR,
+                                                         nextholder);
+                }
+
+#if defined (ACE_WIN32)
+              if (ld_path_temp != 0)
+                ACE_OS::free (ld_path_temp);
+#endif /* ACE_WIN32 */
+              ACE_OS::free ((void *) ld_path);
+#if defined (ACE_WIN32) && defined (_DEBUG) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
+              if (result == 0 || tag == 0)
+#endif /* ACE_WIN32 && _DEBUG && !ACE_DISABLE_DEBUG_DLL_CHECK */
+                return result;
+            }
+        }
+#if defined (ACE_WIN32) && defined (_DEBUG) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
+    }
+#endif /* ACE_WIN32 && _DEBUG && !ACE_DISABLE_DEBUG_DLL_CHECK */
+
+  errno = ENOENT;
+  return -1;
+}
+
+FILE *
+ACE_Lib_Find::ldopen (const ACE_TCHAR *filename,
+             const ACE_TCHAR *type)
+{
+  ACE_TRACE ("ACE_Lib_Find::ldopen");
+
+  ACE_TCHAR buf[MAXPATHLEN + 1];
+  if (ACE_Lib_Find::ldfind (filename,
+                   buf,
+                   sizeof (buf) /sizeof (ACE_TCHAR)) == -1)
+    return 0;
+  else
+    return ACE_OS::fopen (buf, type);
+}
+
+ACE_TCHAR *
+ACE_Lib_Find::ldname (const ACE_TCHAR *entry_point)
+{
+  ACE_TRACE ("ACE_Lib_Find::ldname");
+
+#if defined (__BORLANDC__)
+  size_t size =
+    1 // leading '_'
+    + ACE_OS::strlen (entry_point)
+    + 1;
+
+  ACE_TCHAR *new_name;
+  ACE_NEW_RETURN (new_name,
+                  ACE_TCHAR[size],
+                  0);
+
+  ACE_OS::strcpy (new_name, ACE_LIB_TEXT ("_"));
+  ACE_OS::strcat (new_name, entry_point);
+
+  return new_name;
+#else /* __BORLANDC__ */
+  size_t size =
+    ACE_OS::strlen (entry_point)
+    + 1;
+
+  ACE_TCHAR *new_name;
+  ACE_NEW_RETURN (new_name,
+                  ACE_TCHAR[size],
+                  0);
+
+  ACE_OS::strcpy (new_name, entry_point);
+
+  return new_name;
+#endif /* __BORLANDC__ */
+}
+
+int
+ACE_Lib_Find::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
+{
+  int result;
+#if defined (ACE_WIN32)
+  result = ACE_TEXT_GetTempPath (buffer_len, buffer);
+
+  // Make sure to return -1 if there is an error
+  if (result == 0 && ::GetLastError () != ERROR_SUCCESS
+      || result > ACE_static_cast (int, buffer_len))
+    result = -1;
+
+#else /* ACE_WIN32 */
+
+  // On non-win32 platforms, check to see what the TMPDIR environment
+  // variable is defined to be.  If it doesn't exist, just use /tmp
+  const ACE_TCHAR *tmpdir = ACE_OS::getenv (ACE_LIB_TEXT ("TMPDIR"));
+
+  if (tmpdir == NULL)
+    tmpdir = ACE_LIB_TEXT ("/tmp");
+
+  size_t len = ACE_OS::strlen (tmpdir);
+
+  // Check to see if the buffer is large enough for the string,
+  // another /, and its null character (hence the + 2)
+  if ((len + 2) > buffer_len)
+    {
+      result = -1;
+    }
+  else
+    {
+      ACE_OS::strcpy (buffer, tmpdir);
+
+      // Add a trailing slash because we cannot assume there is already one
+      // at the end.  And having an extra one should not cause problems.
+      buffer[len] = '/';
+      buffer[len + 1] = 0;
+      result = 0;
+    }
+#endif /* ACE_WIN32 */
+  return result;
+}
+
+ACE_HANDLE
+ACE_Lib_Find::open_temp_file (const ACE_TCHAR *name, int mode, int perm)
+{
+#if defined (ACE_WIN32)
+  return ACE_OS::open (name,
+                       mode | _O_TEMPORARY);
+#else
+  // Open it.
+  ACE_HANDLE handle = ACE_OS::open (name, mode, perm);
+
+  if (handle == ACE_INVALID_HANDLE)
+    return ACE_INVALID_HANDLE;
+
+  // Unlink it so that the file will be removed automatically when the
+  // process goes away.
+  if (ACE_OS::unlink (name) == -1)
+    return -1;
+  else
+    // Return the handle.
+    return handle;
+#endif /* ACE_WIN32 */
+}
+#endif /* ! ACE_PSOS_DIAB_MIPS */
+
+size_t
+ACE_Lib_Find::strrepl (char *s, char search, char replace)
+{
+  ACE_TRACE ("ACE_Lib_Find::strrepl");
+
+  size_t replaced = 0;
+
+  for (size_t i = 0; s[i] != '\0'; i++)
+    if (s[i] == search)
+      {
+        s[i] = replace;
+        replaced++;
+      }
+
+  return replaced;
+}
+
+
+// Split a string up into 'token'-delimited pieces, ala Perl's
+// "split".
+
+char *
+ACE_Lib_Find::strsplit_r (char *str,
+                          const char *token,
+                          char *&next_start)
+{
+  char *result = 0;
+
+  if (str != 0)
+    next_start = str;
+
+  if (next_start != 0)
+    {
+      char *tok_loc = ACE_OS::strstr (next_start, token);
+
+      if (tok_loc != 0)
+        {
+          // Return the beginning of the string.
+          result = next_start;
+
+          // Insure it's terminated.
+          *tok_loc = '\0';
+          next_start = tok_loc + ACE_OS::strlen (token);
+        }
+      else
+        {
+          result = next_start;
+          next_start = (char *) 0;
+        }
+    }
+
+  return result;
+}
+
+#if defined (ACE_HAS_WCHAR)
+wchar_t *
+ACE_Lib_Find::strsplit_r (wchar_t *str,
+                          const wchar_t *token,
+                          wchar_t *&next_start)
+{
+  wchar_t *result = 0;
+
+  if (str != 0)
+    next_start = str;
+
+  if (next_start != 0)
+    {
+      wchar_t *tok_loc = ACE_OS::strstr (next_start, token);
+
+      if (tok_loc != 0)
+        {
+          // Return the beginning of the string.
+          result = next_start;
+
+          // Insure it's terminated.
+          *tok_loc = '\0';
+          next_start = tok_loc + ACE_OS::strlen (token);
+        }
+      else
+        {
+          result = next_start;
+          next_start = (wchar_t *) 0;
+        }
+    }
+
+  return result;
+}
+#endif
diff --git a/ace/ACE_Lib_Find.h b/ace/ACE_Lib_Find.h
new file mode 100644
index 00000000000..bc61814c570
--- /dev/null
+++ b/ace/ACE_Lib_Find.h
@@ -0,0 +1,75 @@
+// $Id$
+
+#ifndef ACE_ACE_LIB_FIND_H
+#define ACE_ACE_LIB_FINE_H
+#include "ace/pre.h"
+
+#include "ace/OS.h"
+
+class ACE_Export ACE_Lib_Find
+{
+  // Description: This class includes all the static function calls
+  // needed to search and open shared libraries.
+
+ public:
+  
+  // = Methods for searching and opening shared libraries.
+  
+  static int ldfind (const ACE_TCHAR *filename,
+                     ACE_TCHAR *pathname,
+                     size_t maxlen);
+  // Finds the file <filename> either using an absolute path or using
+  // a relative path in conjunction with ACE_LD_SEARCH_PATH (e.g.,
+  // $LD_LIBRARY_PATH on UNIX or $PATH on Win32).  This function will
+  // add appropriate suffix (e.g., .dll on Win32 or .so on UNIX)
+  // according to the OS platform.  In addition, this function will
+  // apply the appropriate prefix (e.g., "lib" on UNIX and "" on
+  // Win32) if the <filename> doesn't match directly.
+
+  static FILE *ldopen (const ACE_TCHAR *filename,
+                       const ACE_TCHAR *type);
+  // Uses <ldopen> to locate and open the appropriate <filename> and
+  // returns a pointer to the file, else it returns a NULL
+  // pointer. <type> specifies how the file should be open.
+
+  static ACE_TCHAR *ldname (const ACE_TCHAR *entry_point);
+  // Transforms <entry_point> into a form that can be located in a
+  // dynamic library using <dlsym>. For example, with Win32/Borland
+  // extern "C" functions which use the default calling convention
+  // have a '_' prepended. Always returns a buffer that has been
+  // dynamically allocated using <operator new>.
+
+  static int get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len);
+  // Returns the temporary directory including the trailing slash in
+  // <buffer>.  Returns -1 for an error or if the buffer_len is not
+  // long enough.
+
+  static ACE_HANDLE open_temp_file (const ACE_TCHAR *name,
+                                    int mode,
+                                    int perm = 0);
+  // Opening the temp file.  File is automagically unlinked when it is
+  // closed.  This is useful for have temp files.
+
+  // @@ Though the following functions dont come under the same category as
+  // above, these are used only in the functions in this class. So it makes
+  // more sense to move these functions too to this class.
+  //
+  static size_t strrepl (char *s, char search, char replace);
+  // Replace all instances of <search> in <s> with <replace>.  Returns
+  // the number of replacements made.
+  
+  static char *strsplit_r (char *s, const char *token, char *&next_start);
+  // Splits string <s> into pieces separated by the string <token>.
+  // <next_start> is an opaque cookie handed back by the call to store
+  // its state for the next invocation, thus making it re-entrant.
+  // This operates very similar to Perl's <split> function except that
+  // it returns pieces one at a time instead of into an array.
+  
+};
+
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE_Lib_Find.i"
+#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+
+#include "ace/post.h"
+#endif  /* ACE_ACE_LIB_FIND_H */
diff --git a/ace/ACE_Lib_Find.i b/ace/ACE_Lib_Find.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/ace/ACE_Lib_Find.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/ace/Configuration.h b/ace/Configuration.h
index 44d16ba5d6e..29bb206b86a 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -21,7 +21,7 @@
 //
 // = TODO
 //    - Add locking for thread safety.
-//    - Need to investigate what happens if memory mapped file gets mapped to 
+//    - Need to investigate what happens if memory mapped file gets mapped to
 //      a location different than it was created with.
 //    - Add dynamic buffer when importing.  currently it will not allow
 //      importing of values greater than a fixed ammount (4096 bytes)
@@ -64,10 +64,10 @@ class ACE_Export ACE_Section_Key_Internal
 public:
   virtual ~ACE_Section_Key_Internal (void);
   // Virtual destructor, make sure descendants are virtual!
-  
+
   virtual int add_ref (void);
   // Increment reference count
-  
+
   virtual int dec_ref (void);
   // Decrement reference count.  Will delete this if count gets to 0
 protected:
@@ -82,7 +82,7 @@ class ACE_Export ACE_Configuration_Section_Key
 {
   // = TITLE
   //     Referenced counted wrapper for <ACE_Section_Key_Internal>.
-  // 
+  //
   // = DESCRIPTION
   //     Reference counted wrapper class for the abstract internal
   //     section key.  A user gets one of these to represent a section
@@ -91,17 +91,17 @@ class ACE_Export ACE_Configuration_Section_Key
 public:
   ACE_Configuration_Section_Key (void);
   // Default ctor
-  
+
   ACE_EXPLICIT ACE_Configuration_Section_Key (ACE_Section_Key_Internal *key);
   // ctor based on a pointer to a concrete internal key, does an
   // add_ref on <key>.
-  
+
   ACE_Configuration_Section_Key (const ACE_Configuration_Section_Key &rhs);
   // Copy ctor, does an add_ref on rhs.key_.
-  
+
   ~ACE_Configuration_Section_Key (void);
   // destructor, does a <dec_ref> on <key_>.
-  
+
   ACE_Configuration_Section_Key &
     operator= (const ACE_Configuration_Section_Key &rhs);
   // assignment operator, does a <dec_ref> on <key_> and <add_ref> to
@@ -118,7 +118,7 @@ class ACE_Export ACE_Configuration
   // = DESCRIPTION
   //     This class provides an interface for configuration databases.
 public:
-  enum VALUETYPE 
+  enum VALUETYPE
   {
     STRING,
     INTEGER,
@@ -129,27 +129,27 @@ public:
 
   virtual ~ACE_Configuration (void);
   // destructor
-  
+
   virtual const ACE_Configuration_Section_Key& root_section (void);
   // Returns the root section of this configuration.
-  
+
   virtual int open_section (const ACE_Configuration_Section_Key &base,
-                            const ACE_TCHAR *sub_section, 
-                            int create, 
+                            const ACE_TCHAR *sub_section,
+                            int create,
                             ACE_Configuration_Section_Key& result) = 0;
   // Finds a <sub_section> in <base> and places the resulting key in
   // <result>. If create is non zero, the sub_section will be created
   // if it doesn't exist
-  
+
   virtual int remove_section (const ACE_Configuration_Section_Key &key,
-                              const ACE_TCHAR *sub_section, 
+                              const ACE_TCHAR *sub_section,
                               int recursive) = 0;
   // Removes the <sub_section> from <key>.  If recursive is non zero,
   // any subkeys below <sub_section> are remove as well.
 
-  virtual int enumerate_values (const ACE_Configuration_Section_Key& key, 
-                                int index, 
-                                ACE_TString& name, 
+  virtual int enumerate_values (const ACE_Configuration_Section_Key& key,
+                                int index,
+                                ACE_TString& name,
                                 VALUETYPE& type) = 0;
   // method to enumerate through the <name> and <type> of values in a
   // <key>.  To begin iteration, <index> must be zero. to continue
@@ -159,8 +159,8 @@ public:
   // when there are no more values to iterate through.  Note - you may
   // not delete or add values while enumerating.  If you need to do
   // this, you start the enumeration over again.
-  
-  virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, 
+
+  virtual int enumerate_sections (const ACE_Configuration_Section_Key& key,
                                   int index, ACE_TString& name) = 0;
   // method to enumerate through the <name> subsections in <key>.  To
   // begin iteration, <index> must zero. to continue iteration, invoke
@@ -170,39 +170,39 @@ public:
   // subsections to iterate through.  Note - you may not delete or add
   // values while enumerating.  If you need to do this, you start the
   // enumeration over again.
-    
-  virtual int set_string_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
+
+  virtual int set_string_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
                                 const ACE_TString& value) = 0;
   // sets the value in <key> with <name> to a string of <value>
-  
-  virtual int set_integer_value (const ACE_Configuration_Section_Key& key, 
-                                 const ACE_TCHAR* name, 
+
+  virtual int set_integer_value (const ACE_Configuration_Section_Key& key,
+                                 const ACE_TCHAR* name,
                                  u_int value) = 0;
   // sets the value in <key> with <name> to an integer of <value>
-  
-  virtual int set_binary_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
-                                const void* data, 
+
+  virtual int set_binary_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
+                                const void* data,
                                 u_int length) = 0;
   // sets the value in <key> with <name> to binary data of <data> with
   // <length>.
 
-  virtual int get_string_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
+  virtual int get_string_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
                                 ACE_TString& value) = 0;
   // gets the string value of <name> from <key> and places it in
   // <value>.  Returns non zero on error (if value is not a string).
-  
-  virtual int get_integer_value (const ACE_Configuration_Section_Key& key, 
-                                 const ACE_TCHAR* name, 
+
+  virtual int get_integer_value (const ACE_Configuration_Section_Key& key,
+                                 const ACE_TCHAR* name,
                                  u_int& value) = 0;
   // gets the integer value of <name> from <key> and places it in
   // <value>.  Returns non zero on error (if value is not an integer).
-  
-  virtual int get_binary_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
-                                void*& data, 
+
+  virtual int get_binary_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
+                                void*& data,
                                 u_int& length) = 0;
   // gets the binary value of <name> from <key> and places a copy in
   // <data> and sets <length> to the length of the data.  caller is
@@ -212,19 +212,19 @@ public:
   virtual int find_value(const ACE_Configuration_Section_Key& key,
                          const ACE_TCHAR* name,
                          VALUETYPE& type) = 0;
-  // checks to see if an entry of <name> is in <key> and places the 
-  // data type in <type>.  Returns 0 on success (entry is found), 
+  // checks to see if an entry of <name> is in <key> and places the
+  // data type in <type>.  Returns 0 on success (entry is found),
   // -1 on error
 
 
-  virtual int remove_value (const ACE_Configuration_Section_Key& key, 
+  virtual int remove_value (const ACE_Configuration_Section_Key& key,
                             const ACE_TCHAR* name) = 0;
   // Removes the the value <name> from <key>.  returns non zero on
   // error.
 
-  int expand_path (const ACE_Configuration_Section_Key& key, 
-                   const ACE_TString& path_in, 
-                   ACE_Configuration_Section_Key& key_out, 
+  int expand_path (const ACE_Configuration_Section_Key& key,
+                   const ACE_TString& path_in,
+                   ACE_Configuration_Section_Key& key_out,
                    int create = 1);
   // Expands <path_in> to <key_out> from <key>.  If create is true,
   // the subsections are created.  Returns 0 on success, non zero on
@@ -242,19 +242,19 @@ public:
 protected:
   ACE_Configuration (void);
   // Default ctor
-  
-  ACE_Section_Key_Internal* get_internal_key 
+
+  ACE_Section_Key_Internal* get_internal_key
     (const ACE_Configuration_Section_Key& key);
   // resolves the internal key from a section key
-  
+
   int validate_name (const ACE_TCHAR* name);
   // tests to see if <name> is valid.  <name> must be < 255 characters
   // and not contain the path separator '\', brackets [] or = (maybe
   // just restrict to alphanumeric?) returns non zero if name is not
   // valid
 
-  int export_section (const ACE_Configuration_Section_Key& section, 
-                      const ACE_TString& path, 
+  int export_section (const ACE_Configuration_Section_Key& section,
+                      const ACE_TString& path,
                       FILE* out);
   // Used when exporting a configuration to a file
 
@@ -282,7 +282,7 @@ public:
 protected:
   virtual ~ACE_Section_Key_Win32 (void);
   // destructor - invokes <RegCloseKey>
-  
+
   // Not used
   ACE_Section_Key_Win32 (const ACE_Section_Key_Win32& rhs);
   ACE_Section_Key_Win32& operator= (const ACE_Section_Key_Win32& rhs);
@@ -306,61 +306,61 @@ public:
 
   virtual ~ACE_Configuration_Win32Registry (void);
   // destructor
-  
-  virtual int open_section (const ACE_Configuration_Section_Key& base, 
-                            const ACE_TCHAR* sub_section, 
-                            int create, 
+
+  virtual int open_section (const ACE_Configuration_Section_Key& base,
+                            const ACE_TCHAR* sub_section,
+                            int create,
                             ACE_Configuration_Section_Key& result);
-  
-  virtual int remove_section (const ACE_Configuration_Section_Key& key, 
-                              const ACE_TCHAR* sub_section, 
+
+  virtual int remove_section (const ACE_Configuration_Section_Key& key,
+                              const ACE_TCHAR* sub_section,
                               int recursive);
 
-  virtual int enumerate_values (const ACE_Configuration_Section_Key& key, 
-                                int Index, 
-                                ACE_TString& name, 
+  virtual int enumerate_values (const ACE_Configuration_Section_Key& key,
+                                int Index,
+                                ACE_TString& name,
                                 VALUETYPE& type);
-  
-  virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, 
-                                  int Index, 
+
+  virtual int enumerate_sections (const ACE_Configuration_Section_Key& key,
+                                  int Index,
                                   ACE_TString& name);
-  
-  virtual int set_string_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
+
+  virtual int set_string_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
                                 const ACE_TString& value);
-  
-  virtual int set_integer_value (const ACE_Configuration_Section_Key& key, 
-                                 const ACE_TCHAR* name, 
+
+  virtual int set_integer_value (const ACE_Configuration_Section_Key& key,
+                                 const ACE_TCHAR* name,
                                  u_int value);
-  
-  virtual int set_binary_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
-                                const void* data, 
+
+  virtual int set_binary_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
+                                const void* data,
                                 u_int length);
 
-  virtual int get_string_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
+  virtual int get_string_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
                                 ACE_TString& value);
-  
-  virtual int get_integer_value (const ACE_Configuration_Section_Key& key, 
-                                 const ACE_TCHAR* name, 
+
+  virtual int get_integer_value (const ACE_Configuration_Section_Key& key,
+                                 const ACE_TCHAR* name,
                                  u_int& value);
-  
-  virtual int get_binary_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
-                                void*& data, 
+
+  virtual int get_binary_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
+                                void*& data,
                                 u_int& length);
 
   virtual int find_value(const ACE_Configuration_Section_Key& key,
                          const ACE_TCHAR* name,
                          VALUETYPE& type);
 
-  virtual int remove_value (const ACE_Configuration_Section_Key& key, 
+  virtual int remove_value (const ACE_Configuration_Section_Key& key,
                             const ACE_TCHAR* name);
   // Removes the the value <name> from <key>.  returns non zero on error
 
-  static HKEY resolve_key (HKEY hKey, 
-                           const ACE_TCHAR* path, 
+  static HKEY resolve_key (HKEY hKey,
+                           const ACE_TCHAR* path,
                            int create = 1);
   // This method traverses <path> through <hKey>.  It is useful when
   // you want the HKEY for a specific registry key, especially when
@@ -384,10 +384,10 @@ protected:
 // ACE_Allocator version
 
 typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL,
-                                           ACE_SYNCH_MUTEX> > 
+                                           ACE_SYNCH_MUTEX> >
         PERSISTENT_ALLOCATOR;
 typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL,
-                                           ACE_SYNCH_MUTEX> > 
+                                           ACE_SYNCH_MUTEX> >
         HEAP_ALLOCATOR;
 
 class ACE_Export ACE_Configuration_ExtId
@@ -435,15 +435,15 @@ public:
   const ACE_TCHAR *name (void);
 };
 
-typedef ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int> 
+typedef ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int>
         SUBSECTION_MAP;
 typedef ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId,
                                 int,
                                 ACE_Hash<ACE_Configuration_ExtId>,
                                 ACE_Equal_To<ACE_Configuration_ExtId>,
-                                ACE_Null_Mutex> 
+                                ACE_Null_Mutex>
         SUBSECTION_HASH;
-typedef ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int> 
+typedef ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>
         SUBSECTION_ENTRY;
 
 class ACE_Export ACE_Configuration_Value_IntId
@@ -460,16 +460,16 @@ public:
 
   ACE_EXPLICIT ACE_Configuration_Value_IntId (ACE_TCHAR* string);
   // string constructor, takes ownership of string
-  
+
   ACE_EXPLICIT ACE_Configuration_Value_IntId (u_int integer);
   // integer constructor
-  
+
   ACE_Configuration_Value_IntId (void* data, u_int length);
   // binary constructor, takes ownership of data
-  
+
   ACE_Configuration_Value_IntId (const ACE_Configuration_Value_IntId& rhs);
   // copy ctor
-  
+
   ~ACE_Configuration_Value_IntId (void);
   // destructor
 
@@ -483,7 +483,7 @@ public:
 
   ACE_Configuration::VALUETYPE      type_;
   void*                             data_;
-  // points to the string value or binary data or IS the integer 
+  // points to the string value or binary data or IS the integer
   // (XXX need to change this since sizeof (u_int) is
   // not the same accross different platforms)
   u_int                      length_;
@@ -491,7 +491,7 @@ public:
 };
 
 typedef ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId,
-                                    ACE_Configuration_Value_IntId> 
+                                    ACE_Configuration_Value_IntId>
         VALUE_MAP;
 typedef ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId,
                                 ACE_Configuration_Value_IntId,
@@ -500,7 +500,7 @@ typedef ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId,
                                 ACE_Null_Mutex>
         VALUE_HASH;
 typedef ACE_Hash_Map_Entry<ACE_Configuration_ExtId,
-                           ACE_Configuration_Value_IntId> 
+                           ACE_Configuration_Value_IntId>
         VALUE_ENTRY;
 
 class ACE_Export ACE_Configuration_Section_IntId
@@ -509,15 +509,15 @@ class ACE_Export ACE_Configuration_Section_IntId
   //     The internal ID for a section hash table
   //
   // = DESCRIPTION
-  //     Contains a hash table containing value name/values 
+  //     Contains a hash table containing value name/values
 public:
   ACE_Configuration_Section_IntId (void);
   // default ctor
 
-  ACE_EXPLICIT ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map, 
+  ACE_EXPLICIT ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map,
                                                 SUBSECTION_MAP* section_hash_map);
   // named ctor
-  
+
   ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs);
   // copy ctor
 
@@ -537,19 +537,19 @@ public:
   SUBSECTION_MAP* section_hash_map_;
 };
 typedef ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId,
-        ACE_Configuration_Section_IntId> 
+        ACE_Configuration_Section_IntId>
         SECTION_MAP;
 typedef ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId,
                                 ACE_Configuration_Section_IntId,
                                 ACE_Hash<ACE_Configuration_ExtId>,
                                 ACE_Equal_To<ACE_Configuration_ExtId>,
-                                ACE_Null_Mutex> 
+                                ACE_Null_Mutex>
         SECTION_HASH;
 typedef ACE_Hash_Map_Entry<ACE_Configuration_ExtId,
-                           ACE_Configuration_Section_IntId> 
+                           ACE_Configuration_Section_IntId>
         SECTION_ENTRY;
 
-class ACE_Export ACE_Configuration_Section_Key_Heap 
+class ACE_Export ACE_Configuration_Section_Key_Heap
   : public ACE_Section_Key_Internal
 {
   // = TITLE
@@ -561,10 +561,10 @@ class ACE_Export ACE_Configuration_Section_Key_Heap
 public:
   ACE_Configuration_Section_Key_Heap (const ACE_TCHAR* path);
   // constructor based on the full path of the section
-  
+
   ACE_TCHAR* path_;
   //the path itself
-  
+
   VALUE_HASH::ITERATOR* value_iter_;
   // The value iterator
 
@@ -573,7 +573,7 @@ public:
 protected:
   virtual ~ACE_Configuration_Section_Key_Heap (void);
   // destructor - will delete the iterators
-  
+
   // Not used
   ACE_Configuration_Section_Key_Heap (const ACE_Configuration_Section_Key_Heap& rhs);
   ACE_Configuration_Section_Key_Heap& operator= (const ACE_Configuration_Section_Key_Heap& rhs);
@@ -590,78 +590,78 @@ class ACE_Export ACE_Configuration_Heap : public ACE_Configuration
   //     representation of a configuraiton database. A persistent heap
   //     may be used to store configurations persistently
 public:
-  
+
   ACE_Configuration_Heap (void);
   // Default ctor
-  
+
   virtual ~ACE_Configuration_Heap (void);
   // destructor
 
-  int open (const ACE_TCHAR* file_name, 
-            void* base_address = ACE_DEFAULT_BASE_ADDR, 
+  int open (const ACE_TCHAR* file_name,
+            void* base_address = ACE_DEFAULT_BASE_ADDR,
             int default_map_size = ACE_DEFAULT_CONFIG_SECTION_SIZE);
   // opens a configuration based on a file name
 
   int open (int default_map_size = ACE_DEFAULT_CONFIG_SECTION_SIZE);
   // opens a heap based configuration
 
-  virtual int open_section (const ACE_Configuration_Section_Key& base, 
-                            const ACE_TCHAR* sub_section, 
+  virtual int open_section (const ACE_Configuration_Section_Key& base,
+                            const ACE_TCHAR* sub_section,
                             int create, ACE_Configuration_Section_Key& result);
-  
-  virtual int remove_section (const ACE_Configuration_Section_Key& key, 
-                              const ACE_TCHAR* sub_section, 
+
+  virtual int remove_section (const ACE_Configuration_Section_Key& key,
+                              const ACE_TCHAR* sub_section,
                               int recursive);
 
-  virtual int enumerate_values (const ACE_Configuration_Section_Key& key, 
-                                int Index, 
-                                ACE_TString& name, 
+  virtual int enumerate_values (const ACE_Configuration_Section_Key& key,
+                                int Index,
+                                ACE_TString& name,
                                 VALUETYPE& type);
-  
-  virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, 
-                                  int Index, 
+
+  virtual int enumerate_sections (const ACE_Configuration_Section_Key& key,
+                                  int Index,
                                   ACE_TString& name);
-  
-  virtual int set_string_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
+
+  virtual int set_string_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
                                 const ACE_TString& value);
-  
-  virtual int set_integer_value (const ACE_Configuration_Section_Key& key, 
-                                 const ACE_TCHAR* name, 
+
+  virtual int set_integer_value (const ACE_Configuration_Section_Key& key,
+                                 const ACE_TCHAR* name,
                                  u_int value);
-  
-  virtual int set_binary_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
-                                const void* data, 
+
+  virtual int set_binary_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
+                                const void* data,
                                 u_int length);
 
-  virtual int get_string_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
+  virtual int get_string_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
                                 ACE_TString& value);
-  
-  virtual int get_integer_value (const ACE_Configuration_Section_Key& key, 
-                                 const ACE_TCHAR* name, 
+
+  virtual int get_integer_value (const ACE_Configuration_Section_Key& key,
+                                 const ACE_TCHAR* name,
                                  u_int& value);
-  
-  virtual int get_binary_value (const ACE_Configuration_Section_Key& key, 
-                                const ACE_TCHAR* name, 
-                                void* &data, 
+
+  virtual int get_binary_value (const ACE_Configuration_Section_Key& key,
+                                const ACE_TCHAR* name,
+                                void* &data,
                                 u_int &length);
 
   virtual int find_value(const ACE_Configuration_Section_Key& key,
                          const ACE_TCHAR* name,
                          VALUETYPE& type);
 
-  virtual int remove_value (const ACE_Configuration_Section_Key& key, 
+  virtual int remove_value (const ACE_Configuration_Section_Key& key,
                             const ACE_TCHAR* name);
   // Removes the the value <name> from <key>.  returns non zero on error
 
 private:
-  int add_section (const ACE_Configuration_Section_Key& base, 
-                   const ACE_TCHAR* sub_section, 
+  int add_section (const ACE_Configuration_Section_Key& base,
+                   const ACE_TCHAR* sub_section,
                    ACE_Configuration_Section_Key& result);
   // adds a new section
-  
+
   int create_index (void);
   // Helper for the <open> method.
 
@@ -670,17 +670,17 @@ private:
   // allocated space.
 
   int value_open_helper (size_t hash_table_size, void *buffer);
-  
+
   int section_open_helper (size_t hash_table_size, void *buffer);
 
   int load_key (const ACE_Configuration_Section_Key& key, ACE_TString& name);
 
-  int new_section (const ACE_TString& section, 
+  int new_section (const ACE_TString& section,
                    ACE_Configuration_Section_Key& result);
 
   ACE_Configuration_Heap (const ACE_Configuration_Heap& rhs);
   ACE_Configuration_Heap& operator= (const ACE_Configuration_Heap& rhs);
-  
+
   ACE_Allocator *allocator_;
   SECTION_MAP *index_;
   int default_map_size_;
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 98223470f9b..c58ca345670 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -15,10 +15,10 @@
 #include "ace/Containers_T.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Containers_T, "$Id$") 
+ACE_RCSID(ace, Containers_T, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Stack)
-  
+
 template <class T> void
 ACE_Bounded_Stack<T>::dump (void) const
 {
@@ -445,7 +445,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void)
                              <T>);
       this->cur_size_--;
       // @@ Doesnt make sense to have this check since
-      // this will always be true. 
+      // this will always be true.
       //   ACE_ASSERT (this->cur_size_ >= 0);
     }
 
@@ -680,7 +680,7 @@ ACE_Unbounded_Queue_Iterator<T>::next (T *&item)
 
 //--------------------------------------------------
 ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator_Base)
-  
+
 template <class T>
 ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (ACE_Double_Linked_List<T> &dll)
   : current_ (0), dllist_ (&dll)
@@ -717,7 +717,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::done (void) const
   return this->not_done () ? 0 : 1;
 }
 
-template <class T> T & 
+template <class T> T &
 ACE_Double_Linked_List_Iterator_Base<T>::operator* (void) const
 {
   return *(this->not_done ());
@@ -789,7 +789,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
 
 //--------------------------------------------------
 ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator)
-  
+
 template <class T>
 ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &dll)
   : ACE_Double_Linked_List_Iterator_Base <T> (dll)
@@ -988,7 +988,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- (int)
 
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List)
-  
+
   template <class T>
 ACE_Double_Linked_List<T>:: ACE_Double_Linked_List (ACE_Allocator *alloc)
   : size_ (0), allocator_ (alloc)
@@ -1076,7 +1076,7 @@ ACE_Double_Linked_List<T>::delete_head (void)
   temp = ACE_static_cast (T *,
                           this->head_->next_);
   // Detach it from the list.
-  this->remove_element (temp);  
+  this->remove_element (temp);
   return temp;
 }
 
@@ -1091,7 +1091,7 @@ ACE_Double_Linked_List<T>::delete_tail (void)
   temp = ACE_static_cast (T *,
                           this->head_->prev_);
   // Detach it from the list.
-  this->remove_element (temp);  
+  this->remove_element (temp);
   return temp;
 }
 
diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp
index 70f605762a9..35463c05aaf 100644
--- a/ace/DEV_Connector.cpp
+++ b/ace/DEV_Connector.cpp
@@ -33,7 +33,7 @@ ACE_DEV_Connector::connect (ACE_DEV_IO &new_io,
 {
   ACE_TRACE ("ACE_DEV_Connector::connect");
 
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout, 
+  ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout, 
 					      remote_sap.get_path_name (),
 					      flags, perms);
   new_io.set_handle (handle);
diff --git a/ace/DLL.cpp b/ace/DLL.cpp
index f198472df81..9a247b17b73 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -71,9 +71,9 @@ ACE_DLL::open (const ACE_TCHAR *dll_filename,
 
   // Transform the pathname into the appropriate dynamic link library
   // by searching the ACE_LD_SEARCH_PATH.
-  int result = ACE::ldfind (dll_filename,
-                            dll_pathname,
-                            (sizeof dll_pathname / sizeof (ACE_TCHAR)));
+  int result = ACE_Lib_Find::ldfind (dll_filename,
+                                     dll_pathname,
+                                     (sizeof dll_pathname / sizeof (ACE_TCHAR)));
   // Check for errors
   if (result != 0)
     return result;
diff --git a/ace/FIFO.h b/ace/FIFO.h
index 8f0f44a9321..7732405695d 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -19,6 +19,7 @@
 #include "ace/pre.h"
 
 #include "ace/IPC_SAP.h"
+#include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index bd43c34135b..77906851333 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -27,8 +27,9 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
       ACE_OS::strcpy (this->filename_,
                       ACE_DEFAULT_TEMP_FILE);
 #else /* ACE_DEFAULT_TEMP_FILE */
-      if (ACE::get_temp_dir (this->filename_, 
-                             MAXPATHLEN - 15) == -1) // -15 for ace-file-XXXXXX
+      if (ACE_Lib_Find::get_temp_dir (this->filename_, 
+                                      MAXPATHLEN - 15) == -1) 
+        // -15 for ace-file-XXXXXX
         {
           ACE_ERROR ((LM_ERROR, 
                       ACE_LIB_TEXT ("Temporary path too long, ")
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index 8ab7c4c17b5..b952c1e45f2 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/ACE.h"
+#include "ace/ACE_Flag_Manip.h"
 
 class ACE_Export ACE_FILE_Addr : public ACE_Addr
 {
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index 50837e887af..0ff25ac87e8 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -40,7 +40,7 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
 
   // Check to see if caller has requested that we create the filename.
   if (ACE_reinterpret_cast (const ACE_Addr &,
-                            ACE_const_cast (ACE_FILE_Addr &, 
+                            ACE_const_cast (ACE_FILE_Addr &,
                                             remote_sap)) == ACE_Addr::sap_any)
     // Create a new temporary file.
     new_io.addr_ =
@@ -48,11 +48,10 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
   else
     new_io.addr_ = remote_sap; // class copy.
 
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout, 
-                                              new_io.addr_.get_path_name (),
-                                              flags,
-                                              perms);
+  ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout,
+                                                         new_io.addr_.get_path_name (),
+                                                         flags,
+                                                         perms);
   new_io.set_handle (handle);
   return handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
-
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index 09146c11940..f3ad46c46b7 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -65,7 +65,7 @@ ACE_IO_SAP::enable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          ACE_IO_SAP::pid_) == -1
-          || ACE::set_flags (this->handle_,
+          || ACE_Flag_Manip::set_flags (this->handle_,
                              FASYNC) == -1)
         return -1;
       break;
@@ -76,7 +76,7 @@ ACE_IO_SAP::enable (int value) const
       ACE_NOTSUP_RETURN (-1);
 #endif /* SIGIO <== */
     case ACE_NONBLOCK:
-      if (ACE::set_flags (this->handle_,
+      if (ACE_Flag_Manip::set_flags (this->handle_,
                           ACE_NONBLOCK) == -1)
         return -1;
       break;
@@ -117,7 +117,7 @@ ACE_IO_SAP::disable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          0) == -1
-          || ACE::clr_flags (this->handle_, FASYNC) == -1)
+          || ACE_Flag_Manip::clr_flags (this->handle_, FASYNC) == -1)
         return -1;
       break;
 #else
@@ -127,8 +127,8 @@ ACE_IO_SAP::disable (int value) const
       ACE_NOTSUP_RETURN (-1);
 #endif /* SIGIO <== */
     case ACE_NONBLOCK:
-      if (ACE::clr_flags (this->handle_,
-                          ACE_NONBLOCK) == -1)
+      if (ACE_Flag_Manip::clr_flags (this->handle_,
+                                     ACE_NONBLOCK) == -1)
         return -1;
       break;
     default:
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 6f41465ebfb..db746f28a84 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -18,7 +18,7 @@
 #define ACE_IO_SAP_H
 #include "ace/pre.h"
 
-#include "ace/ACE.h"
+#include "ace/ACE_Flag_Manip.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index c3a05093563..5caccb2a86a 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -79,8 +79,8 @@ ACE_IPC_SAP::enable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          ACE_IPC_SAP::pid_) == -1 
-          || ACE::set_flags (this->handle_,
-                             FASYNC) == -1)
+          || ACE_Flag_Manip::set_flags (this->handle_,
+                                        FASYNC) == -1)
         return -1;
       break;
 #else
@@ -97,8 +97,8 @@ ACE_IPC_SAP::enable (int value) const
       break;
 #endif /* F_SETFD */
     case ACE_NONBLOCK:
-      if (ACE::set_flags (this->handle_,
-                          ACE_NONBLOCK) == ACE_INVALID_HANDLE)
+      if (ACE_Flag_Manip::set_flags (this->handle_,
+                                     ACE_NONBLOCK) == ACE_INVALID_HANDLE)
         return -1;
       break;
     default:
@@ -114,7 +114,7 @@ int
 ACE_IPC_SAP::disable (int value) const
 {
   ACE_TRACE ("ACE_IPC_SAP::disable");
-
+  
 #if defined (ACE_WIN32) || defined (VXWORKS)
   switch (value)
     {
@@ -151,8 +151,8 @@ ACE_IPC_SAP::disable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          0) == -1 
-          || ACE::clr_flags (this->handle_,
-                             FASYNC) == -1)
+          || ACE_Flag_Manip::clr_flags (this->handle_,
+                                        FASYNC) == -1)
         return -1;
       break;
 #else
@@ -169,8 +169,8 @@ ACE_IPC_SAP::disable (int value) const
       break;
 #endif /* F_SETFD */
     case ACE_NONBLOCK:
-      if (ACE::clr_flags (this->handle_,
-                          ACE_NONBLOCK) == -1)
+      if (ACE_Flag_Manip::clr_flags (this->handle_,
+                                     ACE_NONBLOCK) == -1)
         return -1;
       break;
     default:
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index 910dfe1c7e1..7a9709cca34 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -18,7 +18,7 @@
 #define ACE_IPC_SAP_H
 #include "ace/pre.h"
 
-#include "ace/ACE.h"
+#include "ace/ACE_Flag_Manip.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp
index 43d5336e831..4d19e34842f 100644
--- a/ace/Logging_Strategy.cpp
+++ b/ace/Logging_Strategy.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(lib, Logging_Strategy, "$Id$")
 // Parse the string containing (thread) priorities and set them accordingly.
 
 void
-ACE_Logging_Strategy::priorities (ACE_TCHAR *priority_string, 
+ACE_Logging_Strategy::priorities (ACE_TCHAR *priority_string,
                                   ACE_Log_Msg::MASK_TYPE mask)
 {
   u_long priority_mask = 0;
@@ -169,8 +169,8 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void)
   ACE_NEW (this->filename_, ACE_TCHAR[MAXPATHLEN + 1]);
 
   // Get the temporary directory
-  if (ACE::get_temp_dir (this->filename_,
-                         MAXPATHLEN - 7) == -1)  // 7 for "logfile"
+  if (ACE_Lib_Find::get_temp_dir (this->filename_,
+                                  MAXPATHLEN - 7) == -1)  // 7 for "logfile"
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_LIB_TEXT ("Temporary path too long, ")
@@ -197,7 +197,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
   ACE_TRACE ("ACE_Logging_Strategy::init");
 
   // Store current priority masks for changes in <parse_args>.
-  
+
   this->process_priority_mask_ =
     ACE_Log_Msg::instance ()->priority_mask (ACE_Log_Msg::PROCESS);
 
@@ -209,10 +209,10 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
 
   // Setup priorities (to original if not specified on command line)
 
-  ACE_Log_Msg::instance ()->priority_mask (thread_priority_mask_, 
+  ACE_Log_Msg::instance ()->priority_mask (thread_priority_mask_,
                                            ACE_Log_Msg::THREAD);
 
-  ACE_Log_Msg::instance ()->priority_mask (process_priority_mask_, 
+  ACE_Log_Msg::instance ()->priority_mask (process_priority_mask_,
                                            ACE_Log_Msg::PROCESS);
 
   // Check if any flags were specified. If none were specified, let
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index ad93c7dcee9..38f11fec844 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -124,7 +124,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
     {
       ACE_TCHAR name[25];
       // - 24 is so we can append name to the end.
-      if (ACE::get_temp_dir (buf, MAXPATHLEN - 24) == -1)
+      if (ACE_Lib_Find::get_temp_dir (buf, MAXPATHLEN - 24) == -1)
         {
           ACE_ERROR ((LM_ERROR, 
                       ACE_LIB_TEXT ("Temporary path too long, ")
@@ -183,10 +183,10 @@ ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream,
 
       // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
       // originally.
-      ACE::clr_flags (this->get_handle (),
-                      ACE_NONBLOCK);
-      ACE::clr_flags (new_handle,
-                      ACE_NONBLOCK);
+      ACE_Flag_Manip::clr_flags (this->get_handle (),
+                                 ACE_NONBLOCK);
+      ACE_Flag_Manip::clr_flags (new_handle,
+                                 ACE_NONBLOCK);
     }
 
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h
index 161c7330048..ba9dc33f615 100644
--- a/ace/MEM_SAP.h
+++ b/ace/MEM_SAP.h
@@ -18,7 +18,7 @@
 #define ACE_MEM_SAP_H
 #include "ace/pre.h"
 
-#include "ace/Malloc.h"
+#include "ace/PI_Malloc.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Makefile b/ace/Makefile
index dd5e1e977ad..f08055dd5d9 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -21,6 +21,12 @@ OS_FILES = \
   Sched_Params
 UTILS_FILES = \
   ACE \
+  ACE_Init \
+  ACE_Flag_Manip \
+  ACE_Handle_Ops \
+  ACE_Lib_Find \
+  ACE_Sock_Connect \
+  Malloc_Instantiations \
   Active_Map_Manager \
   Arg_Shifter \
   ARGV \
@@ -169,6 +175,7 @@ SVCCONF_FILES = \
   Service_Object \
   Service_Repository \
   Service_Types \
+  Service_Templates \
   Shared_Object \
   Svc_Conf_l \
   Svc_Conf_y
@@ -182,6 +189,8 @@ STREAMS_FILES = \
 MEMORY_FILES = \
   Based_Pointer_Repository \
   Malloc \
+  PI_Malloc \
+  Malloc_Allocator \
   Mem_Map \
   Memory_Pool \
   Obstack \
@@ -560,11 +569,11 @@ endif # GHS
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Basic_Types.o .obj/Basic_Types.so .shobj/Basic_Types.o .shobj/Basic_Types.so: Basic_Types.cpp \
- OS.h \
+.obj/Basic_Types.o .obj/Basic_Types.so .shobj/Basic_Types.o .shobj/Basic_Types.so: Basic_Types.cpp OS.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -572,6 +581,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -593,6 +603,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -600,6 +611,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -622,11 +634,11 @@ endif # GHS
  Base_Thread_Adapter.inl \
  OS_Thread_Adapter.inl
 
-.obj/OS_Dirent.o .obj/OS_Dirent.so .shobj/OS_Dirent.o .shobj/OS_Dirent.so: OS_Dirent.cpp \
- OS_Dirent.h \
+.obj/OS_Dirent.o .obj/OS_Dirent.so .shobj/OS_Dirent.o .shobj/OS_Dirent.so: OS_Dirent.cpp OS_Dirent.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -634,16 +646,17 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  OS_Dirent.inl \
  OS_String.h \
  OS_String.inl
 
-.obj/OS_Memory.o .obj/OS_Memory.so .shobj/OS_Memory.o .shobj/OS_Memory.so: OS_Memory.cpp \
- OS_Memory.h \
+.obj/OS_Memory.o .obj/OS_Memory.so .shobj/OS_Memory.o .shobj/OS_Memory.so: OS_Memory.cpp OS_Memory.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -651,14 +664,15 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  OS_Memory.inl
 
-.obj/OS_String.o .obj/OS_String.so .shobj/OS_String.o .shobj/OS_String.so: OS_String.cpp \
- OS_String.h \
+.obj/OS_String.o .obj/OS_String.so .shobj/OS_String.o .shobj/OS_String.so: OS_String.cpp OS_String.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -666,6 +680,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  OS_String.inl \
  OS_Memory.h \
@@ -675,6 +690,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -682,6 +698,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  OS_TLI.inl
 
@@ -690,6 +707,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -697,6 +715,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  Base_Thread_Adapter.inl \
  OS.h \
@@ -721,6 +740,7 @@ endif # GHS
  Base_Thread_Adapter.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -728,6 +748,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  Base_Thread_Adapter.inl \
  OS_Thread_Adapter.inl \
@@ -753,6 +774,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -760,6 +782,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  OS.h \
  OS_Dirent.h \
@@ -783,6 +806,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -790,6 +814,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -812,6 +837,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -819,6 +845,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -834,21 +861,22 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.h \
  Handle_Set.i \
  Auto_Ptr.h \
  Auto_Ptr.i \
  Auto_Ptr.cpp \
- INET_Addr.h \
- Addr.h \
- Addr.i \
- INET_Addr.i \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  SString.h \
  SString.i \
  Malloc_Base.h \
@@ -859,16 +887,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -878,16 +901,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -907,12 +930,289 @@ endif # GHS
  Message_Block_T.i \
  Message_Block_T.cpp
 
+.obj/ACE_Init.o .obj/ACE_Init.so .shobj/ACE_Init.o .shobj/ACE_Init.so: ACE_Init.cpp ACE_Init.h \
+ pre.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Init.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
+
+.obj/ACE_Flag_Manip.o .obj/ACE_Flag_Manip.so .shobj/ACE_Flag_Manip.o .shobj/ACE_Flag_Manip.so: ACE_Flag_Manip.cpp ACE_Flag_Manip.h pre.h OS.h \
+ pre.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.h \
+ OS.i \
+ ACE_Flag_Manip.i
+
+.obj/ACE_Handle_Ops.o .obj/ACE_Handle_Ops.so .shobj/ACE_Handle_Ops.o .shobj/ACE_Handle_Ops.so: ACE_Handle_Ops.cpp \
+ ACE_Handle_Ops.h \
+ pre.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Handle_Ops.i
+
+.obj/ACE_Lib_Find.o .obj/ACE_Lib_Find.so .shobj/ACE_Lib_Find.o .shobj/ACE_Lib_Find.so: ACE_Lib_Find.cpp \
+ ACE_Lib_Find.h \
+ pre.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Lib_Find.i \
+ Log_Msg.h \
+ Log_Record.h \
+ Log_Priority.h \
+ Log_Record.i
+
+.obj/ACE_Sock_Connect.o .obj/ACE_Sock_Connect.so .shobj/ACE_Sock_Connect.o .shobj/ACE_Sock_Connect.so: ACE_Sock_Connect.cpp \
+ ACE_Sock_Connect.h \
+ pre.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Sock_Connect.i \
+ INET_Addr.h \
+ ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE.i \
+ Addr.h \
+ Addr.i \
+ INET_Addr.i \
+ Log_Msg.h \
+ Log_Record.h \
+ Log_Priority.h \
+ Log_Record.i \
+ Handle_Set.h \
+ Handle_Set.i \
+ Auto_Ptr.h \
+ Auto_Ptr.i \
+ Auto_Ptr.cpp
+
+.obj/Malloc_Instantiations.o .obj/Malloc_Instantiations.so .shobj/Malloc_Instantiations.o .shobj/Malloc_Instantiations.so: Malloc_Instantiations.cpp \
+ Malloc.h \
+ pre.h \
+ ACE.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
+ Log_Msg.h \
+ Log_Record.h \
+ Log_Priority.h \
+ Log_Record.i \
+ Malloc.i \
+ Malloc_T.h \
+ Synch.h \
+ Synch.i \
+ Synch_T.h \
+ Synch_T.i \
+ Thread.h \
+ Thread_Adapter.h \
+ Base_Thread_Adapter.h \
+ Base_Thread_Adapter.inl \
+ Thread_Adapter.inl \
+ Thread.i \
+ Atomic_Op.i \
+ Synch_T.cpp \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
+ Free_List.h \
+ Free_List.i \
+ Free_List.cpp \
+ Malloc_T.i \
+ Malloc_T.cpp \
+ Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
+ Signal.h \
+ Containers.h \
+ Containers.i \
+ Containers_T.h \
+ Containers_T.i \
+ Containers_T.cpp \
+ Signal.i \
+ Mem_Map.h \
+ Mem_Map.i \
+ SV_Semaphore_Complex.h \
+ SV_Semaphore_Simple.h \
+ SV_Semaphore_Simple.i \
+ SV_Semaphore_Complex.i \
+ Memory_Pool.i
+
 .obj/Active_Map_Manager.o .obj/Active_Map_Manager.so .shobj/Active_Map_Manager.o .shobj/Active_Map_Manager.so: Active_Map_Manager.cpp \
  Active_Map_Manager.h \
  pre.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -920,6 +1220,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -940,11 +1241,19 @@ endif # GHS
  Map_Manager.h \
  Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -961,27 +1270,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -1009,6 +1310,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -1023,6 +1325,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1030,6 +1333,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1052,6 +1356,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1059,6 +1364,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1074,6 +1380,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Containers.h \
  Malloc_Base.h \
@@ -1086,16 +1402,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1105,21 +1416,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -1137,6 +1443,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1144,6 +1451,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1161,11 +1469,19 @@ endif # GHS
  OS.i \
  Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1182,27 +1498,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -1230,6 +1538,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -1247,11 +1556,11 @@ endif # GHS
  Hash_Map_Manager_T.cpp \
  Capabilities.i
 
-.obj/Containers.o .obj/Containers.so .shobj/Containers.o .shobj/Containers.so: Containers.cpp \
- OS.h \
+.obj/Containers.o .obj/Containers.so .shobj/Containers.o .shobj/Containers.so: Containers.cpp OS.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1259,6 +1568,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1279,6 +1589,16 @@ endif # GHS
  Containers.i \
  Containers_T.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Containers_T.i \
  Containers_T.cpp \
@@ -1287,16 +1607,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1306,21 +1621,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -1338,6 +1648,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1345,6 +1656,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1360,6 +1672,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SString.h \
  SString.i \
@@ -1380,8 +1702,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1396,6 +1716,8 @@ endif # GHS
  Service_Object.h \
  Shared_Object.h \
  Shared_Object.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Service_Object.i \
  Signal.h \
  Containers.h \
@@ -1404,20 +1726,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -1438,6 +1750,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -1451,6 +1764,7 @@ endif # GHS
  OS_Dirent.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1458,6 +1772,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  OS_Dirent.inl \
  Dirent.i \
@@ -1479,13 +1794,13 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/Dynamic.o .obj/Dynamic.so .shobj/Dynamic.o .shobj/Dynamic.so: Dynamic.cpp \
- Dynamic.h \
+.obj/Dynamic.o .obj/Dynamic.so .shobj/Dynamic.o .shobj/Dynamic.so: Dynamic.cpp Dynamic.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1493,6 +1808,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1508,10 +1824,18 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch.h \
  Synch.i \
  Synch_T.i \
@@ -1537,14 +1861,14 @@ endif # GHS
  Managed_Object.cpp \
  Dynamic.i
 
-.obj/Functor.o .obj/Functor.so .shobj/Functor.o .shobj/Functor.so: Functor.cpp \
- Functor_T.h \
+.obj/Functor.o .obj/Functor.so .shobj/Functor.o .shobj/Functor.so: Functor.cpp Functor_T.h \
  pre.h \
  Functor.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1552,6 +1876,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1567,18 +1892,28 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Functor.i \
  Functor_T.i \
  Functor_T.cpp
 
-.obj/Get_Opt.o .obj/Get_Opt.so .shobj/Get_Opt.o .shobj/Get_Opt.so: Get_Opt.cpp \
- Get_Opt.h \
+.obj/Get_Opt.o .obj/Get_Opt.so .shobj/Get_Opt.o .shobj/Get_Opt.so: Get_Opt.cpp Get_Opt.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1586,6 +1921,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1601,6 +1937,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Get_Opt.i \
  Log_Msg.h \
@@ -1614,6 +1960,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1621,6 +1968,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1638,6 +1986,16 @@ endif # GHS
  OS.i \
  Functor.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Functor.i \
  Functor_T.h \
@@ -1652,8 +2010,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1668,6 +2024,8 @@ endif # GHS
  Service_Object.h \
  Shared_Object.h \
  Shared_Object.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Service_Object.i \
  Signal.h \
  Containers.h \
@@ -1677,20 +2035,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -1713,6 +2061,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -1726,6 +2075,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1733,6 +2083,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1748,6 +2099,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  High_Res_Timer.i \
  Stats.h \
@@ -1762,16 +2123,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1781,21 +2137,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -1805,7 +2156,12 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
- Stats.i
+ Stats.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Method_Request.o .obj/Method_Request.so .shobj/Method_Request.o .shobj/Method_Request.so: Method_Request.cpp \
  Method_Request.h \
@@ -1813,6 +2169,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1820,6 +2177,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1842,6 +2200,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1849,6 +2208,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -1871,11 +2231,19 @@ endif # GHS
  Token_Manager.h \
  Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -1893,22 +2261,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -1936,6 +2301,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -1946,28 +2312,22 @@ endif # GHS
  Synch_Options.i \
  Local_Tokens.i \
  Token_Manager.i \
- Naming_Context.h \
- Name_Proxy.h \
- INET_Addr.h \
- Addr.h \
- Addr.i \
- INET_Addr.i \
- SOCK_Connector.h \
+ Service_Manager.h \
  SOCK_Stream.h \
  SOCK_IO.h \
  SOCK.h \
+ Addr.h \
+ Addr.i \
  IPC_SAP.h \
  IPC_SAP.i \
  QoS_Session.h \
+ INET_Addr.h \
+ INET_Addr.i \
  SOCK.i \
  SOCK_IO.i \
  SOCK_Stream.i \
- Time_Value.h \
- SOCK_Connector.i \
- Name_Request_Reply.h \
- Name_Space.h \
- Service_Manager.h \
  SOCK_Acceptor.h \
+ Time_Value.h \
  SOCK_Acceptor.i \
  Service_Manager.i
 
@@ -1978,6 +2338,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -1985,6 +2346,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2000,18 +2362,28 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Time_Value.h \
  High_Res_Timer.h \
  High_Res_Timer.i \
  Profile_Timer.i
 
-.obj/Registry.o .obj/Registry.so .shobj/Registry.o .shobj/Registry.so: Registry.cpp \
- Registry.h \
+.obj/Registry.o .obj/Registry.so .shobj/Registry.o .shobj/Registry.so: Registry.cpp Registry.h \
  pre.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2019,6 +2391,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2035,13 +2408,13 @@ endif # GHS
  Trace.h \
  OS.i
 
-.obj/SString.o .obj/SString.so .shobj/SString.o .shobj/SString.so: SString.cpp \
- Malloc.h \
+.obj/SString.o .obj/SString.so .shobj/SString.o .shobj/SString.so: SString.cpp Malloc.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2049,6 +2422,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2064,22 +2438,26 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -2089,21 +2467,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -2131,6 +2505,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -2146,6 +2521,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2153,6 +2529,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2168,6 +2545,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Containers.h \
  Malloc_Base.h \
@@ -2180,16 +2567,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -2199,21 +2581,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -2231,6 +2608,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2238,6 +2616,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2255,6 +2634,16 @@ endif # GHS
  OS.i \
  Memory_Pool.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Event_Handler.h \
  Event_Handler.i \
@@ -2282,20 +2671,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -2317,6 +2696,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2324,6 +2704,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2341,6 +2722,16 @@ endif # GHS
  OS.i \
  SString.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SString.i \
  Malloc_Base.h \
@@ -2349,11 +2740,11 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/Timeprobe.o .obj/Timeprobe.so .shobj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp \
- OS.h \
+.obj/Timeprobe.o .obj/Timeprobe.so .shobj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp OS.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2361,6 +2752,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2386,6 +2778,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2393,6 +2786,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2409,11 +2803,19 @@ endif # GHS
  Trace.h \
  OS.i \
  Synch_T.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -2430,6 +2832,9 @@ endif # GHS
  Log_Record.i \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -2440,20 +2845,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -2482,6 +2877,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2489,6 +2885,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2505,11 +2902,19 @@ endif # GHS
  Trace.h \
  OS.i \
  Synch_T.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -2526,6 +2931,9 @@ endif # GHS
  Log_Record.i \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -2536,20 +2944,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -2572,6 +2970,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2579,6 +2978,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2595,11 +2995,19 @@ endif # GHS
  Trace.h \
  OS.i \
  Synch_T.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -2616,6 +3024,9 @@ endif # GHS
  Log_Record.i \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -2626,20 +3037,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -2659,6 +3060,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2666,6 +3068,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2685,6 +3088,16 @@ endif # GHS
  Containers.i \
  Containers_T.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Containers_T.i \
  Containers_T.cpp \
@@ -2693,16 +3106,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -2712,21 +3120,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -2738,6 +3141,7 @@ endif # GHS
  Memory_Pool.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp
 
@@ -2750,6 +3154,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2757,6 +3162,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2773,11 +3179,19 @@ endif # GHS
  Trace.h \
  OS.i \
  Synch_T.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -2794,6 +3208,9 @@ endif # GHS
  Log_Record.i \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -2804,20 +3221,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -2833,14 +3240,14 @@ endif # GHS
  High_Res_Timer.h \
  High_Res_Timer.i
 
-.obj/Filecache.o .obj/Filecache.so .shobj/Filecache.o .shobj/Filecache.so: Filecache.cpp \
- Filecache.h \
+.obj/Filecache.o .obj/Filecache.so .shobj/Filecache.o .shobj/Filecache.so: Filecache.cpp Filecache.h \
  pre.h \
  Mem_Map.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2848,6 +3255,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2863,11 +3271,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Mem_Map.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch.h \
  Synch.i \
  Synch_T.i \
@@ -2896,6 +3312,8 @@ endif # GHS
  Service_Object.h \
  Shared_Object.h \
  Shared_Object.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Service_Object.i \
  Signal.h \
  Containers.h \
@@ -2905,20 +3323,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -2939,19 +3347,26 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
  Reactor_Impl.h \
- Svc_Conf_Tokens.h
+ Svc_Conf_Tokens.h \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Dump.o .obj/Dump.so .shobj/Dump.o .shobj/Dump.so: Dump.cpp Synch_T.h \
  pre.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -2959,6 +3374,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -2974,9 +3390,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -3000,10 +3424,10 @@ endif # GHS
  Managed_Object.i \
  Managed_Object.cpp
 
-.obj/Log_Msg.o .obj/Log_Msg.so .shobj/Log_Msg.o .shobj/Log_Msg.so: Log_Msg.cpp \
- config-all.h \
+.obj/Log_Msg.o .obj/Log_Msg.so .shobj/Log_Msg.o .shobj/Log_Msg.so: Log_Msg.cpp config-all.h \
  pre.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3011,6 +3435,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  ACE.h \
  OS.h \
  OS_Dirent.h \
@@ -3028,6 +3453,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread_Manager.h \
  Thread.h \
@@ -3039,8 +3474,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Atomic_Op.i \
  Synch_T.cpp \
@@ -3055,26 +3488,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -3084,6 +3509,14 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  SOCK_Connector.h \
  SOCK_Stream.h \
@@ -3108,6 +3541,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3115,6 +3549,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3134,6 +3569,16 @@ endif # GHS
  Log_Record.i \
  Log_Msg.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i
 
 .obj/Logging_Strategy.o .obj/Logging_Strategy.so .shobj/Logging_Strategy.o .shobj/Logging_Strategy.so: Logging_Strategy.cpp \
@@ -3143,6 +3588,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3150,6 +3596,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3165,6 +3612,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Get_Opt.i \
  Log_Msg.h \
@@ -3178,8 +3635,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -3193,6 +3648,9 @@ endif # GHS
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -3203,20 +3661,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -3236,10 +3684,10 @@ endif # GHS
  Shared_Object.i \
  Service_Object.i
 
-.obj/Trace.o .obj/Trace.so .shobj/Trace.o .shobj/Trace.so: Trace.cpp \
- config-all.h \
+.obj/Trace.o .obj/Trace.so .shobj/Trace.o .shobj/Trace.so: Trace.cpp config-all.h \
  pre.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3247,6 +3695,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  Trace.h \
  OS.h \
  OS_Dirent.h \
@@ -3272,11 +3721,12 @@ endif # GHS
  Activation_Queue.h \
  pre.h \
  Synch_T.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3284,6 +3734,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3299,9 +3750,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -3319,27 +3778,19 @@ endif # GHS
  Message_Queue.h \
  Message_Block.h \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -3377,6 +3828,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -3385,6 +3837,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -3414,6 +3874,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3421,6 +3882,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3439,6 +3901,16 @@ endif # GHS
  Process.h \
  SString.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SString.i \
  Malloc_Base.h \
@@ -3454,16 +3926,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -3473,21 +3940,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -3502,11 +3964,12 @@ endif # GHS
 .obj/Process_Manager.o .obj/Process_Manager.so .shobj/Process_Manager.o .shobj/Process_Manager.so: Process_Manager.cpp \
  Synch_T.h \
  pre.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3514,6 +3977,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3529,9 +3993,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -3552,26 +4024,18 @@ endif # GHS
  Malloc_Base.h \
  Process.i \
  Signal.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Containers.i \
  Containers_T.h \
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -3592,11 +4056,17 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
  Reactor_Impl.h \
- Process_Manager.i
+ Process_Manager.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Synch.o .obj/Synch.so .shobj/Synch.o .shobj/Synch.so: Synch.cpp Thread.h \
  pre.h \
@@ -3604,6 +4074,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3611,6 +4082,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3626,6 +4098,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread_Adapter.h \
  Base_Thread_Adapter.h \
@@ -3633,8 +4115,6 @@ endif # GHS
  Thread_Adapter.inl \
  Thread.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch.h \
  Synch.i \
  Synch_T.i \
@@ -3652,6 +4132,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3659,6 +4140,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3674,6 +4156,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch_Options.i
 
@@ -3685,6 +4177,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3692,6 +4185,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3707,11 +4201,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -3736,6 +4238,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3743,6 +4246,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  SV_Semaphore_Complex.h \
  SV_Semaphore_Simple.h \
  ACE.h \
@@ -3762,6 +4266,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
@@ -3769,8 +4283,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -3792,6 +4304,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3799,6 +4312,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3821,12 +4335,12 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/File_Lock.o .obj/File_Lock.so .shobj/File_Lock.o .shobj/File_Lock.so: File_Lock.cpp \
- File_Lock.h \
+.obj/File_Lock.o .obj/File_Lock.so .shobj/File_Lock.o .shobj/File_Lock.so: File_Lock.cpp File_Lock.h \
  pre.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3834,6 +4348,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3861,6 +4376,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3868,6 +4384,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3883,6 +4400,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread_Adapter.h \
  Base_Thread_Adapter.h \
@@ -3893,11 +4420,12 @@ endif # GHS
 .obj/Thread_Manager.o .obj/Thread_Manager.so .shobj/Thread_Manager.o .shobj/Thread_Manager.so: Thread_Manager.cpp \
  Synch_T.h \
  pre.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3905,6 +4433,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -3920,9 +4449,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -3945,26 +4482,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -3974,6 +4503,14 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Dynamic.h \
  Dynamic.i \
@@ -3990,6 +4527,7 @@ endif # GHS
  Base_Thread_Adapter.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -3997,6 +4535,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Export.h \
  Base_Thread_Adapter.inl \
  Thread_Adapter.inl \
@@ -4018,13 +4557,21 @@ endif # GHS
  Thread_Manager.h \
  Thread.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread.i \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Atomic_Op.i \
  Synch_T.cpp \
@@ -4039,26 +4586,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -4068,6 +4607,14 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Thread_Exit.h \
  Thread_Control.h \
@@ -4079,6 +4626,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4086,6 +4634,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS.h \
  OS_Dirent.h \
  OS_Export.h \
@@ -4106,11 +4655,19 @@ endif # GHS
  Thread_Control.inl \
  Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -4134,6 +4691,7 @@ endif # GHS
  config-all.h \
  pre.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4141,6 +4699,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  Thread_Control.h \
  OS.h \
  OS_Dirent.h \
@@ -4162,6 +4721,16 @@ endif # GHS
  Thread_Manager.h \
  Thread.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread_Adapter.h \
  Base_Thread_Adapter.h \
@@ -4171,8 +4740,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Atomic_Op.i \
  Synch_T.cpp \
@@ -4187,26 +4754,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -4216,6 +4775,14 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i
 
 .obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp Thread.h \
@@ -4224,6 +4791,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4231,6 +4799,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4246,6 +4815,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread_Adapter.h \
  Base_Thread_Adapter.h \
@@ -4256,8 +4835,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Atomic_Op.i \
  Synch_T.cpp \
@@ -4274,6 +4851,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4281,6 +4859,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4296,20 +4875,26 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Event_Handler.i \
  Message_Block.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
@@ -4322,15 +4907,9 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -4360,15 +4939,23 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
  Reactor_Impl.h \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i
 
-.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \
- FlReactor.h \
+.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp FlReactor.h \
  pre.h \
  Select_Reactor.h \
  Select_Reactor_T.h \
@@ -4379,6 +4966,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4386,6 +4974,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4401,11 +4990,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -4419,6 +5016,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -4426,20 +5025,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -4456,6 +5045,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -4481,6 +5071,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4488,6 +5079,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4503,6 +5095,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.i \
  Log_Msg.h \
@@ -4520,6 +5122,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4527,6 +5130,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4542,11 +5146,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -4560,6 +5172,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -4567,20 +5181,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -4597,6 +5201,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor_Impl.h \
@@ -4628,6 +5233,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -4658,6 +5271,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4665,6 +5279,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4688,6 +5303,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4695,6 +5311,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4714,6 +5331,16 @@ endif # GHS
  Containers.i \
  Containers_T.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Containers_T.i \
  Containers_T.cpp \
@@ -4722,16 +5349,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -4741,21 +5363,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -4770,6 +5387,7 @@ endif # GHS
  Select_Reactor_Base.h \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -4788,12 +5406,12 @@ endif # GHS
  Timer_Heap_T.cpp \
  Select_Reactor_T.i
 
-.obj/Proactor.o .obj/Proactor.so .shobj/Proactor.o .shobj/Proactor.so: Proactor.cpp \
- Proactor.h \
+.obj/Proactor.o .obj/Proactor.so .shobj/Proactor.o .shobj/Proactor.so: Proactor.cpp Proactor.h \
  pre.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4801,6 +5419,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4826,23 +5445,27 @@ endif # GHS
  Message_Queue.h \
  Message_Block.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -4852,16 +5475,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -4899,6 +5523,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -4907,6 +5532,9 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -4939,14 +5567,14 @@ endif # GHS
  Stream_Modules.h \
  Stream_Modules.cpp
 
-.obj/Reactor.o .obj/Reactor.so .shobj/Reactor.o .shobj/Reactor.so: Reactor.cpp \
- Reactor.h \
+.obj/Reactor.o .obj/Reactor.so .shobj/Reactor.o .shobj/Reactor.so: Reactor.cpp Reactor.h \
  pre.h \
  Handle_Set.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -4954,6 +5582,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -4969,14 +5598,22 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.i \
  Timer_Queue.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -4994,6 +5631,9 @@ endif # GHS
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -5004,20 +5644,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -5056,6 +5686,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -5106,6 +5744,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5113,6 +5752,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5128,11 +5768,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -5146,6 +5794,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5153,20 +5803,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5183,6 +5823,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -5210,6 +5851,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5217,6 +5859,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5232,11 +5875,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -5250,6 +5901,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5257,20 +5910,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5287,6 +5930,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -5329,6 +5973,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5336,6 +5981,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5364,6 +6010,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5371,6 +6018,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5386,11 +6034,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -5404,6 +6060,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5411,20 +6069,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5441,6 +6089,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -5460,14 +6109,14 @@ endif # GHS
  Select_Reactor_T.i \
  TP_Reactor.i
 
-.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp \
- Synch_T.h \
+.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp Synch_T.h \
  pre.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5475,6 +6124,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5490,9 +6140,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -5530,6 +6188,8 @@ endif # GHS
  Select_Reactor_T.h \
  Select_Reactor_Base.h \
  Signal.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5537,20 +6197,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5567,6 +6217,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -5594,6 +6245,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5601,6 +6253,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5616,11 +6269,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -5634,6 +6295,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5641,20 +6304,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5671,6 +6324,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor_Impl.h \
@@ -5702,6 +6356,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -5727,14 +6389,14 @@ endif # GHS
  Timer_Heap_T.h \
  Timer_Heap_T.cpp
 
-.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \
- Synch_T.h \
+.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp Synch_T.h \
  pre.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5742,6 +6404,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5757,9 +6420,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -5797,6 +6468,8 @@ endif # GHS
  Select_Reactor_T.h \
  Select_Reactor_Base.h \
  Signal.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5804,20 +6477,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5834,6 +6497,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -5852,8 +6516,7 @@ endif # GHS
  Timer_Heap_T.cpp \
  Select_Reactor_T.i
 
-.obj/QtReactor.o .obj/QtReactor.so .shobj/QtReactor.o .shobj/QtReactor.so: QtReactor.cpp \
- QtReactor.h \
+.obj/QtReactor.o .obj/QtReactor.so .shobj/QtReactor.o .shobj/QtReactor.so: QtReactor.cpp QtReactor.h \
  pre.h \
  Select_Reactor.h \
  Select_Reactor_T.h \
@@ -5864,6 +6527,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5871,6 +6535,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5886,11 +6551,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -5904,6 +6577,8 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -5911,20 +6586,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -5941,6 +6606,7 @@ endif # GHS
  Signal.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Handle_Set.h \
@@ -5959,12 +6625,12 @@ endif # GHS
  Timer_Heap_T.cpp \
  Select_Reactor_T.i
 
-.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \
- Asynch_IO.h \
+.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp Asynch_IO.h \
  pre.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -5972,6 +6638,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -5993,6 +6660,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6000,6 +6668,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6023,6 +6692,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6030,6 +6700,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6046,14 +6717,14 @@ endif # GHS
  Trace.h \
  OS.i
 
-.obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp \
- Reactor.h \
+.obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp Reactor.h \
  pre.h \
  Handle_Set.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6061,6 +6732,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6076,14 +6748,22 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.i \
  Timer_Queue.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -6101,6 +6781,9 @@ endif # GHS
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -6111,20 +6794,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
@@ -6152,6 +6825,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -6185,13 +6866,13 @@ endif # GHS
  WFMO_Reactor.i \
  Strategies.i
 
-.obj/IPC_SAP.o .obj/IPC_SAP.so .shobj/IPC_SAP.o .shobj/IPC_SAP.so: IPC_SAP.cpp \
- IPC_SAP.h \
+.obj/IPC_SAP.o .obj/IPC_SAP.so .shobj/IPC_SAP.o .shobj/IPC_SAP.so: IPC_SAP.cpp IPC_SAP.h \
  pre.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6199,6 +6880,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6214,7 +6896,7 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  Log_Msg.h \
  Log_Record.h \
@@ -6228,6 +6910,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6235,6 +6918,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6250,6 +6934,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6276,6 +6970,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6283,6 +6978,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6298,6 +6994,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6331,6 +7037,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6338,6 +7045,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6353,6 +7061,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6384,6 +7102,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6391,6 +7110,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6406,6 +7126,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6440,6 +7170,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6447,6 +7178,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6462,6 +7194,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6490,6 +7232,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6497,6 +7240,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6512,6 +7256,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6539,6 +7293,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6546,6 +7301,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6561,6 +7317,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6585,6 +7351,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6592,6 +7359,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6607,6 +7375,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6627,8 +7405,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -6648,6 +7424,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6655,6 +7432,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6670,6 +7448,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6696,6 +7484,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6703,6 +7492,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6718,6 +7508,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6744,6 +7544,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6751,6 +7552,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6766,6 +7568,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6781,8 +7593,6 @@ endif # GHS
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -6805,6 +7615,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6812,6 +7623,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6827,6 +7639,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6853,6 +7675,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6860,6 +7683,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6875,6 +7699,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6887,14 +7721,14 @@ endif # GHS
  SOCK_Dgram.i \
  SOCK_Dgram_Mcast.i
 
-.obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp \
- SOCK_IO.h \
+.obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp SOCK_IO.h \
  pre.h \
  SOCK.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6902,6 +7736,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6917,6 +7752,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6939,6 +7784,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6946,6 +7792,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -6961,6 +7808,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -6978,6 +7835,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -6985,6 +7843,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7006,13 +7865,13 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/ATM_Addr.o .obj/ATM_Addr.so .shobj/ATM_Addr.o .shobj/ATM_Addr.so: ATM_Addr.cpp \
- ATM_Addr.h \
+.obj/ATM_Addr.o .obj/ATM_Addr.so .shobj/ATM_Addr.o .shobj/ATM_Addr.so: ATM_Addr.cpp ATM_Addr.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7020,6 +7879,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7035,6 +7895,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -7051,6 +7921,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7058,6 +7929,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7076,6 +7948,16 @@ endif # GHS
  ATM_Stream.h \
  ATM_Addr.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -7090,6 +7972,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7097,6 +7980,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7112,6 +7996,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.i \
  ATM_Connector.h \
@@ -7130,6 +8024,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7137,6 +8032,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7152,15 +8048,25 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i
 
-.obj/ATM_QoS.o .obj/ATM_QoS.so .shobj/ATM_QoS.o .shobj/ATM_QoS.so: ATM_QoS.cpp \
- ATM_QoS.h \
+.obj/ATM_QoS.o .obj/ATM_QoS.so .shobj/ATM_QoS.o .shobj/ATM_QoS.so: ATM_QoS.cpp ATM_QoS.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7168,6 +8074,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7183,6 +8090,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i
 
 .obj/ATM_Stream.o .obj/ATM_Stream.so .shobj/ATM_Stream.o .shobj/ATM_Stream.so: ATM_Stream.cpp \
@@ -7193,6 +8110,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7200,6 +8118,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7215,6 +8134,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -7228,10 +8157,11 @@ endif # GHS
  TLI_Stream.h \
  TLI.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7239,6 +8169,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7254,11 +8185,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  Addr.h \
  Addr.i \
  INET_Addr.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  INET_Addr.i \
  Log_Msg.h \
  Log_Record.h \
@@ -7270,10 +8211,11 @@ endif # GHS
 .obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp DEV.h \
  pre.h \
  IO_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7281,6 +8223,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7296,24 +8239,34 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  DEV_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  DEV_Addr.i \
  SString.h \
  SString.i \
  Malloc_Base.h \
  DEV.i
 
-.obj/DEV_Addr.o .obj/DEV_Addr.so .shobj/DEV_Addr.o .shobj/DEV_Addr.so: DEV_Addr.cpp \
- DEV_Addr.h \
+.obj/DEV_Addr.o .obj/DEV_Addr.so .shobj/DEV_Addr.o .shobj/DEV_Addr.so: DEV_Addr.cpp DEV_Addr.h \
  pre.h \
  Addr.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7321,6 +8274,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7338,6 +8292,16 @@ endif # GHS
  OS.i \
  Addr.i \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  DEV_Addr.i \
  SString.h \
@@ -7354,10 +8318,11 @@ endif # GHS
  DEV_IO.h \
  DEV.h \
  IO_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7365,6 +8330,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7380,11 +8346,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  DEV_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  DEV_Addr.i \
  SString.h \
  SString.i \
@@ -7401,10 +8377,11 @@ endif # GHS
  pre.h \
  DEV.h \
  IO_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7412,6 +8389,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7427,11 +8405,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  DEV_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  DEV_Addr.i \
  SString.h \
  SString.i \
@@ -7446,10 +8434,11 @@ endif # GHS
 .obj/FIFO.o .obj/FIFO.so .shobj/FIFO.o .shobj/FIFO.so: FIFO.cpp FIFO.h \
  pre.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7457,6 +8446,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7472,23 +8462,33 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  FIFO.i \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i
 
-.obj/FIFO_Recv.o .obj/FIFO_Recv.so .shobj/FIFO_Recv.o .shobj/FIFO_Recv.so: FIFO_Recv.cpp \
- FIFO_Recv.h \
+.obj/FIFO_Recv.o .obj/FIFO_Recv.so .shobj/FIFO_Recv.o .shobj/FIFO_Recv.so: FIFO_Recv.cpp FIFO_Recv.h \
  pre.h \
  FIFO.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7496,6 +8496,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7511,8 +8512,18 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  FIFO.i \
  FIFO_Recv.i \
  Log_Msg.h \
@@ -7526,10 +8537,11 @@ endif # GHS
  FIFO_Recv.h \
  FIFO.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7537,6 +8549,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7552,8 +8565,18 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  FIFO.i \
  FIFO_Recv.i \
  FIFO_Recv_Msg.i \
@@ -7562,15 +8585,15 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/FIFO_Send.o .obj/FIFO_Send.so .shobj/FIFO_Send.o .shobj/FIFO_Send.so: FIFO_Send.cpp \
- FIFO_Send.h \
+.obj/FIFO_Send.o .obj/FIFO_Send.so .shobj/FIFO_Send.o .shobj/FIFO_Send.so: FIFO_Send.cpp FIFO_Send.h \
  pre.h \
  FIFO.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7578,6 +8601,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7593,8 +8617,18 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  FIFO.i \
  FIFO_Send.i \
  Log_Msg.h \
@@ -7608,10 +8642,11 @@ endif # GHS
  FIFO_Send.h \
  FIFO.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7619,6 +8654,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7634,8 +8670,18 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  FIFO.i \
  FIFO_Send.i \
  FIFO_Send_Msg.i \
@@ -7644,13 +8690,13 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/FILE_Addr.o .obj/FILE_Addr.so .shobj/FILE_Addr.o .shobj/FILE_Addr.so: FILE_Addr.cpp \
- FILE_Addr.h \
+.obj/FILE_Addr.o .obj/FILE_Addr.so .shobj/FILE_Addr.o .shobj/FILE_Addr.so: FILE_Addr.cpp FILE_Addr.h \
  pre.h \
  Addr.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7658,6 +8704,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7674,10 +8721,20 @@ endif # GHS
  Trace.h \
  OS.i \
  Addr.i \
- ACE.h \
- ACE.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
  FILE_Addr.i \
  SString.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SString.i \
  Malloc_Base.h \
  Log_Msg.h \
@@ -7688,10 +8745,11 @@ endif # GHS
 .obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp FILE.h \
  pre.h \
  IO_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7699,6 +8757,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7714,13 +8773,23 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  FILE_Addr.h \
  Addr.h \
  Addr.i \
  FILE_Addr.i \
  SString.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SString.i \
  Malloc_Base.h \
  FILE.i
@@ -7731,10 +8800,11 @@ endif # GHS
  FILE_IO.h \
  FILE.h \
  IO_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7742,6 +8812,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7757,13 +8828,23 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  FILE_Addr.h \
  Addr.h \
  Addr.i \
  FILE_Addr.i \
  SString.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SString.i \
  Malloc_Base.h \
  FILE.i \
@@ -7774,15 +8855,15 @@ endif # GHS
  Log_Record.i \
  FILE_Connector.i
 
-.obj/FILE_IO.o .obj/FILE_IO.so .shobj/FILE_IO.o .shobj/FILE_IO.so: FILE_IO.cpp \
- FILE_IO.h \
+.obj/FILE_IO.o .obj/FILE_IO.so .shobj/FILE_IO.o .shobj/FILE_IO.so: FILE_IO.cpp FILE_IO.h \
  pre.h \
  FILE.h \
  IO_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7790,6 +8871,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7805,13 +8887,23 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  FILE_Addr.h \
  Addr.h \
  Addr.i \
  FILE_Addr.i \
  SString.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SString.i \
  Malloc_Base.h \
  FILE.i \
@@ -7821,13 +8913,13 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/INET_Addr.o .obj/INET_Addr.so .shobj/INET_Addr.o .shobj/INET_Addr.so: INET_Addr.cpp \
- INET_Addr.h \
+.obj/INET_Addr.o .obj/INET_Addr.so .shobj/INET_Addr.o .shobj/INET_Addr.so: INET_Addr.cpp INET_Addr.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7835,6 +8927,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7850,6 +8943,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -7861,10 +8964,11 @@ endif # GHS
 
 .obj/IO_SAP.o .obj/IO_SAP.so .shobj/IO_SAP.o .shobj/IO_SAP.so: IO_SAP.cpp IO_SAP.h \
  pre.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7872,6 +8976,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7887,19 +8992,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IO_SAP.i \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i
 
-.obj/IOStream.o .obj/IOStream.so .shobj/IOStream.o .shobj/IOStream.so: IOStream.cpp \
- IOStream.h \
+.obj/IOStream.o .obj/IOStream.so .shobj/IOStream.o .shobj/IOStream.so: IOStream.cpp IOStream.h \
  pre.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7907,6 +9012,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7925,6 +9031,16 @@ endif # GHS
  IOStream_T.h \
  INET_Addr.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -7940,6 +9056,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -7947,6 +9064,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -7962,6 +9080,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Pipe.i \
  SOCK_Acceptor.h \
@@ -7987,14 +9115,14 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i
 
-.obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.cpp \
- Synch_T.h \
+.obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.cpp Synch_T.h \
  pre.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8002,6 +9130,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8017,9 +9146,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -8035,6 +9172,8 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i \
  Signal.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -8042,20 +9181,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -8069,7 +9198,12 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
- Signal.i
+ Signal.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/SPIPE_Addr.o .obj/SPIPE_Addr.so .shobj/SPIPE_Addr.o .shobj/SPIPE_Addr.so: SPIPE_Addr.cpp \
  SPIPE_Addr.h \
@@ -8078,6 +9212,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8085,6 +9220,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8102,6 +9238,16 @@ endif # GHS
  OS.i \
  Addr.i \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SPIPE_Addr.i \
  SString.h \
@@ -8111,10 +9257,11 @@ endif # GHS
 .obj/SPIPE.o .obj/SPIPE.so .shobj/SPIPE.o .shobj/SPIPE.so: SPIPE.cpp SPIPE.h \
  pre.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8122,6 +9269,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8137,11 +9285,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  SPIPE_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SPIPE_Addr.i \
  SString.h \
  SString.i \
@@ -8154,10 +9312,11 @@ endif # GHS
  SPIPE_Stream.h \
  SPIPE.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8165,6 +9324,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8180,11 +9340,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  SPIPE_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SPIPE_Addr.i \
  SString.h \
  SString.i \
@@ -8202,10 +9372,11 @@ endif # GHS
  SPIPE_Stream.h \
  SPIPE.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8213,6 +9384,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8228,11 +9400,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  SPIPE_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SPIPE_Addr.i \
  SString.h \
  SString.i \
@@ -8250,10 +9432,11 @@ endif # GHS
  pre.h \
  SPIPE.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8261,6 +9444,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8276,11 +9460,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  SPIPE_Addr.h \
  Addr.h \
  Addr.i \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  SPIPE_Addr.i \
  SString.h \
  SString.i \
@@ -8295,6 +9489,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8302,6 +9497,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8317,6 +9513,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Message.i
 
@@ -8327,6 +9533,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8334,6 +9541,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8349,6 +9557,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Message.h \
  SV_Message.i \
@@ -8366,6 +9584,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8373,6 +9592,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8388,6 +9608,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
@@ -8403,6 +9633,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8410,6 +9641,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8425,6 +9657,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Semaphore_Simple.i \
  Log_Msg.h \
@@ -8439,6 +9681,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8446,6 +9689,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8461,6 +9705,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Shared_Memory.i \
  Log_Msg.h \
@@ -8471,10 +9725,11 @@ endif # GHS
 .obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp TLI.h \
  pre.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8482,6 +9737,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8497,7 +9753,7 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  Addr.h \
  Addr.i \
@@ -8511,10 +9767,11 @@ endif # GHS
  pre.h \
  TLI.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8522,6 +9779,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8537,13 +9795,23 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  Addr.h \
  Addr.i \
  Time_Value.h \
  TLI_Stream.h \
  INET_Addr.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  INET_Addr.i \
  Log_Msg.h \
  Log_Record.h \
@@ -8557,6 +9825,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8564,6 +9833,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8579,6 +9849,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.i \
  TLI_Connector.h \
@@ -8600,10 +9880,11 @@ endif # GHS
  pre.h \
  TLI.h \
  IPC_SAP.h \
- ACE.h \
+ ACE_Flag_Manip.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8611,6 +9892,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8626,11 +9908,21 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
- ACE.i \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  Addr.h \
  Addr.i \
  INET_Addr.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  INET_Addr.i
 
 .obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp TTY_IO.h \
@@ -8638,6 +9930,7 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8645,6 +9938,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8664,6 +9958,16 @@ endif # GHS
  Addr.h \
  Addr.i \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  DEV_Addr.i \
  SString.h \
@@ -8682,13 +9986,13 @@ endif # GHS
  Log_Record.i \
  DEV_Connector.i
 
-.obj/UNIX_Addr.o .obj/UNIX_Addr.so .shobj/UNIX_Addr.o .shobj/UNIX_Addr.so: UNIX_Addr.cpp \
- UNIX_Addr.h \
+.obj/UNIX_Addr.o .obj/UNIX_Addr.so .shobj/UNIX_Addr.o .shobj/UNIX_Addr.so: UNIX_Addr.cpp UNIX_Addr.h \
  pre.h \
  Addr.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8696,6 +10000,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8717,6 +10022,16 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  UNIX_Addr.i
 
@@ -8729,6 +10044,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8736,6 +10052,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8751,25 +10068,29 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  IO_Cntl_Msg.h \
  Message_Block.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -8779,21 +10100,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -8834,6 +10151,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -8842,6 +10160,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -8898,6 +10224,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -8905,6 +10232,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -8920,25 +10248,29 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  IO_Cntl_Msg.h \
  Message_Block.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -8948,21 +10280,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9003,6 +10331,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -9011,6 +10340,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -9065,6 +10402,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9072,6 +10410,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9087,25 +10426,29 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  IO_Cntl_Msg.h \
  Message_Block.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -9115,21 +10458,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9170,6 +10509,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -9178,6 +10518,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -9232,6 +10580,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9239,6 +10588,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9254,6 +10604,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -9270,22 +10630,17 @@ endif # GHS
  MEM_Stream.h \
  MEM_IO.h \
  MEM_SAP.h \
+ PI_Malloc.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -9295,21 +10650,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9324,6 +10675,19 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ PI_Malloc.i \
  Process_Mutex.h \
  Process_Mutex.inl \
  MEM_SAP.i \
@@ -9338,13 +10702,13 @@ endif # GHS
  MEM_Addr.i \
  MEM_Acceptor.i
 
-.obj/MEM_Addr.o .obj/MEM_Addr.so .shobj/MEM_Addr.o .shobj/MEM_Addr.so: MEM_Addr.cpp \
- MEM_Addr.h \
+.obj/MEM_Addr.o .obj/MEM_Addr.so .shobj/MEM_Addr.o .shobj/MEM_Addr.so: MEM_Addr.cpp MEM_Addr.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9352,6 +10716,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9367,6 +10732,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  INET_Addr.h \
  Addr.h \
@@ -9389,6 +10764,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9396,6 +10772,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9411,6 +10788,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -9427,22 +10814,17 @@ endif # GHS
  MEM_Stream.h \
  MEM_IO.h \
  MEM_SAP.h \
+ PI_Malloc.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -9452,21 +10834,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9481,6 +10859,19 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ PI_Malloc.i \
  Process_Mutex.h \
  Process_Mutex.inl \
  MEM_SAP.i \
@@ -9502,6 +10893,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9509,6 +10901,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9524,6 +10917,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -9534,22 +10937,17 @@ endif # GHS
  INET_Addr.i \
  SOCK.i \
  MEM_SAP.h \
+ PI_Malloc.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -9559,21 +10957,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9588,6 +10982,19 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ PI_Malloc.i \
  Process_Mutex.h \
  Process_Mutex.inl \
  MEM_SAP.i \
@@ -9600,14 +11007,14 @@ endif # GHS
  Handle_Set.h \
  Handle_Set.i
 
-.obj/MEM_SAP.o .obj/MEM_SAP.so .shobj/MEM_SAP.o .shobj/MEM_SAP.so: MEM_SAP.cpp \
- MEM_SAP.h \
+.obj/MEM_SAP.o .obj/MEM_SAP.so .shobj/MEM_SAP.o .shobj/MEM_SAP.so: MEM_SAP.cpp MEM_SAP.h \
  pre.h \
- Malloc.h \
+ PI_Malloc.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9615,6 +11022,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9630,22 +11038,27 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Malloc_Base.h \
+ Malloc.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -9655,21 +11068,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9684,6 +11093,19 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ PI_Malloc.i \
  Process_Mutex.h \
  Process_Mutex.inl \
  MEM_SAP.i
@@ -9697,6 +11119,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9704,6 +11127,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9719,6 +11143,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -9729,22 +11163,17 @@ endif # GHS
  INET_Addr.i \
  SOCK.i \
  MEM_SAP.h \
+ PI_Malloc.h \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -9754,21 +11183,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -9783,6 +11208,19 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ PI_Malloc.i \
  Process_Mutex.h \
  Process_Mutex.inl \
  MEM_SAP.i \
@@ -9799,6 +11237,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9806,6 +11245,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9826,6 +11266,16 @@ endif # GHS
  Log_Priority.h \
  Log_Record.i \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i
 
 .obj/Parse_Node.o .obj/Parse_Node.so .shobj/Parse_Node.o .shobj/Parse_Node.so: Parse_Node.cpp \
@@ -9837,6 +11287,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9844,6 +11295,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -9859,6 +11311,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i \
  Event_Handler.h \
@@ -9888,20 +11350,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -9924,6 +11376,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -9935,6 +11388,14 @@ endif # GHS
  Service_Repository.i \
  Task.h \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Task.i \
  Task_T.h \
@@ -9988,6 +11449,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -9995,6 +11457,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10010,22 +11473,26 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -10035,21 +11502,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -10078,6 +11541,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -10115,6 +11579,14 @@ endif # GHS
  Auto_Ptr.i \
  Auto_Ptr.cpp \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Process_Manager.h \
  Process.h \
@@ -10128,6 +11600,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10135,6 +11608,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10150,6 +11624,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Get_Opt.i \
  Service_Repository.h \
@@ -10187,20 +11671,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -10223,6 +11697,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -10262,6 +11737,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -10289,6 +11772,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10296,6 +11780,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10311,6 +11796,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i \
  Event_Handler.h \
@@ -10344,6 +11839,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10351,6 +11847,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10366,6 +11863,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i \
  Event_Handler.h \
@@ -10404,6 +11911,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10411,6 +11919,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10426,6 +11935,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i \
  Event_Handler.h \
@@ -10458,20 +11977,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -10487,6 +11996,14 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Task.i \
  Task_T.h \
@@ -10511,6 +12028,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -10548,6 +12066,179 @@ endif # GHS
  Stream.i \
  Stream.cpp
 
+.obj/Service_Templates.o .obj/Service_Templates.so .shobj/Service_Templates.o .shobj/Service_Templates.so: Service_Templates.cpp \
+ Service_Templates.h \
+ pre.h \
+ Svc_Conf.h \
+ Obstack.h \
+ Malloc.h \
+ ACE.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
+ Log_Msg.h \
+ Log_Record.h \
+ Log_Priority.h \
+ Log_Record.i \
+ Malloc.i \
+ Malloc_T.h \
+ Synch.h \
+ Synch.i \
+ Synch_T.h \
+ Synch_T.i \
+ Thread.h \
+ Thread_Adapter.h \
+ Base_Thread_Adapter.h \
+ Base_Thread_Adapter.inl \
+ Thread_Adapter.inl \
+ Thread.i \
+ Atomic_Op.i \
+ Synch_T.cpp \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
+ Free_List.h \
+ Free_List.i \
+ Free_List.cpp \
+ Malloc_T.i \
+ Malloc_T.cpp \
+ Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
+ Signal.h \
+ Containers.h \
+ Containers.i \
+ Containers_T.h \
+ Containers_T.i \
+ Containers_T.cpp \
+ Signal.i \
+ Mem_Map.h \
+ Mem_Map.i \
+ SV_Semaphore_Complex.h \
+ SV_Semaphore_Simple.h \
+ SV_Semaphore_Simple.i \
+ SV_Semaphore_Complex.i \
+ Memory_Pool.i \
+ Obstack.i \
+ Service_Config.h \
+ Service_Object.h \
+ Shared_Object.h \
+ Shared_Object.i \
+ Service_Object.i \
+ SString.h \
+ SString.i \
+ Service_Config.i \
+ Reactor.h \
+ Handle_Set.h \
+ Handle_Set.i \
+ Timer_Queue.h \
+ Timer_Queue_T.h \
+ Test_and_Set.h \
+ Timer_Queue_T.i \
+ Timer_Queue_T.cpp \
+ Reactor.i \
+ Reactor_Impl.h \
+ Svc_Conf_Tokens.h \
+ Parse_Node.h \
+ Service_Types.h \
+ Service_Types.i \
+ Parse_Node.i \
+ Auto_Ptr.h \
+ Auto_Ptr.i \
+ Auto_Ptr.cpp \
+ Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ Thread_Manager.i \
+ Stream_Modules.h \
+ Task.h \
+ Task.i \
+ Task_T.h \
+ Message_Queue.h \
+ Message_Block.h \
+ Message_Block.i \
+ Message_Block_T.h \
+ Message_Block_T.i \
+ Message_Block_T.cpp \
+ IO_Cntl_Msg.h \
+ Message_Queue_T.h \
+ Message_Queue_T.i \
+ Message_Queue_T.cpp \
+ Strategies.h \
+ Strategies_T.h \
+ Synch_Options.h \
+ Synch_Options.i \
+ Hash_Map_Manager.h \
+ Functor.h \
+ Functor.i \
+ Functor_T.h \
+ Functor_T.i \
+ Functor_T.cpp \
+ Hash_Map_Manager_T.h \
+ Hash_Map_Manager_T.i \
+ Hash_Map_Manager_T.cpp \
+ Strategies_T.i \
+ Strategies_T.cpp \
+ Service_Repository.h \
+ Service_Repository.i \
+ WFMO_Reactor.h \
+ Process_Mutex.h \
+ Process_Mutex.inl \
+ WFMO_Reactor.i \
+ Strategies.i \
+ Message_Queue.i \
+ Task_T.i \
+ Task_T.cpp \
+ Module.h \
+ Module.i \
+ Module.cpp \
+ Stream_Modules.cpp \
+ Stream.h \
+ Time_Value.h \
+ Stream.i \
+ Stream.cpp
+
 .obj/Shared_Object.o .obj/Shared_Object.so .shobj/Shared_Object.o .shobj/Shared_Object.so: Shared_Object.cpp \
  Shared_Object.h \
  pre.h \
@@ -10555,6 +12246,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10562,6 +12254,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10577,14 +12270,24 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i
 
-.obj/Svc_Conf_l.o .obj/Svc_Conf_l.so .shobj/Svc_Conf_l.o .shobj/Svc_Conf_l.so: Svc_Conf_l.cpp \
- OS.h \
+.obj/Svc_Conf_l.o .obj/Svc_Conf_l.so .shobj/Svc_Conf_l.o .shobj/Svc_Conf_l.so: Svc_Conf_l.cpp OS.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10592,6 +12295,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10611,22 +12315,26 @@ endif # GHS
  Obstack.h \
  Malloc.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -10636,21 +12344,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -10679,6 +12383,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -10689,13 +12394,13 @@ endif # GHS
  Service_Types.i \
  Parse_Node.i
 
-.obj/Svc_Conf_y.o .obj/Svc_Conf_y.so .shobj/Svc_Conf_y.o .shobj/Svc_Conf_y.so: Svc_Conf_y.cpp \
- ARGV.h \
+.obj/Svc_Conf_y.o .obj/Svc_Conf_y.so .shobj/Svc_Conf_y.o .shobj/Svc_Conf_y.so: Svc_Conf_y.cpp ARGV.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10703,6 +12408,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -10718,6 +12424,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Containers.h \
  Malloc_Base.h \
@@ -10730,16 +12446,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -10749,21 +12460,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -10790,6 +12496,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -10816,6 +12523,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -10849,11 +12564,11 @@ endif # GHS
  Stream.i \
  Stream.cpp
 
-.obj/CDR_Base.o .obj/CDR_Base.so .shobj/CDR_Base.o .shobj/CDR_Base.so: CDR_Base.cpp \
- CDR_Base.h \
+.obj/CDR_Base.o .obj/CDR_Base.so .shobj/CDR_Base.o .shobj/CDR_Base.so: CDR_Base.cpp CDR_Base.h \
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10861,6 +12576,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  Basic_Types.h \
  Basic_Types.i \
  Message_Block.h \
@@ -10879,23 +12595,27 @@ endif # GHS
  streams.h \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -10905,21 +12625,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -10946,6 +12662,7 @@ endif # GHS
  CDR_Base.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -10953,6 +12670,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  Basic_Types.h \
  Basic_Types.i \
  Message_Block.h \
@@ -10971,23 +12689,27 @@ endif # GHS
  streams.h \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -10997,21 +12719,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11040,13 +12758,15 @@ endif # GHS
  pre.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
  post.h \
  ACE_export.h \
  svc_export.h \
- ace_wchar.h
+ ace_wchar.h \
+ ace_wchar.inl
 
 .obj/Message_Block.o .obj/Message_Block.so .shobj/Message_Block.o .shobj/Message_Block.so: Message_Block.cpp \
  Message_Block.h \
@@ -11055,6 +12775,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11062,6 +12783,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11077,23 +12799,27 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -11103,21 +12829,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11146,6 +12868,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11153,6 +12876,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11168,23 +12892,27 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -11194,21 +12922,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11246,6 +12970,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -11254,6 +12979,14 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Hash_Map_Manager.h \
  Functor.h \
@@ -11285,6 +13018,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11292,6 +13026,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11307,6 +13042,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i \
  Event_Handler.h \
@@ -11336,20 +13081,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -11365,6 +13100,14 @@ endif # GHS
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
  Memory_Pool.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.i \
  Task.i \
  Task_T.h \
@@ -11389,6 +13132,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -11431,6 +13175,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11438,6 +13183,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11455,11 +13201,19 @@ endif # GHS
  OS.i \
  Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -11476,27 +13230,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11524,11 +13270,21 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
  Reactor_Impl.h \
- Svc_Conf_Tokens.h
+ Svc_Conf_Tokens.h \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp Malloc.h \
  pre.h \
@@ -11536,6 +13292,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11543,6 +13300,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11558,22 +13316,26 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -11583,21 +13345,108 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
+ Free_List.h \
+ Free_List.i \
+ Free_List.cpp \
+ Malloc_T.i \
+ Malloc_T.cpp \
+ Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
+ Signal.h \
+ Containers.h \
+ Containers.i \
+ Containers_T.h \
+ Containers_T.i \
+ Containers_T.cpp \
+ Signal.i \
+ Mem_Map.h \
+ Mem_Map.i \
+ SV_Semaphore_Complex.h \
+ SV_Semaphore_Simple.h \
+ SV_Semaphore_Simple.i \
+ SV_Semaphore_Complex.i \
+ Memory_Pool.i \
  Object_Manager.h \
  Object_Manager.i \
  Managed_Object.h \
  Managed_Object.i \
- Managed_Object.cpp \
+ Managed_Object.cpp
+
+.obj/PI_Malloc.o .obj/PI_Malloc.so .shobj/PI_Malloc.o .shobj/PI_Malloc.so: PI_Malloc.cpp PI_Malloc.h \
+ pre.h \
+ ACE.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
+ Malloc.h \
+ Log_Msg.h \
+ Log_Record.h \
+ Log_Priority.h \
+ Log_Record.i \
  Malloc.i \
  Malloc_T.h \
+ Synch.h \
+ Synch.i \
+ Synch_T.h \
+ Synch_T.i \
+ Thread.h \
+ Thread_Adapter.h \
+ Base_Thread_Adapter.h \
+ Base_Thread_Adapter.inl \
+ Thread_Adapter.inl \
+ Thread.i \
+ Atomic_Op.i \
+ Synch_T.cpp \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11611,15 +13460,96 @@ endif # GHS
  SV_Semaphore_Simple.h \
  SV_Semaphore_Simple.i \
  SV_Semaphore_Complex.i \
- Memory_Pool.i
+ Memory_Pool.i \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ PI_Malloc.i \
+ Process_Mutex.h \
+ Process_Mutex.inl
 
-.obj/Mem_Map.o .obj/Mem_Map.so .shobj/Mem_Map.o .shobj/Mem_Map.so: Mem_Map.cpp \
- Mem_Map.h \
+.obj/Malloc_Allocator.o .obj/Malloc_Allocator.so .shobj/Malloc_Allocator.o .shobj/Malloc_Allocator.so: Malloc_Allocator.cpp \
+ Malloc_Allocator.h \
+ pre.h \
+ ACE.h \
+ OS.h \
+ config-all.h \
+ config.h \
+ config-linux-lxpthreads.h \
+ config-linux.h \
+ config-linux-common.h \
+ config-g++-common.h \
+ post.h \
+ ACE_export.h \
+ svc_export.h \
+ ace_wchar.h \
+ ace_wchar.inl \
+ OS_Dirent.h \
+ OS_Export.h \
+ OS_Dirent.inl \
+ OS_String.h \
+ OS_String.inl \
+ OS_Memory.h \
+ OS_Memory.inl \
+ OS_TLI.h \
+ OS_TLI.inl \
+ Min_Max.h \
+ streams.h \
+ Basic_Types.h \
+ Basic_Types.i \
+ Trace.h \
+ OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
+ Malloc_Base.h \
+ Log_Msg.h \
+ Log_Record.h \
+ Log_Priority.h \
+ Log_Record.i \
+ Malloc_Allocator.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
+ Synch_T.h \
+ Synch.h \
+ Synch.i \
+ Synch_T.i \
+ Thread.h \
+ Thread_Adapter.h \
+ Base_Thread_Adapter.h \
+ Base_Thread_Adapter.inl \
+ Thread_Adapter.inl \
+ Thread.i \
+ Atomic_Op.i \
+ Synch_T.cpp
+
+.obj/Mem_Map.o .obj/Mem_Map.so .shobj/Mem_Map.o .shobj/Mem_Map.so: Mem_Map.cpp Mem_Map.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11627,6 +13557,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11642,6 +13573,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Mem_Map.i \
  Log_Msg.h \
@@ -11656,6 +13597,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11663,6 +13605,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11678,6 +13621,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Event_Handler.h \
  Event_Handler.i \
@@ -11705,20 +13658,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -11734,16 +13677,28 @@ endif # GHS
  Memory_Pool.i \
  Auto_Ptr.h \
  Auto_Ptr.i \
- Auto_Ptr.cpp
+ Auto_Ptr.cpp \
+ Based_Pointer_T.h \
+ Based_Pointer_T.i \
+ Based_Pointer_T.cpp \
+ Based_Pointer_Repository.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
-.obj/Obstack.o .obj/Obstack.so .shobj/Obstack.o .shobj/Obstack.so: Obstack.cpp \
- Obstack.h \
+.obj/Obstack.o .obj/Obstack.so .shobj/Obstack.o .shobj/Obstack.so: Obstack.cpp Obstack.h \
  pre.h \
  Malloc.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11751,6 +13706,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11766,22 +13722,26 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -11791,21 +13751,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11829,6 +13785,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11836,6 +13793,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11851,23 +13809,27 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Malloc.h \
- Malloc_Base.h \
  Log_Msg.h \
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -11877,21 +13839,17 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -11920,6 +13878,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -11933,6 +13892,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11940,6 +13900,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11955,6 +13916,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i
 
 .obj/Shared_Memory_MM.o .obj/Shared_Memory_MM.so .shobj/Shared_Memory_MM.o .shobj/Shared_Memory_MM.so: Shared_Memory_MM.cpp \
@@ -11965,6 +13936,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -11972,6 +13944,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -11987,6 +13960,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Mem_Map.h \
  Mem_Map.i \
@@ -12000,6 +13983,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12007,6 +13991,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12022,6 +14007,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SV_Shared_Memory.h \
  SV_Shared_Memory.i \
@@ -12034,6 +14029,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12041,6 +14037,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12056,6 +14053,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Thread_Adapter.h \
  Base_Thread_Adapter.h \
@@ -12064,8 +14071,6 @@ endif # GHS
  Thread.i \
  Local_Tokens.h \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch.h \
  Synch.i \
  Synch_T.i \
@@ -12082,26 +14087,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -12129,6 +14126,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12146,6 +14144,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12153,6 +14152,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12168,6 +14168,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -12188,8 +14198,6 @@ endif # GHS
  Synch_Options.i \
  Local_Tokens.h \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch.h \
  Synch.i \
  Synch_T.i \
@@ -12212,26 +14220,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -12257,6 +14257,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12265,7 +14266,15 @@ endif # GHS
  Local_Tokens.i \
  Token_Request_Reply.h \
  Token_Request_Reply.i \
- Remote_Tokens.i
+ Remote_Tokens.i \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Token_Collection.o .obj/Token_Collection.so .shobj/Token_Collection.o .shobj/Token_Collection.so: Token_Collection.cpp \
  Token_Collection.h \
@@ -12274,6 +14283,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12281,6 +14291,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12298,11 +14309,19 @@ endif # GHS
  OS.i \
  Synch.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -12319,27 +14338,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -12367,6 +14378,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12386,6 +14398,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12393,6 +14406,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12408,11 +14422,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -12430,27 +14452,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -12478,6 +14492,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12486,7 +14501,12 @@ endif # GHS
  Local_Tokens.h \
  Synch_Options.h \
  Synch_Options.i \
- Local_Tokens.i
+ Local_Tokens.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Token_Manager.o .obj/Token_Manager.so .shobj/Token_Manager.o .shobj/Token_Manager.so: Token_Manager.cpp \
  Token_Manager.h \
@@ -12496,6 +14516,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12503,6 +14524,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12518,11 +14540,19 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -12540,27 +14570,19 @@ endif # GHS
  Map_Manager.i \
  Map_Manager.cpp \
  Malloc.h \
- Malloc_Base.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Base.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Containers.h \
  Containers.i \
@@ -12588,6 +14610,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12597,18 +14620,24 @@ endif # GHS
  Synch_Options.h \
  Synch_Options.i \
  Local_Tokens.i \
- Token_Manager.i
+ Token_Manager.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp
 
 .obj/Token_Request_Reply.o .obj/Token_Request_Reply.so .shobj/Token_Request_Reply.o .shobj/Token_Request_Reply.so: Token_Request_Reply.cpp \
  Token_Request_Reply.h \
  pre.h \
  Local_Tokens.h \
  Synch_T.h \
- Event_Handler.h \
+ Synch.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12616,6 +14645,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12631,9 +14661,17 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
- Event_Handler.i \
- Synch.h \
  Synch.i \
  Synch_T.i \
  Thread.h \
@@ -12655,26 +14693,18 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -12702,6 +14732,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12721,6 +14752,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12728,6 +14760,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12743,6 +14776,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Shared_Object.i \
  Event_Handler.h \
@@ -12772,20 +14815,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -12808,6 +14841,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -12815,16 +14849,24 @@ endif # GHS
  Svc_Conf_Tokens.h \
  Pipe.h \
  Pipe.i \
+ Object_Manager.h \
+ Object_Manager.i \
+ Managed_Object.h \
+ Managed_Object.i \
+ Managed_Object.cpp \
  Thread_Manager.h \
+ Singleton.h \
+ Singleton.i \
+ Singleton.cpp \
  Thread_Manager.i
 
-.obj/CORBA_Ref.o .obj/CORBA_Ref.so .shobj/CORBA_Ref.o .shobj/CORBA_Ref.so: CORBA_Ref.cpp \
- CORBA_Ref.h \
+.obj/CORBA_Ref.o .obj/CORBA_Ref.so .shobj/CORBA_Ref.o .shobj/CORBA_Ref.so: CORBA_Ref.cpp CORBA_Ref.h \
  pre.h \
  ACE.h \
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12832,6 +14874,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12847,6 +14890,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  CORBA_Ref.cpp \
  Log_Msg.h \
@@ -12860,6 +14913,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -12867,6 +14921,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -12882,6 +14937,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Local_Name_Space.h \
  SString.h \
@@ -12897,16 +14962,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -12916,21 +14976,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -12970,6 +15025,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -13005,6 +15061,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13012,6 +15069,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13027,6 +15085,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -13074,20 +15142,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
@@ -13110,6 +15168,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -13126,6 +15185,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13133,6 +15193,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13150,6 +15211,16 @@ endif # GHS
  OS.i \
  SString.h \
  ACE.h \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SString.i \
  Malloc_Base.h \
@@ -13165,6 +15236,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13172,6 +15244,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13187,6 +15260,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SString.h \
  SString.i \
@@ -13201,16 +15284,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13220,21 +15298,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13272,6 +15345,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -13288,6 +15362,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13295,6 +15370,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13310,6 +15386,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Get_Opt.i \
  Naming_Context.h \
@@ -13326,16 +15412,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13345,21 +15426,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13397,6 +15473,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -13434,6 +15511,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13441,6 +15519,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13464,6 +15543,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13471,6 +15551,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13486,6 +15567,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  SString.h \
  SString.i \
@@ -13500,16 +15591,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13519,21 +15605,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13571,6 +15652,7 @@ endif # GHS
  Handle_Set.i \
  Timer_Queue.h \
  Timer_Queue_T.h \
+ Test_and_Set.h \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Reactor.i \
@@ -13594,6 +15676,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13601,6 +15684,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13616,6 +15700,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -13639,16 +15733,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13658,21 +15747,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13691,6 +15775,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13698,6 +15783,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13713,6 +15799,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -13734,16 +15830,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13753,21 +15844,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13789,6 +15875,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13796,6 +15883,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13811,6 +15899,16 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Addr.h \
  Addr.i \
@@ -13826,16 +15924,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13845,21 +15938,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13879,6 +15967,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13886,6 +15975,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13903,10 +15993,20 @@ endif # GHS
  OS.i \
  Addr.i \
  IPC_SAP.h \
- ACE.h \
- ACE.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
  IPC_SAP.i \
  Containers_T.h \
+ ACE.h \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
+ ACE.i \
  Containers.h \
  Malloc_Base.h \
  Containers.i \
@@ -13917,16 +16017,11 @@ endif # GHS
  Log_Record.h \
  Log_Priority.h \
  Log_Record.i \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
+ Malloc.i \
+ Malloc_T.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -13936,21 +16031,16 @@ endif # GHS
  Thread.i \
  Atomic_Op.i \
  Synch_T.cpp \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Malloc.i \
- Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Signal.h \
  Signal.i \
  Mem_Map.h \
@@ -13970,6 +16060,7 @@ endif # GHS
  OS.h \
  config-all.h \
  config.h \
+ config-linux-lxpthreads.h \
  config-linux.h \
  config-linux-common.h \
  config-g++-common.h \
@@ -13977,6 +16068,7 @@ endif # GHS
  ACE_export.h \
  svc_export.h \
  ace_wchar.h \
+ ace_wchar.inl \
  OS_Dirent.h \
  OS_Export.h \
  OS_Dirent.inl \
@@ -13992,14 +16084,22 @@ endif # GHS
  Basic_Types.i \
  Trace.h \
  OS.i \
+ ACE_Flag_Manip.h \
+ ACE_Flag_Manip.i \
+ ACE_Handle_Ops.h \
+ ACE_Handle_Ops.i \
+ ACE_Lib_Find.h \
+ ACE_Lib_Find.i \
+ ACE_Init.h \
+ ACE_Init.i \
+ ACE_Sock_Connect.h \
+ ACE_Sock_Connect.i \
  ACE.i \
  Handle_Set.i \
  Timer_Queue.h \
  Synch.h \
  Synch.i \
  Synch_T.h \
- Event_Handler.h \
- Event_Handler.i \
  Synch_T.i \
  Thread.h \
  Thread_Adapter.h \
@@ -14017,6 +16117,9 @@ endif # GHS
  Free_List.h \
  Free_List.i \
  Free_List.cpp \
+ Test_and_Set.h \
+ Event_Handler.h \
+ Event_Handler.i \
  Timer_Queue_T.i \
  Timer_Queue_T.cpp \
  Signal.h \
@@ -14027,20 +16130,10 @@ endif # GHS
  Containers_T.i \
  Containers_T.cpp \
  Malloc.h \
- Based_Pointer_T.h \
- Based_Pointer_T.i \
- Based_Pointer_T.cpp \
- Based_Pointer_Repository.h \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
  Malloc.i \
  Malloc_T.h \
+ Malloc_Allocator.h \
+ Malloc_Allocator.i \
  Malloc_T.i \
  Malloc_T.cpp \
  Memory_Pool.h \
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 1069bc318d4..52b2ebf0568 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -158,301 +158,4 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-void
-ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
-{
-  ACE_TRACE ("ACE_Malloc_Header::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-void
-ACE_PI_Control_Block::print_alignment_info (void)
-{
-  ACE_TRACE ("ACE_Control_Block::print_alignment_info");
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n")));
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("Sizeof ptr: %d\n")
-              ACE_LIB_TEXT ("Sizeof size_t: %d\n")
-              ACE_LIB_TEXT ("Sizeof long: %d\n")
-              ACE_LIB_TEXT ("Sizeof double: %d\n")
-              ACE_LIB_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n")
-              ACE_LIB_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n")
-              ACE_LIB_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n")
-              ACE_LIB_TEXT ("Sizeof ACE_PI_MALLOC_PADDING_SIZE: %d\n")
-              ACE_LIB_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_SIZE: %d\n")
-              ACE_LIB_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_ALIGN_LONGS: %d\n")
-              ACE_LIB_TEXT ("Sizeof (MALLOC_HEADER): %d\n")
-              ACE_LIB_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"),
-              sizeof (char *),
-              sizeof (size_t),
-              sizeof (long),
-              sizeof (double),
-              ACE_MALLOC_ALIGN,
-              ACE_MALLOC_PADDING,
-              ACE_MALLOC_HEADER_SIZE,
-              ACE_PI_MALLOC_PADDING_SIZE,
-              ACE_PI_CONTROL_BLOCK_SIZE,
-              ACE_PI_CONTROL_BLOCK_ALIGN_LONGS,
-              sizeof (ACE_Malloc_Header),
-              sizeof (ACE_PI_Control_Block)
-              ));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n")));
-}
-
-void
-ACE_PI_Control_Block::dump (void) const
-{
-  ACE_TRACE ("ACE_Control_Block::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n")));
-  for (ACE_Name_Node *nextn = this->name_head_;
-       nextn != 0;
-       nextn = nextn->next_)
-    nextn->dump ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_));
-  this->base_.dump ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nMalloc Header:\n")));
-  for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_;
-       nexth != 0 && nexth != &this->base_;
-       nexth = nexth->next_block_)
-    nexth->dump ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
-{
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-}
-
-ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
-                                                    char *name_ptr,
-                                                    char *pointer,
-                                                    ACE_Name_Node *next)
-  : name_ (name_ptr),
-    pointer_ (pointer),
-    next_ (next),
-    prev_ (0)
-{
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-  char *n = this->name_;
-  ACE_OS::strcpy (n, name);
-  if (next != 0)
-    next->prev_ = this;
-}
-
-ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
-{
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-  ACE_ASSERT (0); // not implemented!
-}
-
-const char *
-ACE_PI_Control_Block::ACE_Name_Node::name (void) const
-{
-  const char *c = this->name_;
-  return c;
-}
-
-void
-ACE_PI_Control_Block::ACE_Name_Node::name (const char *)
-{
-  ACE_ASSERT (0); // not implemented yet.
-}
-
-ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
-  : next_block_ (0),
-    size_ (0)
-{
-}
-
-void
-ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
-{
-  ACE_TRACE ("ACE_Name_Node");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("pointer = %x"), (const char *) this->pointer_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), (ACE_Name_Node *) this->next_));
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("\nname_ = (%x, %s)"),
-              (const char *) this->name_,
-              (const char *) this->name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-ACE_Allocator *
-ACE_Allocator::instance (void)
-{
-  //  ACE_TRACE ("ACE_Allocator::instance");
-
-  if (ACE_Allocator::allocator_ == 0)
-    {
-      // Perform Double-Checked Locking Optimization.
-      ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-                                *ACE_Static_Object_Lock::instance (), 0));
-
-      if (ACE_Allocator::allocator_ == 0)
-        {
-          // Have a seat.  We want to avoid ever having to delete the
-          // ACE_Allocator instance, to avoid shutdown order
-          // dependencies.  ACE_New_Allocator never needs to be
-          // destroyed:  its destructor is empty and its instance
-          // doesn't have any state.  Therefore, sizeof
-          // ACE_New_Allocator is equal to sizeof void *.  It's
-          // instance just contains a pointer to its virtual function
-          // table.
-          //
-          // So, we allocate space for the ACE_New_Allocator instance
-          // in the data segment.  Because its size is the same as
-          // that of a pointer, we allocate it as a pointer so that it
-          // doesn't get constructed statically.  We never bother to
-          // destroy it.
-          static void *allocator_instance = 0;
-
-          // Check this critical assumption.  We put it in a variable
-          // first to avoid stupid compiler warnings that the
-          // condition may always be true/false.
-#         if !defined (ACE_NDEBUG)
-          int assertion = (sizeof allocator_instance ==
-                           sizeof (ACE_New_Allocator));
-          ACE_ASSERT (assertion);
-#         endif /* !ACE_NDEBUG */
-
-          // Initialize the allocator_instance by using a placement
-          // new.  The ACE_NEW_RETURN below doesn't actually allocate
-          // a new instance.  It just initializes it in place.
-          ACE_NEW_RETURN (ACE_Allocator::allocator_,
-                          (&allocator_instance) ACE_New_Allocator,
-                          0);
-          // If we ever need to cast the address of
-          // allocator_instance, then expand the ACE_NEW_RETURN above
-          // as follows . . .
-          //
-          // ACE_Allocator::allocator_ =
-          //   (ACE_New_Allocator *)
-          //     new (&allocator_instance) ACE_New_Allocator;
-        }
-    }
-
-  return ACE_Allocator::allocator_;
-}
-
-ACE_Allocator *
-ACE_Allocator::instance (ACE_Allocator *r)
-{
-  ACE_TRACE ("ACE_Allocator::instance");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-                            *ACE_Static_Object_Lock::instance (), 0));
-  ACE_Allocator *t = ACE_Allocator::allocator_;
-
-  // We can't safely delete it since we don't know who created it!
-  ACE_Allocator::delete_allocator_ = 0;
-
-  ACE_Allocator::allocator_ = r;
-  return t;
-}
-
-void
-ACE_Allocator::close_singleton (void)
-{
-  ACE_TRACE ("ACE_Allocator::close_singleton");
-
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
-                     *ACE_Static_Object_Lock::instance ()));
-
-  if (ACE_Allocator::delete_allocator_)
-    {
-      // This should never be executed....  See the
-      // ACE_Allocator::instance (void) method for an explanation.
-      delete ACE_Allocator::allocator_;
-      ACE_Allocator::allocator_ = 0;
-      ACE_Allocator::delete_allocator_ = 0;
-    }
-}
-
-ACE_Allocator::~ACE_Allocator (void)
-{
-  ACE_TRACE ("ACE_Allocator::~ACE_Allocator");
-}
-
-ACE_Allocator::ACE_Allocator (void)
-{
-  ACE_TRACE ("ACE_Allocator::ACE_Allocator");
-}
-
-void
-ACE_Static_Allocator_Base::dump (void) const
-{
-  ACE_TRACE ("ACE_Static_Base_Allocator::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noffset_ = %d"), this->offset_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d\n"), this->size_));
-  ACE_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-#if defined (ACE_HAS_MALLOC_STATS)
-ACE_Malloc_Stats::ACE_Malloc_Stats (void)
-  : nblocks_ (0),
-    nchunks_ (0),
-    ninuse_ (0)
-{
-  ACE_TRACE ("ACE_Malloc_Stats::ACE_Malloc_Stats");
-}
-
-void
-ACE_Malloc_Stats::dump (void) const
-{
-  ACE_TRACE ("ACE_Malloc_Stats::print");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  int nblocks = this->nblocks_.value ();
-  int ninuse  = this->ninuse_.value ();
-  int nchunks = this->nchunks_.value ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("nblocks = %d"), nblocks));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nninuse = %d"), ninuse));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnchunks = %d"), nchunks));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_HAS_MALLOC_STATS */
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>;
-template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>;
-template class ACE_Based_Pointer_Basic<char>;
-template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header>;
-template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>
-#pragma instantiate ACE_Based_Pointer_Basic<char>
-#pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1*/
-
 #endif /* ACE_MALLOC_CPP */
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 327b26d099f..584587e487f 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -24,13 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc_Base.h"
 #include "ace/Log_Msg.h"
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-#include "ace/Based_Pointer_T.h"
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #if defined (ACE_HAS_MALLOC_STATS)
 #include "ace/Synch_T.h"
 #if defined (ACE_HAS_THREADS)
@@ -400,263 +395,6 @@ public:
   // Dump the state of the object.
 };
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
-// prepare for position independent malloc
-class ACE_Export ACE_PI_Control_Block
-{
-  // = TITLE
-  //    This information is stored in memory allocated by the <Memory_Pool>.
-  //
-  // = DESCRIPTION
-  //    This class implements the control block structure that can be
-  //    used in a "position indepent" fashion, i.e., you don't need to
-  //    "map" the underlying memory pool to the same address in
-  //    processes sharing the memory.  The tradoff of this flexibility
-  //    is more expensive malloc/free operations.
-public:
-  class ACE_Malloc_Header;
-  class ACE_Name_Node;
-
-  typedef ACE_Based_Pointer<ACE_Malloc_Header> MALLOC_HEADER_PTR;
-  typedef ACE_Based_Pointer<ACE_Name_Node> NAME_NODE_PTR;
-  typedef ACE_Based_Pointer_Basic<char> CHAR_PTR;
-
-  class ACE_Export ACE_Malloc_Header
-  {
-    // = TITLE
-    //    This is the control block header.  It's used by <ACE_Malloc>
-    //    to keep track of each chunk of data when it's in the free
-    //    list or in use.
-  public:
-    ACE_Malloc_Header (void);
-
-    MALLOC_HEADER_PTR next_block_;
-    // Points to next block if on free list.
-
-    static void init_ptr (MALLOC_HEADER_PTR *ptr,
-                          ACE_Malloc_Header *init,
-                          void *base_addr);
-    // Initialize a malloc header pointer.
-
-    size_t size_;
-    // Size of this header control block.
-
-#if defined (ACE_PI_MALLOC_PADDING_SIZE) && (ACE_PI_MALLOC_PADDING_SIZE == 0)
-    // No padding required for PI_Malloc_Header.
-#else
-# if !defined (ACE_PI_MALLOC_PADDING_SIZE)
-#   define ACE_PI_MALLOC_PADDING_SIZE ((int) (ACE_MALLOC_HEADER_SIZE - \
-                                       (sizeof (MALLOC_HEADER_PTR) + sizeof (size_t)))\
-                                       / (int) sizeof (long))
-# endif /* !ACE_PI_MALLOC_PADDING_SIZE */
-    long padding_[ACE_PI_MALLOC_PADDING_SIZE < 1 ? 1 : ACE_PI_MALLOC_PADDING_SIZE];
-#endif /* ACE_PI_MALLOC_PADDING_SIZE && ACE_PI_MALLOC_PADDING_SIZE == 0 */
-
-    void dump (void) const;
-    // Dump the state of the object.
-
-  private:
-    ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Malloc_Header &))
-  };
-
-  class ACE_Export ACE_Name_Node
-  {
-    // = TITLE
-    //    This class supports "named memory regions" within <ACE_Malloc>.
-    //
-    // = DESCRIPTION
-    //   Internally, the named memory regions are stored as a
-    //   doubly-linked list within the <Memory_Pool>.  This makes
-    //   it easy to iterate over the items in the list in both FIFO
-    //   and LIFO order.
-  public:
-    // = Initialization methods.
-    ACE_Name_Node (const char *name,
-                   char *name_ptr,
-                   char *pointer,
-                   ACE_Name_Node *head);
-    // Constructor.
-
-    ACE_Name_Node (const ACE_Name_Node &);
-    // Copy constructor.
-
-    ACE_Name_Node (void);
-    // Constructor.
-
-    ~ACE_Name_Node (void);
-    // Constructor.
-
-    static void init_ptr (NAME_NODE_PTR *ptr,
-                          ACE_Name_Node *init,
-                          void *base_addr);
-    // Initialize a name node pointer.
-
-    const char *name (void) const;
-    // Return a pointer to the name of this node.
-
-    void name (const char *);
-    // Assign a name;
-
-    CHAR_PTR name_;
-    // Name of the Node.
-
-    CHAR_PTR pointer_;
-    // Pointer to the contents.
-
-    NAME_NODE_PTR next_;
-    // Pointer to the next node in the doubly-linked list.
-
-    NAME_NODE_PTR prev_;
-    // Pointer to the previous node in the doubly-linked list.
-
-    void dump (void) const;
-    // Dump the state of the object.
-
-  private:
-    ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Name_Node &))
-  };
-
-  static void print_alignment_info (void);
-  // Print out a bunch of size info for debugging.
-
-  NAME_NODE_PTR name_head_;
-  // Head of the linked list of Name Nodes.
-
-  MALLOC_HEADER_PTR freep_;
-  // Current head of the freelist.
-
-  char lock_name_[MAXNAMELEN];
-  // Name of lock thats ensures mutual exclusion.
-
-#if defined (ACE_HAS_MALLOC_STATS)
-  // Keep statistics about ACE_Malloc state and performance.
-  ACE_Malloc_Stats malloc_stats_;
-#define ACE_PI_CONTROL_BLOCK_SIZE ((int)(sizeof (NAME_NODE_PTR) \
-                                         + sizeof (MALLOC_HEADER_PTR) \
-                                         + MAXNAMELEN  \
-                                         + sizeof (ACE_Malloc_Stats)))
-#else
-#define ACE_PI_CONTROL_BLOCK_SIZE ((int)(sizeof (NAME_NODE_PTR) \
-                                         + sizeof (MALLOC_HEADER_PTR) \
-                                         + MAXNAMELEN))
-#endif /* ACE_HAS_MALLOC_STATS */
-
-#if defined (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS) && (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS == 0)
-  // No padding required for PI_Control_Block.
-#else
-# if !defined (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS)
-// Notice the casting to int for <sizeof> otherwise unsigned int
-// arithmetic is used and some awful things may happen.
-#   define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS \
-            ((ACE_PI_CONTROL_BLOCK_SIZE % ACE_MALLOC_ALIGN != 0 \
-              ? ACE_MALLOC_ALIGN - (ACE_PI_CONTROL_BLOCK_SIZE % ACE_MALLOC_ALIGN) \
-              : ACE_MALLOC_ALIGN) / int (sizeof (long)))
-# endif /* !ACE_PI_CONTROL_BLOCK_ALIGN_LONGS */
-  long align_[ACE_PI_CONTROL_BLOCK_ALIGN_LONGS < 1 ? 1 : ACE_PI_CONTROL_BLOCK_ALIGN_LONGS];
-  // Force alignment.
-#endif /* ACE_PI_CONTROL_BLOCK_ALIGN_LONGS && ACE_PI_CONTROL_BLOCK_ALIGN_LONGS == 0 */
-
-  ACE_Malloc_Header base_;
-  // Dummy node used to anchor the freelist.  This needs to come last...
-
-  void dump (void) const;
-  // Dump the state of the object.
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Control_Block &))
-};
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-class ACE_Export ACE_New_Allocator : public ACE_Allocator
-{
-  // = TITLE
-  //     Defines a class that provided a simple implementation of
-  //     memory allocation.
-  //
-  // = DESCRIPTION
-  //     This class uses the new/delete operators to allocate and free
-  //     up memory.  Please note that the only methods that are
-  //     supported are malloc and free. All other methods are no-ops.
-  //     If you require this functionality, please use:
-  //     ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL,
-  //     MUTEX> > This will allow you to use the added functionality
-  //     of bind/find/etc. while using the new/delete operators.
-public:
-  virtual void *malloc (size_t nbytes);
-  virtual void *calloc (size_t nbytes, char initial_value = '\0');
-  virtual void free (void *ptr);
-  virtual int remove (void);
-  virtual int bind (const char *name, void *pointer, int duplicates = 0);
-  virtual int trybind (const char *name, void *&pointer);
-  virtual int find (const char *name, void *&pointer);
-  virtual int find (const char *name);
-  virtual int unbind (const char *name);
-  virtual int unbind (const char *name, void *&pointer);
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
-  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
-#if defined (ACE_HAS_MALLOC_STATS)
-  virtual void print_stats (void) const;
-#endif /* ACE_HAS_MALLOC_STATS */
-  virtual void dump (void) const;
-
-private:
-  // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!!  See the
-  // <ACE_Allocator::instance> implementation for explanation.
-};
-
-class ACE_Export ACE_Static_Allocator_Base : public ACE_Allocator
-{
-  // = TITLE
-  //     Defines a class that provided a highly optimized memory
-  //     management scheme for allocating memory statically.
-  //
-  // = DESCRIPTION
-  //     This class manages a fixed-size <POOL_SIZE> of memory.  Every
-  //     time <malloc>/<calloc> is called, it simply moves an internal
-  //     index forward and returns a pointer to the requested chunk.
-  //     All memory is allocated statically (typically via the
-  //     <ACE_Static_Allocator> template) and <free> is a no-op.  This
-  //     behavior is useful for use-cases where all the memory
-  //     allocation needs are known in advance and no deletions ever
-  //     occur.
-public:
-  ACE_Static_Allocator_Base (char *buffer, size_t size);
-  virtual void *malloc (size_t nbytes);
-  virtual void *calloc (size_t nbytes, char initial_value = '\0');
-  virtual void free (void *ptr);
-  virtual int remove (void);
-  virtual int bind (const char *name, void *pointer, int duplicates = 0);
-  virtual int trybind (const char *name, void *&pointer);
-  virtual int find (const char *name, void *&pointer);
-  virtual int find (const char *name);
-  virtual int unbind (const char *name);
-  virtual int unbind (const char *name, void *&pointer);
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
-  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
-#if defined (ACE_HAS_MALLOC_STATS)
-  virtual void print_stats (void) const;
-#endif /* ACE_HAS_MALLOC_STATS */
-  virtual void dump (void) const;
-
-protected:
-  ACE_Static_Allocator_Base (void);
-  // Don't allow direct instantiations of this class.
-
-  char *buffer_;
-  // Pointer to the buffer.
-
-  size_t size_;
-  // Size of the buffer.
-
-  size_t offset_;
-  // Pointer to the current offset in the <buffer_>.
-};
-
 #if defined (__ACE_INLINE__)
 #include "ace/Malloc.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Malloc.i b/ace/Malloc.i
index 50760cf65e8..76722f13fb7 100644
--- a/ace/Malloc.i
+++ b/ace/Malloc.i
@@ -19,250 +19,3 @@ ACE_Control_Block::ACE_Name_Node::init_ptr
 {
   *ptr = init;
 }
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-ACE_INLINE
-ACE_PI_Control_Block::ACE_Name_Node::~ACE_Name_Node (void)
-{
-}
-
-ACE_INLINE void
-ACE_PI_Control_Block::ACE_Malloc_Header::init_ptr
-  (MALLOC_HEADER_PTR *ptr, ACE_Malloc_Header *init, void *base_addr)
-{
-  new ((void *) ptr) MALLOC_HEADER_PTR (base_addr, 0);
-  *ptr = init;
-}
-
-ACE_INLINE void
-ACE_PI_Control_Block::ACE_Name_Node::init_ptr
-  (NAME_NODE_PTR *ptr, ACE_Name_Node *init, void *base_addr)
-{
-  new ((void *) ptr) NAME_NODE_PTR (base_addr, 0);
-  *ptr = init;
-}
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-ACE_INLINE void *
-ACE_New_Allocator::malloc (size_t nbytes)
-{
-  char *ptr = 0;
-
-  if (nbytes > 0)
-    ACE_NEW_RETURN (ptr, char[nbytes], 0);
-  return (void *) ptr;
-}
-
-ACE_INLINE void *
-ACE_New_Allocator::calloc (size_t nbytes,
-                           char initial_value)
-{
-  char *ptr = 0;
-
-  ACE_NEW_RETURN (ptr, char[nbytes], 0);
-
-  ACE_OS::memset (ptr, initial_value, nbytes);
-  return (void *) ptr;
-}
-
-ACE_INLINE void
-ACE_New_Allocator::free (void *ptr)
-{
-  delete [] (char *) ptr;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::remove (void)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::bind (const char *, void *, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::trybind (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::find (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::find (const char *)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::unbind (const char *)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::unbind (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::sync (ssize_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::sync (void *, size_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::protect (ssize_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_New_Allocator::protect (void *, size_t, int)
-{
-  return -1;
-}
-
-#if defined (ACE_HAS_MALLOC_STATS)
-ACE_INLINE void
-ACE_New_Allocator::print_stats (void) const
-{
-}
-#endif /* ACE_HAS_MALLOC_STATS */
-
-ACE_INLINE void
-ACE_New_Allocator::dump (void) const
-{
-}
-
-ACE_INLINE void *
-ACE_Static_Allocator_Base::malloc (size_t nbytes)
-{
-  if (this->offset_ + nbytes > this->size_)
-    {
-      errno = ENOMEM;
-      return 0;
-    }
-  else
-    {
-      // Record the current offset, increment the offset by the number
-      // of bytes requested, and return the original offset.
-      char *ptr = &this->buffer_[this->offset_];
-      this->offset_ += nbytes;
-      return (void *) ptr;
-    }
-}
-
-ACE_INLINE void *
-ACE_Static_Allocator_Base::calloc (size_t nbytes,
-                                   char initial_value)
-{
-  void *ptr = this->malloc (nbytes);
-
-  ACE_OS::memset (ptr, initial_value, nbytes);
-  return (void *) ptr;
-}
-
-ACE_INLINE void
-ACE_Static_Allocator_Base::free (void *ptr)
-{
-  // Check to see if ptr is within our pool?!
-  ACE_UNUSED_ARG (ptr);
-  ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_);
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::remove (void)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::bind (const char *, void *, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::trybind (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::find (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::find (const char *)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::unbind (const char *)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::unbind (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::sync (ssize_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::sync (void *, size_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::protect (ssize_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::protect (void *, size_t, int)
-{
-  return -1;
-}
-
-#if defined (ACE_HAS_MALLOC_STATS)
-ACE_INLINE void
-ACE_Static_Allocator_Base::print_stats (void) const
-{
-}
-#endif /* ACE_HAS_MALLOC_STATS */
-
-ACE_INLINE
-ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char *buffer,
-                                                      size_t size)
-  : buffer_ (buffer),
-    size_ (size),
-    offset_ (0)
-{
-}
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
new file mode 100644
index 00000000000..5864513b4dc
--- /dev/null
+++ b/ace/Malloc_Allocator.cpp
@@ -0,0 +1,172 @@
+// $Id$
+
+// FILENAME
+//   Malloc_Allocator.cpp
+//
+// AUTHOR
+//   Priyanka Gontla <pgontla@uci.edu>
+//
+// ==========================================================================
+
+#if !defined (ACE_MALLOC_ALLOCATOR_CPP)
+#define ACE_MALLOC_ALLOCATOR_CPP
+
+#include "ace/Malloc_Allocator.h"
+#include "ace/Object_Manager.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Malloc_Allocator.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/Synch_T.h"
+
+ACE_RCSID (ace, Malloc_Allocator, "$Id$")
+
+ACE_Allocator *
+ACE_Allocator::instance (void)
+{
+  //  ACE_TRACE ("ACE_Allocator::instance");
+
+  if (ACE_Allocator::allocator_ == 0)
+    {
+      // Perform Double-Checked Locking Optimization.
+      ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
+                                *ACE_Static_Object_Lock::instance (), 0));
+
+      if (ACE_Allocator::allocator_ == 0)
+        {
+          // Have a seat.  We want to avoid ever having to delete the
+          // ACE_Allocator instance, to avoid shutdown order
+          // dependencies.  ACE_New_Allocator never needs to be
+          // destroyed:  its destructor is empty and its instance
+          // doesn't have any state.  Therefore, sizeof
+          // ACE_New_Allocator is equal to sizeof void *.  It's
+          // instance just contains a pointer to its virtual function
+          // table.
+          //
+          // So, we allocate space for the ACE_New_Allocator instance
+          // in the data segment.  Because its size is the same as
+          // that of a pointer, we allocate it as a pointer so that it
+          // doesn't get constructed statically.  We never bother to
+          // destroy it.
+          static void *allocator_instance = 0;
+
+          // Check this critical assumption.  We put it in a variable
+          // first to avoid stupid compiler warnings that the
+          // condition may always be true/false.
+#         if !defined (ACE_NDEBUG)
+          int assertion = (sizeof allocator_instance ==
+                           sizeof (ACE_New_Allocator));
+          ACE_ASSERT (assertion);
+#         endif /* !ACE_NDEBUG */
+
+          // Initialize the allocator_instance by using a placement
+          // new.  The ACE_NEW_RETURN below doesn't actually allocate
+          // a new instance.  It just initializes it in place.
+          ACE_NEW_RETURN (ACE_Allocator::allocator_,
+                          (&allocator_instance) ACE_New_Allocator,
+                          0);
+          // If we ever need to cast the address of
+          // allocator_instance, then expand the ACE_NEW_RETURN above
+          // as follows . . .
+          //
+          // ACE_Allocator::allocator_ =
+          //   (ACE_New_Allocator *)
+          //     new (&allocator_instance) ACE_New_Allocator;
+        }
+    }
+
+  return ACE_Allocator::allocator_;
+}
+
+ACE_Allocator *
+ACE_Allocator::instance (ACE_Allocator *r)
+{
+  ACE_TRACE ("ACE_Allocator::instance");
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
+                            *ACE_Static_Object_Lock::instance (), 0));
+  ACE_Allocator *t = ACE_Allocator::allocator_;
+
+  // We can't safely delete it since we don't know who created it!
+  ACE_Allocator::delete_allocator_ = 0;
+
+  ACE_Allocator::allocator_ = r;
+  return t;
+}
+
+void
+ACE_Allocator::close_singleton (void)
+{
+  ACE_TRACE ("ACE_Allocator::close_singleton");
+
+  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
+                     *ACE_Static_Object_Lock::instance ()));
+
+  if (ACE_Allocator::delete_allocator_)
+    {
+      // This should never be executed....  See the
+      // ACE_Allocator::instance (void) method for an explanation.
+      delete ACE_Allocator::allocator_;
+      ACE_Allocator::allocator_ = 0;
+      ACE_Allocator::delete_allocator_ = 0;
+    }
+}
+
+ACE_Allocator::~ACE_Allocator (void)
+{
+  ACE_TRACE ("ACE_Allocator::~ACE_Allocator");
+}
+
+ACE_Allocator::ACE_Allocator (void)
+{
+  ACE_TRACE ("ACE_Allocator::ACE_Allocator");
+}
+
+void
+ACE_Static_Allocator_Base::dump (void) const
+{
+  ACE_TRACE ("ACE_Static_Base_Allocator::dump");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_));
+  ACE_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+}
+
+#if defined (ACE_HAS_MALLOC_STATS)
+ACE_Malloc_Stats::ACE_Malloc_Stats (void)
+  : nblocks_ (0),
+    nchunks_ (0),
+    ninuse_ (0)
+{
+  ACE_TRACE ("ACE_Malloc_Stats::ACE_Malloc_Stats");
+}
+
+void
+ACE_Malloc_Stats::dump (void) const
+{
+  ACE_TRACE ("ACE_Malloc_Stats::print");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  int nblocks = this->nblocks_.value ();
+  int ninuse  = this->ninuse_.value ();
+  int nchunks = this->nchunks_.value ();
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_MALLOC_STATS */
+
+#endif /* ACE_MALLOC_ALLOCATOR_CPP */
diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h
new file mode 100644
index 00000000000..6b8f3286e55
--- /dev/null
+++ b/ace/Malloc_Allocator.h
@@ -0,0 +1,153 @@
+// $Id$
+
+// =========================================================================
+// FILENAME
+//   Malloc_Allocator.h
+//
+// DESCRIPTION
+//   
+// 
+// AUTHOR
+//   Priyanka Gontla <pgontla@ece.uci.edu>
+// ==========================================================================
+
+#ifndef MALLOC_ALLOCATOR_H
+#define MALLOC_ALLOCATOR_H
+#include "ace/pre.h"
+
+#include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Malloc_Base.h"
+#include "ace/Log_Msg.h"
+
+#if defined (ACE_HAS_MALLOC_STATS)
+#include "ace/Synch_T.h"
+#if defined (ACE_HAS_THREADS)
+#define ACE_PROCESS_MUTEX ACE_Process_Mutex
+#else
+#include "ace/SV_Semaphore_Simple.h"
+#define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple
+#endif /* ACE_HAS_THREADS */
+
+typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT;
+
+struct ACE_Export ACE_Malloc_Stats
+// TITLE
+//    This keeps stats on the usage of the memory manager.
+{
+  ACE_Malloc_Stats (void);
+  void dump (void) const;
+
+  ACE_INT nchunks_;
+  // Coarse-grained unit of allocation.
+
+  ACE_INT nblocks_;
+  // Fine-grained unit of allocation.
+
+  ACE_INT ninuse_;
+  // Number of blocks in use
+};
+#define ACE_MALLOC_STATS(X) X
+#else
+#define ACE_MALLOC_STATS(X)
+#endif /* ACE_HAS_MALLOC_STATS */
+
+class ACE_Export ACE_New_Allocator : public ACE_Allocator
+{
+  // = TITLE
+  //     Defines a class that provided a simple implementation of
+  //     memory allocation.
+  //
+  // = DESCRIPTION
+  //     This class uses the new/delete operators to allocate and free
+  //     up memory.  Please note that the only methods that are
+  //     supported are malloc and free. All other methods are no-ops.
+  //     If you require this functionality, please use:
+  //     ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL,
+  //     MUTEX> > This will allow you to use the added functionality
+  //     of bind/find/etc. while using the new/delete operators.
+public:
+  virtual void *malloc (size_t nbytes);
+  virtual void *calloc (size_t nbytes, char initial_value = '\0');
+  virtual void free (void *ptr);
+  virtual int remove (void);
+  virtual int bind (const char *name, void *pointer, int duplicates = 0);
+  virtual int trybind (const char *name, void *&pointer);
+  virtual int find (const char *name, void *&pointer);
+  virtual int find (const char *name);
+  virtual int unbind (const char *name);
+  virtual int unbind (const char *name, void *&pointer);
+  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
+  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
+  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
+  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
+#if defined (ACE_HAS_MALLOC_STATS)
+  virtual void print_stats (void) const;
+#endif /* ACE_HAS_MALLOC_STATS */
+  virtual void dump (void) const;
+
+private:
+  // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!!  See the
+  // <ACE_Allocator::instance> implementation for explanation.
+};
+
+class ACE_Export ACE_Static_Allocator_Base : public ACE_Allocator
+{
+  // = TITLE
+  //     Defines a class that provided a highly optimized memory
+  //     management scheme for allocating memory statically.
+  //
+  // = DESCRIPTION
+  //     This class manages a fixed-size <POOL_SIZE> of memory.  Every
+  //     time <malloc>/<calloc> is called, it simply moves an internal
+  //     index forward and returns a pointer to the requested chunk.
+  //     All memory is allocated statically (typically via the
+  //     <ACE_Static_Allocator> template) and <free> is a no-op.  This
+  //     behavior is useful for use-cases where all the memory
+  //     allocation needs are known in advance and no deletions ever
+  //     occur.
+public:
+  ACE_Static_Allocator_Base (char *buffer, size_t size);
+  virtual void *malloc (size_t nbytes);
+  virtual void *calloc (size_t nbytes, char initial_value = '\0');
+  virtual void free (void *ptr);
+  virtual int remove (void);
+  virtual int bind (const char *name, void *pointer, int duplicates = 0);
+  virtual int trybind (const char *name, void *&pointer);
+  virtual int find (const char *name, void *&pointer);
+  virtual int find (const char *name);
+  virtual int unbind (const char *name);
+  virtual int unbind (const char *name, void *&pointer);
+  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
+  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
+  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
+  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
+#if defined (ACE_HAS_MALLOC_STATS)
+  virtual void print_stats (void) const;
+#endif /* ACE_HAS_MALLOC_STATS */
+  virtual void dump (void) const;
+
+protected:
+  ACE_Static_Allocator_Base (void);
+  // Don't allow direct instantiations of this class.
+
+  char *buffer_;
+  // Pointer to the buffer.
+
+  size_t size_;
+  // Size of the buffer.
+
+  size_t offset_;
+  // Pointer to the current offset in the <buffer_>.
+};
+
+#if defined (__ACE_INLINE__)
+#include "ace/Malloc_Allocator.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* MALLOC_ALLOCATOR_H */
diff --git a/ace/Malloc_Allocator.i b/ace/Malloc_Allocator.i
new file mode 100644
index 00000000000..31e2abc9b2b
--- /dev/null
+++ b/ace/Malloc_Allocator.i
@@ -0,0 +1,225 @@
+// $Id$
+
+ACE_INLINE void *
+ACE_New_Allocator::malloc (size_t nbytes)
+{
+  char *ptr = 0;
+
+  if (nbytes > 0)
+    ACE_NEW_RETURN (ptr, char[nbytes], 0);
+  return (void *) ptr;
+}
+
+ACE_INLINE void *
+ACE_New_Allocator::calloc (size_t nbytes,
+                           char initial_value)
+{
+  char *ptr = 0;
+
+  ACE_NEW_RETURN (ptr, char[nbytes], 0);
+
+  ACE_OS::memset (ptr, initial_value, nbytes);
+  return (void *) ptr;
+}
+
+ACE_INLINE void
+ACE_New_Allocator::free (void *ptr)
+{
+  delete [] (char *) ptr;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::remove (void)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::bind (const char *, void *, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::trybind (const char *, void *&)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::find (const char *, void *&)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::find (const char *)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::unbind (const char *)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::unbind (const char *, void *&)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::sync (ssize_t, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::sync (void *, size_t, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::protect (ssize_t, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_New_Allocator::protect (void *, size_t, int)
+{
+  return -1;
+}
+
+#if defined (ACE_HAS_MALLOC_STATS)
+ACE_INLINE void
+ACE_New_Allocator::print_stats (void) const
+{
+}
+#endif /* ACE_HAS_MALLOC_STATS */
+
+ACE_INLINE void
+ACE_New_Allocator::dump (void) const
+{
+}
+
+ACE_INLINE void *
+ACE_Static_Allocator_Base::malloc (size_t nbytes)
+{
+  if (this->offset_ + nbytes > this->size_)
+    {
+      errno = ENOMEM;
+      return 0;
+    }
+  else
+    {
+      // Record the current offset, increment the offset by the number
+      // of bytes requested, and return the original offset.
+      char *ptr = &this->buffer_[this->offset_];
+      this->offset_ += nbytes;
+      return (void *) ptr;
+    }
+}
+
+ACE_INLINE void *
+ACE_Static_Allocator_Base::calloc (size_t nbytes,
+                                   char initial_value)
+{
+  void *ptr = this->malloc (nbytes);
+
+  ACE_OS::memset (ptr, initial_value, nbytes);
+  return (void *) ptr;
+}
+
+ACE_INLINE void
+ACE_Static_Allocator_Base::free (void *ptr)
+{
+  // Check to see if ptr is within our pool?!
+  ACE_UNUSED_ARG (ptr);
+  ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_);
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::remove (void)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::bind (const char *, void *, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::trybind (const char *, void *&)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::find (const char *, void *&)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::find (const char *)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::unbind (const char *)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::unbind (const char *, void *&)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::sync (ssize_t, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::sync (void *, size_t, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::protect (ssize_t, int)
+{
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Static_Allocator_Base::protect (void *, size_t, int)
+{
+  return -1;
+}
+
+#if defined (ACE_HAS_MALLOC_STATS)
+ACE_INLINE void
+ACE_Static_Allocator_Base::print_stats (void) const
+{
+}
+#endif /* ACE_HAS_MALLOC_STATS */
+
+ACE_INLINE
+ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char *buffer,
+                                                      size_t size)
+  : buffer_ (buffer),
+    size_ (size),
+    offset_ (0)
+{
+}
diff --git a/ace/Malloc_Instantiations.cpp b/ace/Malloc_Instantiations.cpp
new file mode 100644
index 00000000000..72ba9edea67
--- /dev/null
+++ b/ace/Malloc_Instantiations.cpp
@@ -0,0 +1,33 @@
+// $Id$
+
+#include "ace/Malloc.h"
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> >;
+
+// Explicitly instantiate these templates in the multithreaded case
+// since some classes need them.
+# if defined (ACE_HAS_THREADS)
+template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>;
+template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >;
+# endif  /* ACE_HAS_THREADS */
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
+#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
+
+// Explicitly instantiate these templates in the multithreaded case
+// since some classes need them.
+# if defined (ACE_HAS_THREADS)
+#  pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>
+#  pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
+#  pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >
+# endif  /* ACE_HAS_THREADS */
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 19b903771ef..396d6e68a6c 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Synch.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_Allocator.h"
 #include "ace/Free_List.h"
 
 template <class T>
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 9ea71f3e1f9..2fe32482e8c 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -199,8 +199,9 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name,
       ACE_OS::strcpy (this->backing_store_name_,
                       ACE_DEFAULT_BACKING_STORE);
 #else /* ACE_DEFAULT_BACKING_STORE */
-      if (ACE::get_temp_dir (this->backing_store_name_,
-                             MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX
+      if (ACE_Lib_Find::get_temp_dir (this->backing_store_name_,
+                                      MAXPATHLEN - 17) == -1) 
+        // -17 for ace-malloc-XXXXXX
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("Temporary path too long, ")
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index c5fc634276b..2f020757cd8 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -20,6 +20,13 @@ typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> L
 // Server client.
 
 ACE_FACTORY_DEFINE (ACE, ACE_Naming_Context)
+ACE_STATIC_SVC_DEFINE (ACE_Naming_Context,
+                       ACE_TEXT ("ACE_Naming_Context"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (ACE_Naming_Context),
+                       ACE_Service_Type::DELETE_THIS |
+                       ACE_Service_Type::DELETE_OBJ,
+                       0)
 
 // The ACE_Naming_Context static service object is now defined
 // by the ACE_Object_Manager, in Object_Manager.cpp.
@@ -419,7 +426,7 @@ ACE_Name_Options::ACE_Name_Options (void)
   size_t pathsize = (MAXPATHLEN + 1) * sizeof (ACE_TCHAR);
   this->namespace_dir_ = ACE_static_cast (ACE_TCHAR *, ACE_OS::malloc (pathsize));
 
-  if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
+  if (ACE_Lib_Find::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_LIB_TEXT ("Temporary path too long, ")
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index da03a26c0bc..4bb22fb27a7 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -330,6 +330,8 @@ private:
 };
 
 ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context)
+ACE_STATIC_SVC_DECLARE (ACE_Naming_Context)
+ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context)
 
 #include "ace/post.h"
 #endif /* ACE_NAMING_CONTEXT_H */
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 6e631a8f734..817620a482b 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -430,6 +430,7 @@ ACE_OS_Exit_Info::call_hooks ()
         (* ACE_reinterpret_cast (ACE_EXIT_HOOK, info.cleanup_hook_)) ();
       else
         (*info.cleanup_hook_) (info.object_, info.param_);
+      
     }
 }
 
diff --git a/ace/OS.h b/ace/OS.h
index eabfd29a181..2f9f021d61a 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1480,12 +1480,27 @@ typedef void (*ACE_Service_Object_Exterminator)(void *);
 # define ACE_STATIC_SVC_DECLARE(X) extern ACE_Static_Svc_Descriptor ace_svc_desc_##X ;
 # define ACE_STATIC_SVC_DEFINE(X, NAME, TYPE, FN, FLAGS, ACTIVE) \
 ACE_Static_Svc_Descriptor ace_svc_desc_##X = { NAME, TYPE, FN, FLAGS, ACTIVE };
+
+#if defined(ACE_LACKS_STATIC_CONSTRUCTORS)
+# define ACE_STATIC_SVC_REQUIRE(X)\
+class ACE_Static_Svc_##X {\
+public:\
+        ACE_Static_Svc_##X() { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_##X); }\
+};
+#define ACE_STATIC_SVC_REGISTER(X)\
+ACE_Static_Svc_##X ace_static_svc_##X
+
+#else /* !ACE_LACKS_STATIC_CONSTRUCTORS */
+
 # define ACE_STATIC_SVC_REQUIRE(X)\
 class ACE_Static_Svc_##X {\
 public:\
         ACE_Static_Svc_##X() { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_##X); }\
 };\
 static ACE_Static_Svc_##X ace_static_svc_##X;
+#define ACE_STATIC_SVC_REGISTER(X) do {} while (0)
+
+#endif /* !ACE_LACKS_STATIC_CONSTRUCTORS */
 
 
 // More generic dynamic/static service macros.
@@ -3727,7 +3742,7 @@ extern "C"
 #   endif /* ACE_DEFAULT_GLOBALNAME_A */
 
 // ACE_DEFAULT_NAMESPACE_DIR is for legacy mode apps.  A better
-// way of doing this is something like ACE::get_temp_dir, since
+// way of doing this is something like ACE_Lib_Find::get_temp_dir, since
 // this directory may not exist
 #   if defined (ACE_LEGACY_MODE)
 #     if defined (ACE_WIN32)
@@ -4958,7 +4973,7 @@ public:
   static int hostname (char *name,
                        size_t maxnamelen);
 
-#if defined (ACE_HAS_WCHAR)  
+#if defined (ACE_HAS_WCHAR)
   static int hostname (wchar_t *name,
                        size_t maxnamelen);
 #endif /* ACE_HAS_WCHAR */
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 69386704777..2282910c3e4 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -11,9 +11,11 @@
 #  include "ace/Reactor.h"
 #  include "ace/Thread_Manager.h"
 #else  /* ! ACE_LACKS_ACE_SVCCONF */
+#if 0
 #  if !defined (ACE_HAS_WINCE)  && !defined (ACE_LACKS_ACE_OTHER)
 #    include "ace/Naming_Context.h"
 #  endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* 0 */
 #  include "ace/Service_Manager.h"
 #  include "ace/Service_Config.h"
 #endif /* ! ACE_LACKS_ACE_SVCCONF */
@@ -103,9 +105,11 @@ public:
   ~ACE_Object_Manager_Preallocations (void);
 
 private:
+#if 0
 #if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
   ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Naming_Context;
 #endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* 0 */
   ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Service_Manager;
 };
 
@@ -118,9 +122,10 @@ private:
 
 ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
 {
+#if 0
   // Define the static services.  This macro call creates static
   // service descriptors that are used for initialization below.
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER) 
+#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
   ACE_STATIC_SVC_DEFINE (ACE_Naming_Context_initializer,
                          ACE_LIB_TEXT ("ACE_Naming_Context"),
                          ACE_SVC_OBJ_T,
@@ -130,6 +135,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
                          0)
 
 #endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* 0 */
 
   ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer,
                          ACE_LIB_TEXT ("ACE_Service_Manager"),
@@ -139,21 +145,25 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
                            ACE_Service_Type::DELETE_OBJ,
                          0)
 
+#if 0
   // Initialize the static service objects using the descriptors created
   // above.
 #if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
   ace_svc_desc_ACE_Naming_Context =
     ace_svc_desc_ACE_Naming_Context_initializer;
 #endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* 0 */
 
   ace_svc_desc_ACE_Service_Manager =
     ace_svc_desc_ACE_Service_Manager_initializer;
 
+#if 0
   // Add to the list of static configured services.
 #if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
   ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_ACE_Naming_Context);
 #endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* 0 */
 
   ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_ACE_Service_Manager);
@@ -610,7 +620,8 @@ ACE_Object_Manager::fini (void)
 
 #  if (((defined (ACE_HAS_WINNT)) && (ACE_HAS_WINNT == 1)) || (defined (ACE_HAS_AIO_CALLS)))
       ACE_Proactor::close_singleton ();
-#  endif /* !ACE_HAS_WINCE */
+#  endif / !ACE_HAS_WINCE /
+
 
 #  if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS)
       ACE_Thread_Manager::close_singleton ();
diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp
new file mode 100644
index 00000000000..8d2014675f4
--- /dev/null
+++ b/ace/PI_Malloc.cpp
@@ -0,0 +1,185 @@
+// $Id$
+
+// FILENAME
+//   PI_Malloc.cpp
+//
+// AUTHOR
+//   Priyanka Gontla <pgontla@ece.uci.edu>
+//
+// =========================================================================
+
+#if !defined (ACE_PI_MALLOC_CPP)
+#define ACE_PI_MALLOC_CPP
+
+#include "ace/PI_Malloc.h"
+#include "ace/Object_Manager.h"
+#include "ace/Process_Mutex.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/PI_Malloc.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/Synch_T.h"
+
+ACE_RCSID(ace, Malloc, "$Id$")
+
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+void
+ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
+{
+  ACE_TRACE ("ACE_Malloc_Header::dump");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+}
+
+void
+ACE_PI_Control_Block::print_alignment_info (void)
+{
+  ACE_TRACE ("ACE_Control_Block::print_alignment_info");
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n")));
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Sizeof ptr: %d\n")
+              ACE_TEXT ("Sizeof size_t: %d\n")
+              ACE_TEXT ("Sizeof long: %d\n")
+              ACE_TEXT ("Sizeof double: %d\n")
+              ACE_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n")
+              ACE_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n")
+              ACE_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n")
+              ACE_TEXT ("Sizeof ACE_PI_MALLOC_PADDING_SIZE: %d\n")
+              ACE_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_SIZE: %d\n")
+              ACE_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_ALIGN_LONGS: %d\n")
+              ACE_TEXT ("Sizeof (MALLOC_HEADER): %d\n")
+              ACE_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"),
+              sizeof (char *),
+              sizeof (size_t),
+              sizeof (long),
+              sizeof (double),
+              ACE_MALLOC_ALIGN,
+              ACE_MALLOC_PADDING,
+              ACE_MALLOC_HEADER_SIZE,
+              ACE_PI_MALLOC_PADDING_SIZE,
+              ACE_PI_CONTROL_BLOCK_SIZE,
+              ACE_PI_CONTROL_BLOCK_ALIGN_LONGS,
+              sizeof (ACE_Malloc_Header),
+              sizeof (ACE_PI_Control_Block)
+              ));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n")));
+}
+
+void
+ACE_PI_Control_Block::dump (void) const
+{
+  ACE_TRACE ("ACE_Control_Block::dump");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n")));
+  for (ACE_Name_Node *nextn = this->name_head_;
+       nextn != 0;
+       nextn = nextn->next_)
+    nextn->dump ();
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_));
+  this->base_.dump ();
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n")));
+  for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_;
+       nexth != 0 && nexth != &this->base_;
+       nexth = nexth->next_block_)
+    nexth->dump ();
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+}
+
+ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
+{
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+}
+
+ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
+                                                    char *name_ptr,
+                                                    char *pointer,
+                                                    ACE_Name_Node *next)
+  : name_ (name_ptr),
+    pointer_ (pointer),
+    next_ (next),
+    prev_ (0)
+{
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  char *n = this->name_;
+  ACE_OS::strcpy (n, name);
+  if (next != 0)
+    next->prev_ = this;
+}
+
+ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
+{
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_ASSERT (0); // not implemented!
+}
+
+const char *
+ACE_PI_Control_Block::ACE_Name_Node::name (void) const
+{
+  const char *c = this->name_;
+  return c;
+}
+
+void
+ACE_PI_Control_Block::ACE_Name_Node::name (const char *)
+{
+  ACE_ASSERT (0); // not implemented yet.
+}
+
+ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
+  : next_block_ (0),
+    size_ (0)
+{
+}
+
+void
+ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
+{
+  ACE_TRACE ("ACE_Name_Node");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_));
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT("\nname_ = (%x, %s)"),
+              (const char *) this->name_,
+              (const char *) this->name_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+}
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+
+/*
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>
+#endif *//* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+//#endif /* ACE_HAS_MALLOC_STATS */
+
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>;
+template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>;
+template class ACE_Based_Pointer_Basic<char>;
+template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header>;
+template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>
+#pragma instantiate ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>
+#pragma instantiate ACE_Based_Pointer_Basic<char>
+#pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header>
+#pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1*/
+
+#endif /* ACE_PI_MALLOC_CPP */
+
diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h
new file mode 100644
index 00000000000..ed3ed9ba702
--- /dev/null
+++ b/ace/PI_Malloc.h
@@ -0,0 +1,257 @@
+// $Id$
+
+// ==========================================================================
+// FILENAME
+//   PI_Malloc.h
+//
+// AUTHOR
+//   Priyanka Gontla <pgontla@ece.uci.edu>
+//
+// ==========================================================================
+#ifndef ACE_PI_MALLOC_H
+#define ACE_PI_MALLOC_H
+#include "ace/pre.h"
+
+#include "ace/ACE.h"
+#include "Malloc.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+#include "ace/Based_Pointer_T.h"
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+
+#if defined (ACE_HAS_MALLOC_STATS)
+#include "ace/Synch_T.h"
+#if defined (ACE_HAS_THREADS)
+#define ACE_PROCESS_MUTEX ACE_Process_Mutex
+#else
+#include "ace/SV_Semaphore_Simple.h"
+#define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple
+#endif /* ACE_HAS_THREADS */
+
+typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT;
+struct ACE_Export ACE_Malloc_Stats
+// TITLE
+//    This keeps stats on the usage of the memory manager.
+{
+  ACE_Malloc_Stats (void);
+  void dump (void) const;
+
+  ACE_INT nchunks_;
+  // Coarse-grained unit of allocation.
+
+  ACE_INT nblocks_;
+  // Fine-grained unit of allocation.
+
+  ACE_INT ninuse_;
+  // Number of blocks in use
+};
+#define ACE_MALLOC_STATS(X) X
+#else
+#define ACE_MALLOC_STATS(X)
+#endif /* ACE_HAS_MALLOC_STATS */
+
+#if !defined (ACE_MALLOC_PADDING)
+// ACE_MALLOC_PADDING allows you to insure that allocated regions are
+// at least <ACE_MALLOC_PADDING> bytes long.  It is especially useful
+// when you want areas to be at least a page long, or 32K long, or
+// something like that.  It doesn't guarantee alignment to an address
+// multiple, like 8-byte data alignment, etc.  The allocated area's
+// padding to your selected size is done with an added array of long[]
+// and your compiler will decide how to align things in memory.
+
+#define ACE_MALLOC_PADDING 1
+#endif /* ACE_MALLOC_PADDING */
+
+#if !defined (ACE_MALLOC_ALIGN)
+// Align the malloc header size to a multiple of a double.
+#define ACE_MALLOC_ALIGN (sizeof (double))
+#endif /* ACE_MALLOC_ALIGN */
+
+// ACE_MALLOC_HEADER_SIZE is the normalized malloc header size.
+#define ACE_MALLOC_HEADER_SIZE (ACE_MALLOC_PADDING % ACE_MALLOC_ALIGN == 0 \
+                                ? ACE_MALLOC_PADDING \
+                                : (((ACE_MALLOC_PADDING / ACE_MALLOC_ALIGN) + 1) \
+                                   * ACE_MALLOC_ALIGN))
+
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+
+// prepare for position independent malloc
+class ACE_Export ACE_PI_Control_Block
+{
+  // = TITLE
+  //    This information is stored in memory allocated by the <Memory_Pool>.
+  //
+  // = DESCRIPTION
+  //    This class implements the control block structure that can be
+  //    used in a "position indepent" fashion, i.e., you don't need to
+  //    "map" the underlying memory pool to the same address in
+  //    processes sharing the memory.  The tradoff of this flexibility
+  //    is more expensive malloc/free operations.
+public:
+  class ACE_Malloc_Header;
+  class ACE_Name_Node;
+
+  typedef ACE_Based_Pointer<ACE_Malloc_Header> MALLOC_HEADER_PTR;
+  typedef ACE_Based_Pointer<ACE_Name_Node> NAME_NODE_PTR;
+  typedef ACE_Based_Pointer_Basic<char> CHAR_PTR;
+
+  class ACE_Export ACE_Malloc_Header
+  {
+    // = TITLE
+    //    This is the control block header.  It's used by <ACE_Malloc>
+    //    to keep track of each chunk of data when it's in the free
+    //    list or in use.
+  public:
+    ACE_Malloc_Header (void);
+
+    MALLOC_HEADER_PTR next_block_;
+    // Points to next block if on free list.
+
+    static void init_ptr (MALLOC_HEADER_PTR *ptr,
+                          ACE_Malloc_Header *init,
+                          void *base_addr);
+    // Initialize a malloc header pointer.
+
+    size_t size_;
+    // Size of this header control block.
+
+#if defined (ACE_PI_MALLOC_PADDING_SIZE) && (ACE_PI_MALLOC_PADDING_SIZE == 0)
+    // No padding required for PI_Malloc_Header.
+#else
+# if !defined (ACE_PI_MALLOC_PADDING_SIZE)
+#   define ACE_PI_MALLOC_PADDING_SIZE ((int) (ACE_MALLOC_HEADER_SIZE - \
+                                       (sizeof (MALLOC_HEADER_PTR) + sizeof (size_t)))\
+                                       / (int) sizeof (long))
+# endif /* !ACE_PI_MALLOC_PADDING_SIZE */
+    long padding_[ACE_PI_MALLOC_PADDING_SIZE < 1 ? 1 : ACE_PI_MALLOC_PADDING_SIZE];
+#endif /* ACE_PI_MALLOC_PADDING_SIZE && ACE_PI_MALLOC_PADDING_SIZE == 0 */
+
+    void dump (void) const;
+    // Dump the state of the object.
+
+  private:
+    ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Malloc_Header &))
+  };
+
+  class ACE_Export ACE_Name_Node
+  {
+    // = TITLE
+    //    This class supports "named memory regions" within <ACE_Malloc>.
+    //
+    // = DESCRIPTION
+    //   Internally, the named memory regions are stored as a
+    //   doubly-linked list within the <Memory_Pool>.  This makes
+    //   it easy to iterate over the items in the list in both FIFO
+    //   and LIFO order.
+  public:
+    // = Initialization methods.
+    ACE_Name_Node (const char *name,
+                   char *name_ptr,
+                   char *pointer,
+                   ACE_Name_Node *head);
+    // Constructor.
+
+    ACE_Name_Node (const ACE_Name_Node &);
+    // Copy constructor.
+
+    ACE_Name_Node (void);
+    // Constructor.
+
+    ~ACE_Name_Node (void);
+    // Constructor.
+
+    static void init_ptr (NAME_NODE_PTR *ptr,
+                          ACE_Name_Node *init,
+                          void *base_addr);
+    // Initialize a name node pointer.
+
+    const char *name (void) const;
+    // Return a pointer to the name of this node.
+
+    void name (const char *);
+    // Assign a name;
+
+    CHAR_PTR name_;
+    // Name of the Node.
+
+    CHAR_PTR pointer_;
+    // Pointer to the contents.
+
+    NAME_NODE_PTR next_;
+    // Pointer to the next node in the doubly-linked list.
+
+    NAME_NODE_PTR prev_;
+    // Pointer to the previous node in the doubly-linked list.
+
+    void dump (void) const;
+    // Dump the state of the object.
+
+  private:
+    ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Name_Node &))
+  };
+
+  static void print_alignment_info (void);
+  // Print out a bunch of size info for debugging.
+
+  NAME_NODE_PTR name_head_;
+  // Head of the linked list of Name Nodes.
+
+  MALLOC_HEADER_PTR freep_;
+  // Current head of the freelist.
+
+  char lock_name_[MAXNAMELEN];
+  // Name of lock thats ensures mutual exclusion.
+
+#if defined (ACE_HAS_MALLOC_STATS)
+  // Keep statistics about ACE_Malloc state and performance.
+  ACE_Malloc_Stats malloc_stats_;
+#define ACE_PI_CONTROL_BLOCK_SIZE ((int)(sizeof (NAME_NODE_PTR) \
+                                         + sizeof (MALLOC_HEADER_PTR) \
+                                         + MAXNAMELEN  \
+                                         + sizeof (ACE_Malloc_Stats)))
+#else
+#define ACE_PI_CONTROL_BLOCK_SIZE ((int)(sizeof (NAME_NODE_PTR) \
+                                         + sizeof (MALLOC_HEADER_PTR) \
+                                         + MAXNAMELEN))
+#endif /* ACE_HAS_MALLOC_STATS */
+
+#if defined (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS) && (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS == 0)
+  // No padding required for PI_Control_Block.
+#else
+# if !defined (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS)
+// Notice the casting to int for <sizeof> otherwise unsigned int
+// arithmetic is used and some awful things may happen.
+#   define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS \
+            ((ACE_PI_CONTROL_BLOCK_SIZE % ACE_MALLOC_ALIGN != 0 \
+              ? ACE_MALLOC_ALIGN - (ACE_PI_CONTROL_BLOCK_SIZE % ACE_MALLOC_ALIGN) \
+              : ACE_MALLOC_ALIGN) / int (sizeof (long)))
+# endif /* !ACE_PI_CONTROL_BLOCK_ALIGN_LONGS */
+  long align_[ACE_PI_CONTROL_BLOCK_ALIGN_LONGS < 1 ? 1 : ACE_PI_CONTROL_BLOCK_ALIGN_LONGS];
+  // Force alignment.
+#endif /* ACE_PI_CONTROL_BLOCK_ALIGN_LONGS && ACE_PI_CONTROL_BLOCK_ALIGN_LONGS == 0 */
+
+  ACE_Malloc_Header base_;
+  // Dummy node used to anchor the freelist.  This needs to come last...
+
+  void dump (void) const;
+  // Dump the state of the object.
+
+private:
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Control_Block &))
+};
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+
+#if defined (__ACE_INLINE__)
+#include "ace/PI_Malloc.i"
+#endif /* __ACE_INLINE__ */
+
+// Include the ACE_Malloc templates and ACE_Memory_Pool classes at this point.
+#include "ace/Malloc_T.h"
+#include "ace/Memory_Pool.h"
+
+#include "ace/post.h"
+#endif /* ACE_PI_MALLOC_H */
diff --git a/ace/PI_Malloc.i b/ace/PI_Malloc.i
new file mode 100644
index 00000000000..b082b523618
--- /dev/null
+++ b/ace/PI_Malloc.i
@@ -0,0 +1,25 @@
+// $Id$
+
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+ACE_INLINE
+ACE_PI_Control_Block::ACE_Name_Node::~ACE_Name_Node (void)
+{
+}
+
+ACE_INLINE void
+ACE_PI_Control_Block::ACE_Malloc_Header::init_ptr
+  (MALLOC_HEADER_PTR *ptr, ACE_Malloc_Header *init, void *base_addr)
+{
+  new ((void *) ptr) MALLOC_HEADER_PTR (base_addr, 0);
+  *ptr = init;
+}
+
+ACE_INLINE void
+ACE_PI_Control_Block::ACE_Name_Node::init_ptr
+  (NAME_NODE_PTR *ptr, ACE_Name_Node *init, void *base_addr)
+{
+  new ((void *) ptr) NAME_NODE_PTR (base_addr, 0);
+  *ptr = init;
+}
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index e51aa4514e7..3c279596cb4 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -4,10 +4,8 @@
 
 #if defined (ACE_HAS_AIO_CALLS)
 
-
 #include "ace/Proactor.h"
 #include "ace/Message_Block.h"
-#include "ace/Service_Config.h"
 #include "ace/INET_Addr.h"
 #include "ace/Task_T.h"
 #include "ace/POSIX_Proactor.h"
@@ -171,13 +169,13 @@ ACE_POSIX_Asynch_Operation::cancel (void)
 {
   ACE_Proactor *p = this->proactor () ;
 
-  if (!p) 
+  if (!p)
     return -1;
 
-  ACE_POSIX_Proactor * p_impl = ACE_dynamic_cast 
+  ACE_POSIX_Proactor * p_impl = ACE_dynamic_cast
     (ACE_POSIX_Proactor *,
      p->implementation ());
-  if (!p_impl) 
+  if (!p_impl)
     return -1;
 
   // For <ACE_SUN_Proactor> this function is not implemented yet.  We
@@ -185,13 +183,13 @@ ACE_POSIX_Asynch_Operation::cancel (void)
   // information about aio_result_t.
 
   if (p_impl->get_impl_type () == ACE_POSIX_Proactor::PROACTOR_SUN)
-    return -1;       
-   
+    return -1;
+
   int result = ::aio_cancel (this->handle_, 0);
-  
+
   if (result == -1)
     return -1;
-  
+
   // Check the return value and return 0/1/2 appropriately.
   if (result == AIO_CANCELED)
     return 0;
@@ -199,7 +197,7 @@ ACE_POSIX_Asynch_Operation::cancel (void)
     return 1;
   else if (result == AIO_NOTCANCELED)
     return 2;
-  else 
+  else
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P | %t):%p\n"
                        "ACE_POSIX_Asynch_Operation::cancel: "
@@ -243,8 +241,8 @@ ACE_POSIX_AIOCB_Asynch_Operation::~ACE_POSIX_AIOCB_Asynch_Operation (void)
 {
 }
 
-int 
-ACE_POSIX_AIOCB_Asynch_Operation::register_and_start_aio (ACE_POSIX_Asynch_Result *result, 
+int
+ACE_POSIX_AIOCB_Asynch_Operation::register_and_start_aio (ACE_POSIX_Asynch_Result *result,
                                                           int op)
 {
   return this->posix_proactor ()->register_and_start_aio (result, op);
@@ -337,7 +335,7 @@ ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void)
 }
 
 // = Base class operations. These operations are here to kill
-//   dominance warnings. These methods call the base class methods. 
+//   dominance warnings. These methods call the base class methods.
 
 u_long
 ACE_POSIX_Asynch_Read_Stream_Result::bytes_transferred (void) const
@@ -451,7 +449,7 @@ ACE_POSIX_AIOCB_Asynch_Read_Stream::shared_read (ACE_POSIX_Asynch_Read_Stream_Re
 {
   result->aio_sigevent.sigev_notify = SIGEV_NONE;
 
-  // try start read 
+  // try start read
   return register_and_start_aio (result, 0);
 }
 
@@ -532,9 +530,9 @@ ACE_POSIX_SIG_Asynch_Read_Stream::shared_read (ACE_POSIX_Asynch_Read_Stream_Resu
   // We want queuing of RT signal to notify completion.
   result->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
   result->aio_sigevent.sigev_signo = result->signal_number ();
-  
+
   // Keep ACE_POSIX_Asynch_Result, the base class pointer in the
-  // signal value. 
+  // signal value.
   ACE_POSIX_Asynch_Result *base_result = result;
   result->aio_sigevent.sigev_value.sival_ptr = ACE_reinterpret_cast (void *,
                                                                      base_result);
@@ -759,7 +757,7 @@ ACE_POSIX_AIOCB_Asynch_Write_Stream::shared_write (ACE_POSIX_Asynch_Write_Stream
 {
   result->aio_sigevent.sigev_notify = SIGEV_NONE;
 
-  // try start write 
+  // try start write
   return register_and_start_aio (result, 1);
 }
 
@@ -841,7 +839,7 @@ ACE_POSIX_SIG_Asynch_Write_Stream::shared_write (ACE_POSIX_Asynch_Write_Stream_R
   result->aio_sigevent.sigev_signo = result->signal_number ();
 
   // Keep ACE_POSIX_Asynch_Result, the base class pointer in the
-  // signal value. 
+  // signal value.
   ACE_POSIX_Asynch_Result *base_result = result;
   result->aio_sigevent.sigev_value.sival_ptr = ACE_reinterpret_cast (void *,
                                                                      base_result);
@@ -1009,7 +1007,7 @@ ACE_POSIX_Asynch_Read_File_Result::signal_number (void) const
 
 // The following methods belong to
 // ACE_POSIX_Asynch_Read_Stream_Result. They are here to avoid
-// dominace warnings. These methods route their call to the 
+// dominace warnings. These methods route their call to the
 // ACE_POSIX_Asynch_Read_Stream_Result base class.
 
 u_long
@@ -1073,7 +1071,7 @@ ACE_POSIX_AIOCB_Asynch_Read_File::read (ACE_Message_Block &message_block,
 
   if (return_val == -1)
     delete result;
-  
+
   return return_val;
 }
 
@@ -1157,10 +1155,10 @@ ACE_POSIX_SIG_Asynch_Read_File::read (ACE_Message_Block &message_block,
                   -1);
 
   ssize_t return_val = this->shared_read (result);
-  
+
   if (return_val == -1)
     delete result;
-  
+
   return return_val;
 }
 
@@ -1325,17 +1323,17 @@ int
 ACE_POSIX_Asynch_Write_File_Result::priority (void) const
 {
   return ACE_POSIX_Asynch_Result::priority ();
-} 
+}
 
 int
 ACE_POSIX_Asynch_Write_File_Result::signal_number (void) const
 {
   return ACE_POSIX_Asynch_Result::signal_number ();
-} 
+}
 
 // The following methods belong to
 // ACE_POSIX_Asynch_Write_Stream_Result. They are here to avoid
-// dominance warnings. These methods route their call to the 
+// dominance warnings. These methods route their call to the
 // ACE_POSIX_Asynch_Write_Stream_Result base class.
 
 u_long
@@ -1396,10 +1394,10 @@ ACE_POSIX_AIOCB_Asynch_Write_File::write (ACE_Message_Block &message_block,
                   -1);
 
   ssize_t return_val = this->shared_write (result);
-  
+
   if (return_val == -1)
     delete result;
-  
+
   return return_val;
 }
 
@@ -1486,7 +1484,7 @@ ACE_POSIX_SIG_Asynch_Write_File::write (ACE_Message_Block &message_block,
 
   if (return_val == -1)
     delete result;
-  
+
   return return_val;
 }
 
@@ -1699,7 +1697,7 @@ protected:
   // Constructor. Give the reactor so that it can activate/deactivate
   // the handlers. Give also the proactor used here, so that the
   // handler can send the <POSIX_Asynch_Accept> result block through
-  // <post_completion>. 
+  // <post_completion>.
 
   int register_accept_call_i (ACE_POSIX_Asynch_Accept_Result* result);
   // Worker method for registering this <accept> call with the local
@@ -1717,7 +1715,7 @@ protected:
 
   ACE_POSIX_Proactor *posix_proactor_;
   // POSIX_Proactor.
-  
+
   ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result*> result_queue_;
   // Queue of Result pointers that correspond to all the <accept>'s
   // pending.
@@ -1745,11 +1743,11 @@ public:
   // Constructor. Give the reactor so that it can activate/deactivate
   // the handlers. Give also the proactor used here, so that the
   // handler can send information through the notification pipe
-  // (<post_completion>). 
+  // (<post_completion>).
 
   ~ACE_POSIX_AIOCB_Asynch_Accept_Handler (void);
   // Destructor.
-  
+
   int register_accept_call (ACE_POSIX_Asynch_Accept_Result* result);
   // Register this <accept> call with the local handler.
 
@@ -1818,7 +1816,7 @@ ACE_POSIX_Asynch_Accept_Handler::register_accept_call_i (ACE_POSIX_Asynch_Accept
                            "Reactor::resume_handler failed\n"),
                           -1);
     }
-  
+
   return 0;
 }
 
@@ -1843,7 +1841,7 @@ ACE_POSIX_Asynch_Accept_Handler::deregister_accept_call (void)
                        "deregister_accept_call:dequeueing failed"),
                       0);
 
-  ACE_ASSERT (result != 0);
+  // ACE_ASSERT (result != 0);
 
   // Disable the <handle> in the reactor if no <accept>'s are pending.
   if (this->result_queue_.size () == 0)
@@ -1853,7 +1851,7 @@ ACE_POSIX_Asynch_Accept_Handler::deregister_accept_call (void)
                            "%N:%l:(%P | %t):%p\n",
                            "ACE_POSIX_Asynch_Accept_Handler::"
                            "deregister_accept_call:suspend handler failed"),
-                          0);  
+                          0);
     }
 
   // Return the result pointer.
@@ -1923,7 +1921,7 @@ ACE_POSIX_AIOCB_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
                        "ACE_POSIX_AIOCB_Asynch_Accept_Handler::"
                        "handle_input:<post_completion> failed"),
                       -1);
-  
+
   return 0;
 }
 
@@ -1946,11 +1944,11 @@ ACE_POSIX_SIG_Asynch_Accept_Handler::register_accept_call (ACE_POSIX_Asynch_Acce
   // and thru the auxillary thread in the deregister fun. So let us
   // mutex it.
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-  
+
   // Do the work.
   if (this->register_accept_call_i (result) == -1)
     return -1;
-  
+
   return 0;
 }
 
@@ -1960,7 +1958,7 @@ ACE_POSIX_SIG_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
   // An <accept> has been sensed on the <listen_handle>. We should be
   // able to just go ahead and do the <accept> now on this <fd>. This
   // should be the same as the <listen_handle>.
-  
+
   // Deregister this info pertaining to this <accept> call.
   ACE_POSIX_Asynch_Accept_Result* result = this->deregister_accept_call ();
   if (result == 0)
@@ -1969,7 +1967,7 @@ ACE_POSIX_SIG_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
                        "ACE_POSIX_SIG_Asynch_Accept_Handler::"
                        "handle_input:deregister_accept_call failed"),
                       -1);
-  
+
   // Issue <accept> now.
   // @@ We shouldnt block here since we have already done poll/select
   // thru reactor. But are we sure?
@@ -1982,7 +1980,7 @@ ACE_POSIX_SIG_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
                       -1);
 
   // Accept has completed.
-  
+
   // Store the new handle.
   result->aio_fildes = new_handle;
 
@@ -1993,7 +1991,7 @@ ACE_POSIX_SIG_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
                        "ACE_POSIX_SIG_Asynch_Accept_Handler::"
                        "handle_input:<post_completion> failed"),
                       -1);
-  
+
   return 0;
 }
 
@@ -2042,7 +2040,7 @@ ACE_POSIX_AIOCB_Asynch_Accept::accept (ACE_Message_Block &message_block,
   // Register this <accept> call with the local handler.
   if (this->accept_handler_->register_accept_call (result) == -1)
     return -1;
-  
+
   return 0;
 }
 
@@ -2255,11 +2253,11 @@ ACE_POSIX_SIG_Asynch_Accept::thread_function (void* arg_reactor)
   // For this reactor, this thread is the owner.
   reactor->owner (ACE_OS::thr_self ());
 
-  // Handle events. Wait for any connection events. 
+  // Handle events. Wait for any connection events.
   int result = 0;
   while (result != -1)
     result = reactor->handle_events ();
-  
+
   return 0;
 }
 
@@ -2686,7 +2684,7 @@ ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_W
       // Failure.
       ACE_ERROR ((LM_ERROR,
                   "Asynch_Transmit_File failed.\n"));
-      
+
       ACE_SEH_TRY
         {
           this->result_->complete (this->bytes_transferred_,
@@ -2701,7 +2699,7 @@ ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_W
           delete this;
         }
     }
-  
+
   // Write stream successful.
 
   // Partial write to socket.
@@ -3202,7 +3200,7 @@ ACE_Proactor *
 ACE_POSIX_AIOCB_Asynch_Transmit_File::proactor (void) const
 {
   return ACE_POSIX_Asynch_Operation::proactor ();
-} 
+}
 
 // *********************************************************************
 
@@ -3315,7 +3313,7 @@ ACE_Proactor *
 ACE_POSIX_SIG_Asynch_Transmit_File::proactor (void) const
 {
   return ACE_POSIX_Asynch_Operation::proactor ();
-} 
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result *>;
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index 69dd85ef66a..b2911573a37 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -390,9 +390,9 @@ ACE_Location_Node::open_handle (void)
 
   // Transform the pathname into the appropriate dynamic link library
   // by searching the ACE_LD_SEARCH_PATH.
-  int result = ACE::ldfind (this->pathname (),
-                            dl_pathname,
-                            (sizeof dl_pathname / sizeof (ACE_TCHAR)));
+  int result = ACE_Lib_Find::ldfind (this->pathname (),
+                                     dl_pathname,
+                                     (sizeof dl_pathname / sizeof (ACE_TCHAR)));
 
   // Check for errors
   if (result != 0)
@@ -435,7 +435,7 @@ ACE_Object_Node::dump (void) const
 
 ACE_Object_Node::ACE_Object_Node (const ACE_TCHAR *path,
                                   const ACE_TCHAR *obj_name)
-  : object_name_ (obj_name ? ACE::ldname (obj_name) : 0)
+  : object_name_ (obj_name ? ACE_Lib_Find::ldname (obj_name) : 0)
 {
   ACE_TRACE ("ACE_Object_Node::ACE_Object_Node");
   this->pathname (path ? ACE::strnew (path) : 0);
@@ -496,7 +496,7 @@ ACE_Function_Node::dump (void) const
 
 ACE_Function_Node::ACE_Function_Node (const ACE_TCHAR *path,
                                       const ACE_TCHAR *func_name)
-  : function_name_ (func_name ? ACE::ldname (func_name) : 0)
+  : function_name_ (func_name ? ACE_Lib_Find::ldname (func_name) : 0)
 {
   ACE_TRACE ("ACE_Function_Node::ACE_Function_Node");
   this->pathname (path);
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 7f897cb9cba..a9006ef9f5a 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -56,9 +56,9 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
 #if ! defined (ACE_PSOS_DIAB_MIPS)
   ACE_CLR_BITS (flags, O_CREAT);
 # endif /* !ACE_PSOS_DIAB_MIPS */
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout,
-					      remote_sap.get_path_name (),
-					      flags, perms);
+  ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout,
+                                                         remote_sap.get_path_name (),
+                                                         flags, perms);
   new_io.set_handle (handle);
   new_io.remote_addr_ = remote_sap; // class copy.
 
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 393977bd704..bfb393e538d 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -867,28 +867,3 @@ ACE_Service_Config::start_daemon (void)
   ACE_TRACE ("ACE_Service_Config::start_daemon");
   return ACE::daemonize ();
 }
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<ACE_Static_Svc_Descriptor *>;
-template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
-template class ACE_Node<ACE_TString>;
-template class ACE_Unbounded_Queue<ACE_TString>;
-template class ACE_Unbounded_Queue_Iterator<ACE_TString>;
-template class ACE_Unbounded_Set<ACE_TString>;
-template class ACE_Unbounded_Set_Iterator<ACE_TString>;
-template class auto_ptr<ACE_Obstack>;
-template class ACE_Auto_Basic_Ptr<ACE_Obstack>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<ACE_Static_Svc_Descriptor *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>
-#pragma instantiate ACE_Node<ACE_TString>
-#pragma instantiate ACE_Unbounded_Queue<ACE_TString>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_TString>
-#pragma instantiate ACE_Unbounded_Set<ACE_TString>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_TString>
-#pragma instantiate auto_ptr<ACE_Obstack>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Obstack>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Service_Templates.cpp b/ace/Service_Templates.cpp
new file mode 100644
index 00000000000..a4f073d3272
--- /dev/null
+++ b/ace/Service_Templates.cpp
@@ -0,0 +1,74 @@
+// $Id$
+
+#include "ace/Service_Templates.h"
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Node<ACE_Static_Svc_Descriptor *>;
+template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
+template class ACE_Node<ACE_TString>;
+template class ACE_Unbounded_Queue<ACE_TString>;
+template class ACE_Unbounded_Queue_Iterator<ACE_TString>;
+template class ACE_Unbounded_Set<ACE_TString>;
+template class ACE_Unbounded_Set_Iterator<ACE_TString>;
+template class auto_ptr<ACE_Obstack>;
+template class ACE_Auto_Basic_Ptr<ACE_Obstack>;
+
+template class ACE_Message_Queue<ACE_SYNCH>;
+template class ACE_Message_Queue_Iterator<ACE_SYNCH>;
+template class ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH>;
+template class ACE_Message_Queue_Factory<ACE_SYNCH>;
+template class ACE_Dynamic_Message_Queue<ACE_SYNCH>;
+template class ACE_Module<ACE_SYNCH>;
+template class ACE_Stream<ACE_SYNCH>;
+template class ACE_Stream_Head<ACE_SYNCH>;
+template class ACE_Stream_Tail<ACE_SYNCH>;
+template class ACE_Task<ACE_SYNCH>;
+template class ACE_Thru_Task<ACE_SYNCH>;
+
+// Even with threads, these ACE_NULL_SYNCH specializations are necessary.
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Message_Queue<ACE_NULL_SYNCH>;
+  template class ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>;
+  template class ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>;
+  template class ACE_Message_Queue_Factory<ACE_NULL_SYNCH>;
+  template class ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>;
+  template class ACE_Module<ACE_NULL_SYNCH>;
+  template class ACE_Task<ACE_NULL_SYNCH>;
+  template class ACE_Thru_Task<ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_THREADS */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Node<ACE_Static_Svc_Descriptor *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>
+#pragma instantiate ACE_Node<ACE_TString>
+#pragma instantiate ACE_Unbounded_Queue<ACE_TString>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_TString>
+#pragma instantiate ACE_Unbounded_Set<ACE_TString>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_TString>
+#pragma instantiate auto_ptr<ACE_Obstack>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Obstack>
+
+#pragma instantiate ACE_Message_Queue<ACE_SYNCH>
+#pragma instantiate ACE_Message_Queue_Iterator<ACE_SYNCH>
+#pragma instantiate ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH>
+#pragma instantiate ACE_Message_Queue_Factory<ACE_SYNCH>
+#pragma instantiate ACE_Dynamic_Message_Queue<ACE_SYNCH>
+#pragma instantiate ACE_Module<ACE_SYNCH>
+#pragma instantiate ACE_Stream<ACE_SYNCH>
+#pragma instantiate ACE_Stream_Head<ACE_SYNCH>
+#pragma instantiate ACE_Stream_Tail<ACE_SYNCH>
+#pragma instantiate ACE_Task<ACE_SYNCH>
+#pragma instantiate ACE_Thru_Task<ACE_SYNCH>
+// Even with threads, these ACE_NULL_SYNCH specializations are necessary.
+#if defined (ACE_HAS_THREADS)
+  #pragma instantiate ACE_Message_Queue<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Message_Queue_Factory<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Module<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Task<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Thru_Task<ACE_NULL_SYNCH>
+#endif /* ACE_HAS_THREADS */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Service_Templates.h b/ace/Service_Templates.h
new file mode 100644
index 00000000000..233d408e750
--- /dev/null
+++ b/ace/Service_Templates.h
@@ -0,0 +1,18 @@
+// $Id$
+
+#ifndef ACE_SERVICE_TEMPLATES_H
+#define ACE_SERVICE_TEMPLATES_H
+#include "ace/pre.h"
+
+#include "ace/Svc_Conf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Auto_Ptr.h"
+#include "ace/Thread_Manager.h"
+#include "ace/Stream_Modules.h"
+#include "ace/Stream.h"
+
+#endif /* ACE_SERVICE_TEMPLATES_H */
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index 5d7ecb6cf90..0e6882a6df5 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -401,7 +401,7 @@ ACE_Service_Object_Type::fini (void) const
 
   return ACE_Service_Type_Impl::fini ();
 }
-
+/*
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Message_Queue<ACE_SYNCH>;
 template class ACE_Message_Queue_Iterator<ACE_SYNCH>;
@@ -425,7 +425,8 @@ template class ACE_Thru_Task<ACE_SYNCH>;
   template class ACE_Module<ACE_NULL_SYNCH>;
   template class ACE_Task<ACE_NULL_SYNCH>;
   template class ACE_Thru_Task<ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_THREADS */
+  #endif *//* ACE_HAS_THREADS */
+/*
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Message_Queue<ACE_SYNCH>
 #pragma instantiate ACE_Message_Queue_Iterator<ACE_SYNCH>
@@ -448,6 +449,6 @@ template class ACE_Thru_Task<ACE_SYNCH>;
   #pragma instantiate ACE_Module<ACE_NULL_SYNCH>
   #pragma instantiate ACE_Task<ACE_NULL_SYNCH>
   #pragma instantiate ACE_Thru_Task<ACE_NULL_SYNCH>
-#endif /* ACE_HAS_THREADS */
-#else
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  #endif *//* ACE_HAS_THREADS */
+//#else
+//#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 2179fdf0472..6cd43897ca1 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -40,40 +40,6 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
 {
 }
 
-template <class ACE_LOCK, class TYPE>
-ACE_Test_and_Set<ACE_LOCK, TYPE>::ACE_Test_and_Set (TYPE initial_value)
-  : is_set_ (initial_value)
-{
-}
-
-// Returns true if we are done, else false.
-template <class ACE_LOCK, class TYPE> TYPE
-ACE_Test_and_Set<ACE_LOCK, TYPE>::is_set (void) const
-{
-  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, this->is_set_);
-  return this->is_set_;
-}
-
-// Sets the <is_set_> status.
-template <class ACE_LOCK, class TYPE> TYPE
-ACE_Test_and_Set<ACE_LOCK, TYPE>::set (TYPE status)
-{
-  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, this->is_set_);
-  TYPE o_status = this->is_set_;
-  this->is_set_ = status;
-  return o_status;
-}
-
-template <class ACE_LOCK, class TYPE> int
-ACE_Test_and_Set<ACE_LOCK, TYPE>::handle_signal (int, siginfo_t *, ucontext_t *)
-{
-  // By setting this to 1, we are "signaling" to anyone calling
-  // <is_set> or or <set> that the "test and set" object is in the
-  // "signaled" state, i.e., it's "available" to be set back to 0.
-  this->set (1);
-  return 0;
-}
-
 template <class ACE_LOCK, class TYPE> ACE_LOCK &
 ACE_Atomic_Op<ACE_LOCK, TYPE>::mutex (void)
 {
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 4b843aab377..4695ff25bf0 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -17,14 +17,13 @@
 #ifndef ACE_SYNCH_T_H
 #define ACE_SYNCH_T_H
 #include "ace/pre.h"
-
-#include "ace/Event_Handler.h"
+#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch.h"
+#include "ace/Test_and_Set.h"
 
 // Forward decl
 class ACE_Time_Value;
@@ -168,43 +167,6 @@ private:
 };
 
 template <class ACE_LOCK, class TYPE>
-class ACE_Test_and_Set : public ACE_Event_Handler
-{
-public:
-  // = TITLE
-  //     Implements the classic ``test and set'' operation.
-  //
-  // = DESCRIPTION
-  //     This class keeps track of the status of <is_set_>, which can
-  //     be set based on various events (such as receipt of a
-  //     signal).  This class is derived from <ACE_Event_Handler> so
-  //     that it can be "signaled" by a Reactor when a signal occurs.
-  //     We assume that <TYPE> is a data type that can be assigned the
-  //     value 0 or 1.
-  ACE_Test_and_Set (TYPE initial_value = 0);
-
-  TYPE is_set (void) const;
-  // Returns true if we are set, else false.
-
-  TYPE set (TYPE);
-  // Sets the <is_set_> status, returning the original value of
-  // <is_set_>.
-
-  virtual int handle_signal (int signum,
-                             siginfo_t * = 0,
-                             ucontext_t * = 0);
-  // Called when object is signaled by OS (either via UNIX signals or
-  // when a Win32 object becomes signaled).
-
-private:
-  TYPE is_set_;
-  // Keeps track of our state.
-
-  ACE_LOCK lock_;
-  // Protect the state from race conditions.
-};
-
-template <class ACE_LOCK, class TYPE>
 class ACE_Atomic_Op
 {
   // = TITLE
diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp
index 2feabc3cadb..983ae3ad04e 100644
--- a/ace/System_Time.cpp
+++ b/ace/System_Time.cpp
@@ -19,8 +19,9 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname)
       ACE_OS::strcpy (this->poolname_,
                       ACE_DEFAULT_BACKING_STORE);
 #else /* ACE_DEFAULT_BACKING_STORE */
-      if (ACE::get_temp_dir (this->poolname_, 
-                             MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX
+      if (ACE_Lib_Find::get_temp_dir (this->poolname_, 
+                                      MAXPATHLEN - 17) == -1)
+        // -17 for ace-malloc-XXXXXX
         {
           ACE_ERROR ((LM_ERROR, 
                       ACE_LIB_TEXT ("Temporary path too long, ")
diff --git a/ace/Task.cpp b/ace/Task.cpp
index 01436fc0620..83af421f893 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -2,9 +2,6 @@
 
 #include "ace/Task.h"
 #include "ace/Module.h"
-#if !defined (ACE_HAS_WINCE)
-#include "ace/Service_Config.h"
-#endif /* !ACE_HAS_WINCE */
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Task.i"
@@ -171,10 +168,12 @@ ACE_Task_Base::cleanup (void *object, void *)
   // The thread count must be decremented first in case the <close>
   // hook does something crazy like "delete this".
   t->thr_count_dec ();
+
   // @@ Is it possible to pass in the exit status somehow?
   t->close ();
 }
 
+
 #if defined (ACE_HAS_SIG_C_FUNC)
 extern "C" void
 ACE_Task_Base_cleanup (void *object, void *)
diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp
index 2ca33724956..88bc3a2bfc5 100644
--- a/ace/Task_T.cpp
+++ b/ace/Task_T.cpp
@@ -11,7 +11,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Module.h"
-#include "ace/Service_Config.h"
+//#include "ace/Service_Config.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Task_T.i"
diff --git a/ace/Test_and_Set.cpp b/ace/Test_and_Set.cpp
new file mode 100644
index 00000000000..20ff024fb17
--- /dev/null
+++ b/ace/Test_and_Set.cpp
@@ -0,0 +1,48 @@
+// $Id$
+
+#ifndef ACE_TEST_AND_SET_H
+#define ACE_TEST_AND_SET_H
+
+#include "ace/Thread.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Test_and_Set.h"
+
+ACE_RCSID(ace, Test_and_Set, "$Id$")
+
+template <class ACE_LOCK, class TYPE>
+ACE_Test_and_Set<ACE_LOCK, TYPE>::ACE_Test_and_Set (TYPE initial_value)
+  : is_set_ (initial_value)
+{
+}
+
+// Returns true if we are done, else false.
+template <class ACE_LOCK, class TYPE> TYPE
+ACE_Test_and_Set<ACE_LOCK, TYPE>::is_set (void) const
+{
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, this->is_set_);
+  return this->is_set_;
+}
+
+// Sets the <is_set_> status.
+template <class ACE_LOCK, class TYPE> TYPE
+ACE_Test_and_Set<ACE_LOCK, TYPE>::set (TYPE status)
+{
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, this->is_set_);
+  TYPE o_status = this->is_set_;
+  this->is_set_ = status;
+  return o_status;
+}
+
+template <class ACE_LOCK, class TYPE> int
+ACE_Test_and_Set<ACE_LOCK, TYPE>::handle_signal (int, siginfo_t *, ucontext_t *)
+{
+  // By setting this to 1, we are "signaling" to anyone calling
+  // <is_set> or or <set> that the "test and set" object is in the
+  // "signaled" state, i.e., it's "available" to be set back to 0.
+  this->set (1);
+  return 0;
+}
diff --git a/ace/Test_and_Set.h b/ace/Test_and_Set.h
new file mode 100644
index 00000000000..681ac1220f9
--- /dev/null
+++ b/ace/Test_and_Set.h
@@ -0,0 +1,55 @@
+// $Id$
+
+#ifndef ACE_TEST_AND_SET_H
+#define ACE_TEST_AND_SET_H
+
+#include "ace/pre.h"
+#include "ace/Event_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+template <class ACE_LOCK, class TYPE>
+class ACE_Export ACE_Test_and_Set : public ACE_Event_Handler
+{
+public:
+  // = TITLE
+  //     Implements the classic ``test and set'' operation.
+  //
+  // = DESCRIPTION
+  //     This class keeps track of the status of <is_set_>, which can
+  //     be set based on various events (such as receipt of a
+  //     signal).  This class is derived from <ACE_Event_Handler> so
+  //     that it can be "signaled" by a Reactor when a signal occurs.
+  //     We assume that <TYPE> is a data type that can be assigned the
+  //     value 0 or 1.
+  ACE_Test_and_Set (TYPE initial_value = 0);
+
+  TYPE is_set (void) const;
+  // Returns true if we are set, else false.
+
+  TYPE set (TYPE);
+  // Sets the <is_set_> status, returning the original value of
+  // <is_set_>.
+
+  virtual int handle_signal (int signum,
+                             siginfo_t * = 0,
+                             ucontext_t * = 0);
+  // Called when object is signaled by OS (either via UNIX signals or
+  // when a Win32 object becomes signaled).
+
+private:
+  TYPE is_set_;
+  // Keeps track of our state.
+
+  ACE_LOCK lock_;
+  // Protect the state from race conditions.
+};
+
+#if defined (__ACE_INLINE__)
+#include "ace/Test_and_Set.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* ACE_TEST_AND_SET_H */
diff --git a/ace/Test_and_Set.i b/ace/Test_and_Set.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/ace/Test_and_Set.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index fa624572013..2b67381c412 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -25,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Test_and_Set.h"
+
 template <class TYPE>
 class ACE_Timer_Node_T
 {
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index 55fec5068eb..d2edc143a50 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -36,9 +36,9 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
   ACE_TRACE ("ACE_UPIPE_Connector::connect");
   ACE_ASSERT (new_stream.get_handle () == ACE_INVALID_HANDLE);
 
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout,
-					      addr.get_path_name (),
-					      flags, perms);
+  ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout,
+                                                         addr.get_path_name (),
+                                                         flags, perms);
 
   if (handle == ACE_INVALID_HANDLE)
     return -1;