*** empty log message ***

30 files changed, 316 insertions, 166 deletions

diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 24eae7bc23d..71b55aa7b3c 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
+project(TAO_IDL_EXE) : aceexe, acethreadslib_for_tao, core, tao_output, crosscompile {
   exename      = tao_idl
   libs        += TAO_IDL_BE TAO_IDL_FE
   includes    += include be_include fe
@@ -40,7 +40,7 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
 }
 
 
-project(TAO_IDL_BE) : acelib, aceprocesslib, aceprocesslib_for_tao, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_BE) : acelib, acethreadslib_for_tao, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_BE
   libs        += TAO_IDL_FE
   includes    += include be_include fe
@@ -65,7 +65,7 @@ project(TAO_IDL_BE) : acelib, aceprocesslib, aceprocesslib_for_tao, conv_lib, ta
 }
 
 
-project(TAO_IDL_FE) : acelib, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_FE) : acelib, acethreadslib_for_tao, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_FE
   includes    += include fe
   dynamicflags = TAO_IDL_FE_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 18b3ca9f69a..02066295e7f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, iortable {
+project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging, svc_utils, iortable {
   sharedname   = TAO_CosNaming_Serv
   dynamicflags = TAO_NAMING_SERV_BUILD_DLL
   tagchecks   += Naming
diff --git a/ace/ACE_Memory_export.h b/ace/ACE_Memory_export.h
new file mode 100644
index 00000000000..20edd951d96
--- /dev/null
+++ b/ace/ACE_Memory_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s ACE_Memory
+// ------------------------------
+#ifndef ACE_MEMORY_EXPORT_H
+#define ACE_MEMORY_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_MEMORY_HAS_DLL)
+#  define ACE_MEMORY_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_MEMORY_HAS_DLL */
+
+#if !defined (ACE_MEMORY_HAS_DLL)
+#  define ACE_MEMORY_HAS_DLL 1
+#endif /* ! ACE_MEMORY_HAS_DLL */
+
+#if defined (ACE_MEMORY_HAS_DLL) && (ACE_MEMORY_HAS_DLL == 1)
+#  if defined (ACE_MEMORY_BUILD_DLL)
+#    define ACE_Memory_Export ACE_Proper_Export_Flag
+#    define ACE_MEMORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACE_MEMORY_BUILD_DLL */
+#    define ACE_Memory_Export ACE_Proper_Import_Flag
+#    define ACE_MEMORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACE_MEMORY_BUILD_DLL */
+#else /* ACE_MEMORY_HAS_DLL == 1 */
+#  define ACE_Memory_Export
+#  define ACE_MEMORY_SINGLETON_DECLARATION(T)
+#  define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACE_MEMORY_HAS_DLL == 1 */
+
+// Set ACE_MEMORY_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ACE_MEMORY_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ACE_MEMORY_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ACE_MEMORY_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ACE_MEMORY_NTRACE */
+
+#if (ACE_MEMORY_NTRACE == 1)
+#  define ACE_MEMORY_TRACE(X)
+#else /* (ACE_MEMORY_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define ACE_MEMORY_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (ACE_MEMORY_NTRACE == 1) */
+
+#endif /* ACE_MEMORY_EXPORT_H */
+
+// End of auto generated file.
diff --git a/ace/ACE_Threads_export.h b/ace/ACE_Threads_export.h
new file mode 100644
index 00000000000..d19193d9127
--- /dev/null
+++ b/ace/ACE_Threads_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s ACE_Threads
+// ------------------------------
+#ifndef ACE_THREADS_EXPORT_H
+#define ACE_THREADS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_THREADS_HAS_DLL)
+#  define ACE_THREADS_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_THREADS_HAS_DLL */
+
+#if !defined (ACE_THREADS_HAS_DLL)
+#  define ACE_THREADS_HAS_DLL 1
+#endif /* ! ACE_THREADS_HAS_DLL */
+
+#if defined (ACE_THREADS_HAS_DLL) && (ACE_THREADS_HAS_DLL == 1)
+#  if defined (ACE_THREADS_BUILD_DLL)
+#    define ACE_Threads_Export ACE_Proper_Export_Flag
+#    define ACE_THREADS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACE_THREADS_BUILD_DLL */
+#    define ACE_Threads_Export ACE_Proper_Import_Flag
+#    define ACE_THREADS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACE_THREADS_BUILD_DLL */
+#else /* ACE_THREADS_HAS_DLL == 1 */
+#  define ACE_Threads_Export
+#  define ACE_THREADS_SINGLETON_DECLARATION(T)
+#  define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACE_THREADS_HAS_DLL == 1 */
+
+// Set ACE_THREADS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ACE_THREADS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ACE_THREADS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ACE_THREADS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ACE_THREADS_NTRACE */
+
+#if (ACE_THREADS_NTRACE == 1)
+#  define ACE_THREADS_TRACE(X)
+#else /* (ACE_THREADS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define ACE_THREADS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (ACE_THREADS_NTRACE == 1) */
+
+#endif /* ACE_THREADS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp
index ffb8e797020..960a05dce0e 100644
--- a/ace/Activation_Queue.cpp
+++ b/ace/Activation_Queue.cpp
@@ -6,6 +6,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/Malloc_Base.h"
+#include "ace/Time_Value.h"
 
 ACE_RCSID (ace,
            Activation_Queue,
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index b14a967d2bd..251be0cf7ea 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,9 +13,16 @@
 
 #ifndef ACE_ACTIVATION_QUEUE_H
 #define ACE_ACTIVATION_QUEUE_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -43,7 +50,7 @@
  *
  * @sa ACE_Method_Request
  */
-class ACE_Export ACE_Activation_Queue
+class ACE_Threads_Export ACE_Activation_Queue
 {
 public:
   // = Initialization and termination methods.
diff --git a/ace/Barrier.h b/ace/Barrier.h
index 966e62cdf9f..1bc2514c1de 100644
--- a/ace/Barrier.h
+++ b/ace/Barrier.h
@@ -16,7 +16,12 @@
 #define ACE_BARRIER_H
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +40,7 @@
  *
  * @brief This is a no-op to make ACE "syntactically consistent."
  */
-class ACE_Export ACE_Barrier
+class ACE_Threads_Export ACE_Barrier
 {
 public:
   ACE_Barrier (unsigned int, const ACE_TCHAR * = 0, void * = 0) {}
@@ -48,7 +53,7 @@ public:
 
 #include "ace/Condition_Thread_Mutex.h"
 
-struct ACE_Export ACE_Sub_Barrier
+struct ACE_Threads_Export ACE_Sub_Barrier
 {
   // = Initialization.
   ACE_Sub_Barrier (unsigned int count,
@@ -88,7 +93,7 @@ struct ACE_Export ACE_Sub_Barrier
  * SunOpsis Vol. 4, No. 1 by Richard Marejka
  * (Richard.Marejka@canada.sun.com).
  */
-class ACE_Export ACE_Barrier
+class ACE_Threads_Export ACE_Barrier
 {
 public:
   /// Initialize the barrier to synchronize @a count threads.
@@ -147,7 +152,7 @@ private:
  * This class is just a simple wrapper for ACE_Barrier that
  * selects the USYNC_PROCESS variant for the locks.
  */
-class ACE_Export ACE_Process_Barrier : public ACE_Barrier
+class ACE_Threads_Export ACE_Process_Barrier : public ACE_Barrier
 {
 public:
   /// Create a Process_Barrier, passing in the optional <name>.
@@ -169,7 +174,7 @@ public:
  * This class is just a simple wrapper for ACE_Barrier that
  * selects the USYNC_THREAD variant for the locks.
  */
-class ACE_Export ACE_Thread_Barrier : public ACE_Barrier
+class ACE_Threads_Export ACE_Thread_Barrier : public ACE_Barrier
 {
 public:
   /// Create a Thread_Barrier, passing in the optional @a name.
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
index 8dfc6270597..d40125cb017 100644
--- a/ace/Based_Pointer_Repository.h
+++ b/ace/Based_Pointer_Repository.h
@@ -16,14 +16,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+# define ACE_MEMORY_SINGLETON_DECLARE ACE_SINGLETON_DECLARE
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/os_include/os_stddef.h"
 #include "ace/Synch_Traits.h"
+#include "ace/os_include/os_stddef.h"
 
 // Forward decl., using the "Cheshire Cat" technique.
 class ACE_Based_Pointer_Repository_Rep;
@@ -34,7 +40,7 @@ class ACE_Based_Pointer_Repository_Rep;
  * @brief Maps pointers to the base address of the region to which each
  * pointer belongs.
  */
-class ACE_Export ACE_Based_Pointer_Repository
+class ACE_Memory_Export ACE_Based_Pointer_Repository
 {
 public:
   // = Use <ACE_Null_Mutex> to allow locking while iterating.
@@ -76,7 +82,7 @@ typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
         ACE_BASED_POINTER_REPOSITORY;
 
 /// Declare a process wide singleton
-ACE_SINGLETON_DECLARE(ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX)
+ACE_MEMORY_SINGLETON_DECLARE(ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX)
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/File_Lock.h b/ace/File_Lock.h
index 90bd40dedfa..4fc5ee2889e 100644
--- a/ace/File_Lock.h
+++ b/ace/File_Lock.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,7 +14,12 @@
 #define ACE_FILE_LOCK_H
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +35,7 @@
  * Allows us to "adapt" the UNIX file locking mechanisms to work
  * with all of our Guard stuff...
  */
-class ACE_Export ACE_File_Lock
+class ACE_Threads_Export ACE_File_Lock
 {
 public:
   /**
diff --git a/ace/MMAP_Memory_Pool.h b/ace/MMAP_Memory_Pool.h
index 37798666260..63da965b80d 100644
--- a/ace/MMAP_Memory_Pool.h
+++ b/ace/MMAP_Memory_Pool.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,14 +13,21 @@
 
 #ifndef ACE_MMAP_MEMORY_POOL_H
 #define ACE_MMAP_MEMORY_POOL_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/ACE.h"
 #include "ace/Event_Handler.h"
 #include "ace/Signal.h"
 #include "ace/Mem_Map.h"
@@ -33,7 +40,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Export ACE_MMAP_Memory_Pool_Options
+class ACE_Memory_Export ACE_MMAP_Memory_Pool_Options
 {
 public:
   enum
@@ -121,7 +128,7 @@ private:
  * @brief Make a memory pool that is based on @c mmap(2).  This
  * implementation allows memory to be shared between processes.
  */
-class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
+class ACE_Memory_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
 {
 public:
   typedef ACE_MMAP_Memory_Pool_Options OPTIONS;
@@ -272,7 +279,7 @@ protected:
  * every update.  Naturally, this trades off increased
  * performance for less reliability if the machine crashes.
  */
-class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
+class ACE_Memory_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
 {
 public:
   /// Initialize the pool.
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index 7e779e19557..589fabe6cda 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -15,7 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +40,7 @@
  * This class works with both the mmap(2) UNIX system and the
  * Win32 family of memory mapping system calls.
  */
-class ACE_Export ACE_Mem_Map
+class ACE_Memory_Export ACE_Mem_Map
 {
 public:
   // = Initialization and termination methods.
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index bca56b65147..ca048863079 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -17,7 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,7 +45,7 @@
  *
  * @sa ACE_Activation_Queue
  */
-class ACE_Export ACE_Method_Request
+class ACE_Threads_Export ACE_Method_Request
 {
 public:
   // = Initialization and termination methods.
diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h
index 4dbb3a370ad..6306b76708c 100644
--- a/ace/PI_Malloc.h
+++ b/ace/PI_Malloc.h
@@ -16,7 +16,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -39,7 +44,7 @@
  * processes sharing the memory.  The tradoff of this flexibility
  * is more expensive malloc/free operations.
  */
-class ACE_Export ACE_PI_Control_Block
+class ACE_Memory_Export ACE_PI_Control_Block
 {
 public:
   class ACE_Malloc_Header;
@@ -56,7 +61,7 @@ public:
    * to keep track of each chunk of data when it's in the free
    * list or in use.
    */
-  class ACE_Export ACE_Malloc_Header
+  class ACE_Memory_Export ACE_Malloc_Header
   {
   public:
     ACE_Malloc_Header (void);
@@ -94,7 +99,7 @@ public:
    * it easy to iterate over the items in the list in both FIFO
    * and LIFO order.
    */
-  class ACE_Export ACE_Name_Node
+  class ACE_Memory_Export ACE_Name_Node
   {
   public:
     // = Initialization methods.
diff --git a/ace/Pagefile_Memory_Pool.h b/ace/Pagefile_Memory_Pool.h
index 5c91d577be0..472e1a8731d 100644
--- a/ace/Pagefile_Memory_Pool.h
+++ b/ace/Pagefile_Memory_Pool.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,9 +13,15 @@
 
 #ifndef ACE_PAGEFILE_MEMORY_POOL_H
 #define ACE_PAGEFILE_MEMORY_POOL_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +29,7 @@
 
 #if defined (ACE_WIN32)
 
+#include "ace/ACE.h"
 #include "ace/os_include/sys/os_mman.h"
 
 /**
@@ -33,7 +40,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Export ACE_Pagefile_Memory_Pool_Options
+class ACE_Memory_Export ACE_Pagefile_Memory_Pool_Options
 {
 public:
   /// Initialization method.
@@ -53,7 +60,7 @@ public:
  * @brief Make a memory pool that is based on "anonymous" memory
  * regions allocated from the Win32 page file.
  */
-class ACE_Export ACE_Pagefile_Memory_Pool
+class ACE_Memory_Export ACE_Pagefile_Memory_Pool
 {
 public:
   typedef ACE_Pagefile_Memory_Pool_Options OPTIONS;
diff --git a/ace/Process.h b/ace/Process.h
index c3966f1d91c..b746c0beb81 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -12,9 +12,15 @@
 
 #ifndef ACE_PROCESS_H
 #define ACE_PROCESS_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,7 +52,7 @@ class ACE_Time_Value;
  * then, the <spawn> is using the <execvp> which searches for the
  * program file in the PATH variable.
  */
-class ACE_Export ACE_Process_Options
+class ACE_Threads_Export ACE_Process_Options
 {
 public:
   enum
@@ -434,7 +440,7 @@ protected:
  * then, the <spawn> is using the <execvp> which searches for the
  * program file in the PATH variable.
  */
-class ACE_Export ACE_Process
+class ACE_Threads_Export ACE_Process
 {
 public:
   friend class ACE_Process_Manager;
@@ -578,7 +584,7 @@ protected:
  * @arg unmanage() method that deletes the instance.
  * This class is only valid for use as a dynamically-allocated object!
  */
-class ACE_Export ACE_Managed_Process : public ACE_Process
+class ACE_Threads_Export ACE_Managed_Process : public ACE_Process
 {
 public:
   ACE_Managed_Process ();
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index b58d1539258..6a122b7b395 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -12,16 +12,24 @@
 
 #ifndef ACE_PROCESS_MANAGER_H
 #define ACE_PROCESS_MANAGER_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/Event_Handler.h"
-#include "ace/Time_Value.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Process.h"
+#include "ace/Event_Handler.h"
+#include "ace/Time_Value.h"
 
 #if defined (ACE_HAS_THREADS)
 #  include "ace/Recursive_Thread_Mutex.h"
@@ -35,7 +43,7 @@ class ACE_Reactor;
  * @brief Information describing each process that's controlled by an
  * \<ACE_Process_Manager\>.
  */
-class ACE_Export ACE_Process_Descriptor
+class ACE_Threads_Export ACE_Process_Descriptor
 {
 private:
   friend class ACE_Process_Manager;
@@ -117,7 +125,7 @@ private:
  * + The <handle_input> method collects all available exit
  *   statuses.
  */
-class ACE_Export ACE_Process_Manager : protected ACE_Event_Handler
+class ACE_Threads_Export ACE_Process_Manager : protected ACE_Event_Handler
 {
 public:
   friend class ACE_Process_Control;
diff --git a/ace/Process_Semaphore.h b/ace/Process_Semaphore.h
index 006cc963de0..295c79d5ce0 100644
--- a/ace/Process_Semaphore.h
+++ b/ace/Process_Semaphore.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,9 +15,16 @@
 
 #ifndef ACE_PROCESS_SEMAPHORE_H
 #define ACE_PROCESS_SEMAPHORE_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +42,7 @@
  * @brief Wrapper for Dijkstra style general semaphores that work
  * across processes.
  */
-class ACE_Export ACE_Process_Semaphore
+class ACE_Threads_Export ACE_Process_Semaphore
 {
 public:
   /// Initialize the semaphore, with an initial value of @a count and a
@@ -148,7 +155,7 @@ template <class T> class ACE_Malloc_Lock_Adapter_T;
  * the standard form used by other lock strategy classes.
  */
 template<>
-class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore>
+class ACE_Threads_Export ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore>
 {
 public:
   ACE_Process_Semaphore * operator () (const ACE_TCHAR *name);
diff --git a/ace/RW_Process_Mutex.h b/ace/RW_Process_Mutex.h
index 574d9183658..cee7a1a6cb5 100644
--- a/ace/RW_Process_Mutex.h
+++ b/ace/RW_Process_Mutex.h
@@ -11,6 +11,7 @@
 
 #ifndef ACE_RW_PROCESS_MUTEX_H
 #define ACE_RW_PROCESS_MUTEX_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/File_Lock.h"
@@ -35,7 +36,7 @@
  * \todo For systems with pthread_rwlockattr_setpshared one 
  * may consider using them to make the mutex faster.
  */
-class ACE_Export ACE_RW_Process_Mutex
+class ACE_Threads_Export ACE_RW_Process_Mutex
 {
 public:
   /// Create a readers/writer <Process_Mutex>, passing in the optional
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index 147072e7e98..0cbb8febe7e 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -15,7 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +35,7 @@
  *
  * @brief This is a wrapper for System V shared memory.
  */
-class ACE_Export ACE_SV_Shared_Memory
+class ACE_Memory_Export ACE_SV_Shared_Memory
 {
 public:
   enum
diff --git a/ace/Sbrk_Memory_Pool.h b/ace/Sbrk_Memory_Pool.h
index 0fb877aad45..55856be303b 100644
--- a/ace/Sbrk_Memory_Pool.h
+++ b/ace/Sbrk_Memory_Pool.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,9 +13,15 @@
 
 #ifndef ACE_SBRK_MEMORY_POOL_H
 #define ACE_SBRK_MEMORY_POOL_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +29,7 @@
 
 #if !defined (ACE_LACKS_SBRK)
 
+#include "ace/ACE.h"
 #include "ace/os_include/sys/os_mman.h"
 
 /**
@@ -33,7 +40,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Export ACE_Sbrk_Memory_Pool_Options
+class ACE_Memory_Export ACE_Sbrk_Memory_Pool_Options
 {
 };
 
@@ -42,7 +49,7 @@ class ACE_Export ACE_Sbrk_Memory_Pool_Options
  *
  * @brief Make a memory pool that is based on <sbrk(2)>.
  */
-class ACE_Export ACE_Sbrk_Memory_Pool
+class ACE_Memory_Export ACE_Sbrk_Memory_Pool
 {
 public:
   typedef ACE_Sbrk_Memory_Pool_Options OPTIONS;
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index 6031d07eb29..7d07b598610 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -16,7 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
+
 #include "ace/os_include/os_stddef.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -34,7 +40,7 @@
  * memory.  For a much more sophisticated version, please check
  * out the <ACE_Malloc> class.
  */
-class ACE_Export ACE_Shared_Memory
+class ACE_Memory_Export ACE_Shared_Memory
 {
 public:
   virtual ~ACE_Shared_Memory (void);
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index be610b0bc23..bbdf2ef43a7 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -32,7 +32,7 @@
  * manager.  For more a powerful memory allocator please see
  * <ACE_Malloc>.
  */
-class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory
+class ACE_Memory_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory
 {
 public:
   // = Initialization and termination methods.
diff --git a/ace/Shared_Memory_Pool.h b/ace/Shared_Memory_Pool.h
index a12c400711e..1fb46a5cc9c 100644
--- a/ace/Shared_Memory_Pool.h
+++ b/ace/Shared_Memory_Pool.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,14 +13,21 @@
 
 #ifndef ACE_SHARED_MEMORY_POOL_H
 #define ACE_SHARED_MEMORY_POOL_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE.h"
+#ifdef ACE_MEMORY_BUILD_DLL
+# include "ace/ACE_Memory_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Memory_Export ACE_Export
+#endif  /* ACE_MEMORY_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/ACE.h"
 #include "ace/Event_Handler.h"
 #include "ace/Signal.h"
 
@@ -36,7 +43,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Export ACE_Shared_Memory_Pool_Options
+class ACE_Memory_Export ACE_Shared_Memory_Pool_Options
 {
 public:
   /// Initialization method.
@@ -75,7 +82,7 @@ public:
  * provides more powerful features, such as persistent backing store
  * and greatly scalability.
  */
-class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
+class ACE_Memory_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
 {
 public:
   typedef ACE_Shared_Memory_Pool_Options OPTIONS;
@@ -199,4 +206,5 @@ protected:
 #endif /* !ACE_LACKS_SYSV_SHMEM */
 
 #include /**/ "ace/post.h"
+
 #endif /* ACE_SHARED_MEMORY_POOL_H */
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index 4ec2c5def16..c4c59d5d4e6 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -32,7 +32,7 @@
  * manager.  For more a powerful memory allocator please see
  * <ACE_Malloc>.
  */
-class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory
+class ACE_Memory_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory
 {
 public:
   enum
diff --git a/ace/Thread_Semaphore.h b/ace/Thread_Semaphore.h
index 796529dc4ff..c99a60d3575 100644
--- a/ace/Thread_Semaphore.h
+++ b/ace/Thread_Semaphore.h
@@ -16,7 +16,12 @@
 #define ACE_THREAD_SEMAPHORE_H
 #include /**/ "ace/pre.h"
 
-#include "ace/ACE_export.h"
+#ifdef ACE_THREADS_BUILD_DLL
+# include "ace/ACE_Threads_export.h"
+#else
+# include "ace/ACE_export.h"
+# define ACE_Threads_Export ACE_Export
+#endif  /* ACE_THREADS_BUILD_DLL */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +40,7 @@
  * @brief Wrapper for Dijkstra style general semaphores that work
  * only within one process.
  */
-class ACE_Export ACE_Thread_Semaphore : public ACE_Semaphore
+class ACE_Threads_Export ACE_Thread_Semaphore : public ACE_Semaphore
 {
 public:
   /// Initialize the semaphore, with an initial value of @a count,
@@ -69,7 +74,7 @@ template <class T> class ACE_Malloc_Lock_Adapter_T;
  * the standard form used by other lock strategy classes.
  */
 template<>
-class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore>
+class ACE_Threads_Export ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore>
 {
 public:
   ACE_Thread_Semaphore * operator () (const ACE_TCHAR *name);
diff --git a/ace/ace.mwc b/ace/ace.mwc
index 79c26bbcc69..6dd325589c6 100644
--- a/ace/ace.mwc
+++ b/ace/ace.mwc
@@ -4,6 +4,8 @@
 workspace {
   ace.mpc
   ace_for_tao.mpc
+  ace_memory_for_tao.mpc
+  ace_threads_for_tao.mpc
   ace_flreactor.mpc
   ace_qtreactor.mpc
   ace_tkreactor.mpc
diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc
index f3cb6a437d4..7a949d25515 100644
--- a/ace/ace_for_tao.mpc
+++ b/ace/ace_for_tao.mpc
@@ -1,4 +1,4 @@
-]//  -*- MPC -*-
+//  -*- MPC -*-
 //
 // $Id$
 
diff --git a/ace/ace_os.mpc b/ace/ace_os.mpc
index 71b871b9ca3..e470b334a65 100644
--- a/ace/ace_os.mpc
+++ b/ace/ace_os.mpc
@@ -1,4 +1,4 @@
-]//  -*- MPC -*-
+//  -*- MPC -*-
 //
 // $Id$
 
@@ -51,98 +51,9 @@ project(ACE_OS) : acedefaults, core, pkgconfig {
     OS_TLI.cpp
     Sched_Params.cpp
     Thread_Hook.cpp
-
-    // Dev_Poll_Reactor isn't available on Windows.
-    conditional(automake, make) {
-      Dev_Poll_Reactor.cpp
-    }
-
-    // ACE_Token implementation uses semaphores on Windows and VxWorks.
-    conditional(vc6,vc71,vc8,bmake) {
-      Semaphore.cpp
-      Process_Mutex.cpp
-      WFMO_Reactor.cpp
-    }
-  }
-
-  Template_Files {
-    Acceptor.cpp
-    Active_Map_Manager_T.cpp
-    Array_Base.cpp
-    Array_Map.cpp
-    Atomic_Op_T.cpp
-    Auto_Functor.cpp
-    Auto_IncDec_T.cpp
-    Auto_Ptr.cpp
-    Based_Pointer_T.cpp
-    Cache_Map_Manager_T.cpp
-    Cached_Connect_Strategy_T.cpp
-    Caching_Strategies_T.cpp
-    Caching_Utility_T.cpp
-    Cleanup_Strategies_T.cpp
-    Condition_T.cpp
-    Connector.cpp
-    Containers_T.cpp
-    Dump_T.cpp
-    Dynamic_Service.cpp
-    Env_Value_T.cpp
-    Event_Handler_T.cpp
-    Framework_Component_T.cpp
-    Free_List.cpp
-    Functor_T.cpp
-    Guard_T.cpp
-    Hash_Cache_Map_Manager_T.cpp
-    Hash_Map_Manager_T.cpp
-    Hash_Map_With_Allocator_T.cpp
-    IOStream_T.cpp
-    Intrusive_List.cpp
-    Intrusive_List_Node.cpp
-    Lock_Adapter_T.cpp
-    Malloc_T.cpp
-    Managed_Object.cpp
-    Map_Manager.cpp
-    Map_T.cpp
-    Message_Block_T.cpp
-    Message_Queue_T.cpp
-    Module.cpp
-    Node.cpp
-    Obstack_T.cpp
-    Pair_T.cpp
-    RB_Tree.cpp
-    Reactor_Token_T.cpp
-    Refcounted_Auto_Ptr.cpp
-    Reverse_Lock_T.cpp
-    Select_Reactor_T.cpp
-    Singleton.cpp
-    Strategies_T.cpp
-    Stream.cpp
-    Stream_Modules.cpp
-    String_Base.cpp
-    Svc_Handler.cpp
-    Synch_T.cpp
-    TSS_T.cpp
-    Task_Ex_T.cpp
-    Task_T.cpp
-    Timeprobe_T.cpp
-    Timer_Hash_T.cpp
-    Timer_Heap_T.cpp
-    Timer_List_T.cpp
-    Timer_Queue_Adapters.cpp
-    Timer_Queue_T.cpp
-    Timer_Wheel_T.cpp
-    Typed_SV_Message.cpp
-    Typed_SV_Message_Queue.cpp
-    Unbounded_Queue.cpp
-    Unbounded_Set.cpp
-    Vector_T.cpp
   }
 
   Inline_Files {
-    Bound_Ptr.inl
-    Condition_T.inl
-    Guard_T.inl
-    Handle_Gobbler.inl
-    Lock_Adapter_T.inl
     OS.inl
     OS_Memory.inl
     OS_String.inl
@@ -226,12 +137,7 @@ project(ACE_OS) : acedefaults, core, pkgconfig {
     svc_export.h
   }
 
-  Documentation_Files {
-    README
-    ../VERSION
-  }
-
   Pkgconfig_Files {
-     ACE_FOR_TAO.pc.in
+     ACE_OS.pc.in
   }
 }
diff --git a/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb b/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb
new file mode 100644
index 00000000000..150837a66c2
--- /dev/null
+++ b/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb
@@ -0,0 +1,10 @@
+// -*- MPC -*-
+//
+// $Id$
+
+feature(ace_for_tao) {
+
+  after    += ACE_Memory_FOR_TAO
+  libs     += ACE_Memory_FOR_TAO
+
+}
diff --git a/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb b/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb
new file mode 100644
index 00000000000..9a9516fe510
--- /dev/null
+++ b/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb
@@ -0,0 +1,10 @@
+// -*- MPC -*-
+//
+// $Id$
+
+feature(ace_for_tao) {
+
+  after    += ACE_Threads_FOR_TAO
+  libs     += ACE_Threads_FOR_TAO
+
+}