Merge pull request #176 from esohns/master

some (bundled) minor changes (take 2)

63 files changed, 303 insertions, 171 deletions

diff --git a/.gitignore b/.gitignore
index a2aed252e6b..6eed410f3aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@
 *S_T.h
 *S_T.inl
 
+*.iobj
+*.ipdb
+
 .depend.*
 GNUmakefile*
 *.ior
@@ -38,3 +41,4 @@ ipch/
 *.res
 *.opendb
 *.VC.db
+build
diff --git a/ACE/NEWS b/ACE/NEWS
index e3338ac417e..343b5df37df 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,28 @@
 USER VISIBLE CHANGES BETWEEN ACE-6.4.1 and ACE-6.4.2
 ====================================================
 
+. Added support for getpwnam_r on Solaris 11
+
+. ACE_OSTREAM_TYPE uses the std namespace where applicable
+
+. ACE_WIN32_Asynch_Operation::cancel() uses CancelIOEx on Windows Vista and
+  above
+
+. Bugfix of exported template specializations on Win32 platforms
+  (specifically, ACE_Condition_Recursive_Thread_Mutex)
+
+. Fixed potential memory leak when using the ACE_WIN32_Proactor
+
+. Header sanitizations (specifically, ace/Synch.h)
+
+. Fixed a race condition in ACE_Thread_Manager::task_wait() on Win32
+
+. A (major) cleanup of timer queue code
+
+. Repaired the ACE_Timer_Hash class. This class code was unused for a while
+  and essentially broken due to bit-rot. It is now another (meta-)implementation
+  that can be used stand-alone, or with the other timer queue implementations
+
 USER VISIBLE CHANGES BETWEEN ACE-6.4.0 and ACE-6.4.1
 ====================================================
 
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
index 2f68f8c8b36..763f08154de 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -12,15 +12,15 @@
 
 #if defined (ACE_HAS_THREADS)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/Condition_Recursive_Thread_Mutex.inl"
+#endif /* __ACE_INLINE__ */
+
 #include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
-{
-  return ACE_OS::cond_destroy (&this->cond_);
-}
+ACE_ALLOC_HOOK_DEFINE (ACE_Condition<ACE_Recursive_Thread_Mutex>)
 
 void
 ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
@@ -37,11 +37,6 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void)
-{
-  this->remove ();
-}
-
 ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_Mutex &m)
   : mutex_ (m)
 {
@@ -60,6 +55,11 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M
                 ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>")));
 }
 
+ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void)
+{
+  this->remove ();
+}
+
 int
 ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (const ACE_Time_Value *abstime)
 {
@@ -108,24 +108,6 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
   return result;
 }
 
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
-{
-  return ACE_OS::cond_signal (&this->cond_);
-}
-
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
-{
-  return ACE_OS::cond_broadcast (&this->cond_);
-}
-
-ACE_Recursive_Thread_Mutex &
-ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void)
-{
-  return this->mutex_;
-}
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h
index a7ce9944cc5..8d0b277511a 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.h
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h
@@ -23,12 +23,16 @@
 #if !defined (ACE_HAS_THREADS)
 #  include "ace/Null_Condition.h"
 #else /* ACE_HAS_THREADS */
+// ACE platform supports some form of threading.
+
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Condition_Attributes.h"
 #include "ace/Condition_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class ACE_Time_Value;
+
 /**
  * @brief ACE_Condition template specialization written using
  *  @a ACE_Recursive_Thread_Mutex.  This allows threads to block until
@@ -86,6 +90,9 @@ public:
   /// Dump the state of an object.
   void dump (void) const;
 
+  /// Declare the dynamic allocation hooks.
+  ACE_ALLOC_HOOK_DECLARE;
+
 private:
 
   // = Prevent assignment and copying.
@@ -101,11 +108,23 @@ private:
   ACE_Recursive_Thread_Mutex &mutex_;
 
 };
+// prevent implicit instantiations by includers to relieve the linker
+#if defined (ACE_HAS_CPP11_EXTERN_TEMPLATES)
+# if defined (ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES)
+extern template class ACE_Condition<ACE_Recursive_Thread_Mutex>;
+# else
+extern template ACE_Export class ACE_Condition<ACE_Recursive_Thread_Mutex>;
+# endif /* ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES */
+#endif /* ACE_HAS_CPP11_EXTERN_TEMPLATES */
 
 typedef ACE_Condition<ACE_Recursive_Thread_Mutex> ACE_Condition_Recursive_Thread_Mutex;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#if defined (__ACE_INLINE__)
+#include "ace/Condition_Recursive_Thread_Mutex.inl"
+#endif /* __ACE_INLINE__ */
+
 #endif /* !ACE_HAS_THREADS */
 
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.inl b/ACE/ace/Condition_Recursive_Thread_Mutex.inl
new file mode 100644
index 00000000000..30895e26f7c
--- /dev/null
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.inl
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
+{
+  return ACE_OS::cond_destroy (&this->cond_);
+}
+
+ACE_INLINE ACE_Recursive_Thread_Mutex &
+ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void)
+{
+  return this->mutex_;
+}
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
+{
+  return ACE_OS::cond_signal (&this->cond_);
+}
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
+{
+  return ACE_OS::cond_broadcast (&this->cond_);
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index c83fae41a47..1ed39ab50fe 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -26,8 +26,6 @@
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/Synch_Traits.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index 3d680bba97b..a6e0d43d0f6 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -56,6 +56,14 @@ ACE_OS::getpwnam_r (const char *name,
     }
   *result = pwd;
   return 0;
+#elif defined (ACE_HAS_SOLARIS11_GETPWNAM_R)
+  if (::getpwnam_r (name, pwd, buffer, bufsize) == 0)
+  {
+    *result = 0;
+    return -1;
+  }
+  *result = pwd;
+  return 0;
 #elif defined (ACE_HAS_STHREADS)
   if (::getpwnam_r (name, pwd, buffer, bufsize) != 0)
     {
diff --git a/ACE/ace/Synch.h b/ACE/ace/Synch.h
index 6a6bf794258..5843c28fa8d 100644
--- a/ACE/ace/Synch.h
+++ b/ACE/ace/Synch.h
@@ -20,6 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+// *NOTE*: never never never ever #include this file in a header
+//         --> #include "ace/Synch_Traits.h" instead and #include "ace/Synch.h"
+//             in the .cpp. This prevents multiple implicit template
+//             instantiations (linker errors on MSVC)
 #if !defined (DO_NOT_INCLUDE_SYNCH_H)
 
 /* All the classes have been moved out into their own headers as part of
diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp
index b2ccf1a2168..a56bc9a21e5 100644
--- a/ACE/ace/Timer_Queue_Adapters.cpp
+++ b/ACE/ace/Timer_Queue_Adapters.cpp
@@ -276,7 +276,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void)
             {
               // The earliest time on the Timer_Queue lies in future;
               // convert the tv to an absolute time.
-              ACE_Time_Value const tv = this->timer_queue_->gettimeofday () + (tv_earl - tv_curr);
+              ACE_Time_Value const tv = tv_curr + (tv_earl - tv_curr);
               // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiting until %u.%3.3u secs\n"),
               // tv.sec(), tv.msec()));
               this->condition_.wait (&tv);
diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h
index a92a260cd2f..4704de6d4e9 100644
--- a/ACE/ace/Timer_Queue_Adapters.h
+++ b/ACE/ace/Timer_Queue_Adapters.h
@@ -21,7 +21,7 @@
 
 #include "ace/Signal.h"
 #include "ace/Sig_Handler.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
+#include "ace/Synch_Traits.h"
 
 #if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
 #  include "ace/Unbounded_Queue.h"
diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp
index d914ccfc463..1d42267843d 100644
--- a/ACE/ace/WIN32_Asynch_IO.cpp
+++ b/ACE/ace/WIN32_Asynch_IO.cpp
@@ -175,7 +175,12 @@ ACE_WIN32_Asynch_Operation::cancel (void)
 
   // @@ This API returns 0 on failure. So, I am returning -1 in that
   //    case. Is that right? (Alex).
+#if (_WIN32_WINNT < 0x0600)
   int const result = (int) ::CancelIo (this->handle_);
+#else
+  int const result = (int) ::CancelIoEx (this->handle_,
+                                         0);
+#endif /* _WIN32_WINNT < 0x0600 */
 
   if (result == 0)
     // Couldn't cancel the operations.
diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp
index 25bf4f31b32..c593398cc26 100644
--- a/ACE/ace/WIN32_Proactor.cpp
+++ b/ACE/ace/WIN32_Proactor.cpp
@@ -636,6 +636,12 @@ ACE_WIN32_Proactor::application_specific_code (ACE_WIN32_Asynch_Result *asynch_r
                                                const void *completion_key,
                                                u_long error)
 {
+  // *NOTE*: on Win32 with MSVC (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS set), this
+  //         needs to be compiled with '/EHa' to work properly, otherwise
+  //         'finally' is skipped, leaking memory
+  // *TODO*: the default (auto-)generated MPC MSVC project files do not enforce
+  //         this (uses '/EHsc', see $MPC_ROOT/templates/nmakedll.mpt:36)
+  // *WORKAROUND*: #undef(ine) ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS in config.h
   ACE_SEH_TRY
     {
       // Call completion hook
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 2de100fe757..78cf996f52f 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -382,7 +382,9 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
 
   Inline_Files {
     Bound_Ptr.inl
+    Condition_Recursive_Thread_Mutex.inl
     Condition_T.inl
+    Condition_Thread_Mutex.inl
     Guard_T.inl
     Handle_Gobbler.inl
     Intrusive_Auto_Ptr.inl
@@ -392,6 +394,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Reverse_Lock_T.inl
     TSS_T.inl
     Time_Value_T.inl
+    Timer_Queue_Adapters.inl
   }
 
   Header_Files {
@@ -404,7 +407,9 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Codeset_Symbols.h
     CORBA_macros.h
     Codeset_Symbols.h
+    Condition_Recursive_Thread_Mutex.h
     Condition_T.h
+    Condition_Thread_Mutex.h
     Countdown_Time.h
     Default_Constants.h
     Event_Base.h
@@ -459,6 +464,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Timer_Heap.h
     Timer_List.h
     Timer_Queue.h
+    Timer_Queue_Adapters.h
     Timer_Queuefwd.h
     Timer_Wheel.h
     Truncate.h
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 4ced0ef10b6..9d60b39d174 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -38,7 +38,22 @@
 # if __cplusplus > 201103L
 #  define ACE_HAS_CPP14
 # endif
-#endif
+#endif /* __GNUC__ >= 4.7 */
+
+// *NOTE*: this feature may go back further, see e.g.:
+//         https://gcc.gnu.org/projects/cxx0x.html
+#if defined (ACE_HAS_CPP11)
+# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+#  define ACE_HAS_CPP11_EXTERN_TEMPLATES
+# endif /* __GNUC__ >= 4.3 */
+
+// *NOTE*: suppress a warning, g++ 5.2.1 does not support attributes on template
+// instantiation declarations
+// *TODO*: this probably goes back further than 5.2
+# if (__GNUC__ >= 6 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 2))
+#  define ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES
+# endif /* __GNUC__ >= 5.2 */
+#endif /* ACE_HAS_CPP11 */
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
 # define ACE_SIZEOF_LONG_DOUBLE 12
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 2fae4892abd..b1d859fff71 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -49,7 +49,11 @@
 # if defined (ACE_LACKS_IOSTREAM_TOTALLY)
 #   define ACE_OSTREAM_TYPE FILE
 # else  /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#  if defined ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+#   define ACE_OSTREAM_TYPE std::ostream
+#  else
 #   define ACE_OSTREAM_TYPE ostream
+#  endif /* ! ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 # endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 #endif /* ! ACE_OSTREAM_TYPE */
 
diff --git a/ACE/ace/config-sunos5.11.h b/ACE/ace/config-sunos5.11.h
index 07f8b679f3b..3cb88aca708 100644
--- a/ACE/ace/config-sunos5.11.h
+++ b/ACE/ace/config-sunos5.11.h
@@ -10,4 +10,7 @@
 // #include the SunOS 5.10 config, then add any SunOS 5.11 updates below.
 #include "ace/config-sunos5.10.h"
 
+// *TODO*: find out how far this also hold for previous solaris releases
+#define ACE_HAS_SOLARIS11_GETPWNAM_R
+
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h
index e674c970315..daae26f81bc 100644
--- a/ACE/ace/config-win32-msvc-14.h
+++ b/ACE/ace/config-win32-msvc-14.h
@@ -41,6 +41,10 @@
 // Visual Studio 2015 has adequate C++11 support
 #define ACE_HAS_CPP11
 
+// *TODO*: this C++11-feature goes back further (at least to MSVC 2010), see:
+//         https://msdn.microsoft.com/en-us/library/hh567368.aspx#featurelist
+#define ACE_HAS_CPP11_EXTERN_TEMPLATES
+
 #define ACE_PUTENV_EQUIVALENT ::_putenv
 #define ACE_TEMPNAM_EQUIVALENT ::_tempnam
 #define ACE_STRDUP_EQUIVALENT ::_strdup
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
index c8df6d3eba1..cab6cff8e64 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -2,10 +2,10 @@
 #ifndef JAWS_HTTP_SERVICE_HANDLER_H
 #define JAWS_HTTP_SERVICE_HANDLER_H
 
-#include "ace/Synch.h"
 #include "ace/Acceptor.h"
-#include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Protocol_Handler.h"
 
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
index 67082e2bad6..30f39013db8 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
@@ -3,9 +3,9 @@
 #define JAWS_CACHED_ALLOCATOR_T_H
 
 #include "ace/ACE.h"
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
 #include "ace/Free_List.h"
+#include "ace/Malloc.h"
+#include "ace/Synch_Traits.h"
 
 #define JAWS_DEFAULT_ALLOCATOR_CHUNKS 10
 #define JAWS_CACHED_ALLOCATOR(T) \
diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp
index ff2fa889489..9bff39efe2a 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.cpp
+++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp
@@ -1,8 +1,9 @@
-#include "ace/OS_NS_stdlib.h"
-#include "ace/OS_NS_string.h"
 #include "ace/FILE_Connector.h"
 #include "ace/Message_Block.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_string.h"
 #include "ace/Singleton.h"
+#include "ace/Synch.h"
 #include "ace/Unbounded_Queue.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
index 244c1a35f79..dda46d5a418 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.h
+++ b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -3,9 +3,9 @@
 #define JAWS_DATAGRAM_H
 
 #include "ace/Addr.h"
-#include "ace/Synch.h"
 #include "ace/Singleton.h"
 #include "ace/SOCK_Dgram.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/Event_Completer.h"
diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h
index 3f9d847475b..f419ecd4813 100644
--- a/ACE/apps/JAWS3/jaws3/Options.h
+++ b/ACE/apps/JAWS3/jaws3/Options.h
@@ -3,7 +3,7 @@
 #define JAWS_OPTIONS_H
 
 #include "ace/Singleton.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/Config_File.h"
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h
index 242db3f9f8a..5cb83a14c06 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.h
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h
@@ -2,9 +2,9 @@
 #ifndef JAWS_SIGNAL_TASK_H
 #define JAWS_SIGNAL_TASK_H
 
-#include "ace/Synch.h"
 #include "ace/Signal.h"
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 
diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
index 7c187498c3d..936d5eaf554 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
@@ -2,6 +2,8 @@
 #define JAWS_BUILD_DLL
 #endif
 
+#include "ace/Synch.h"
+
 #include "jaws3/Symbol_Table.h"
 
 JAWS_Symbol_Table::JAWS_Symbol_Table (size_t size)
diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.h b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
index 346509e57f3..0b1ff507926 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.h
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
@@ -3,7 +3,7 @@
 #define JAWS_SYMBOL_TABLE_H
 
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Export.h"
 
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
index a7e49ba2d8d..f7068f54626 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.h
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -2,11 +2,11 @@
 #ifndef TERA_SS_SERVICE_HANDLER_H
 #define TERA_SS_SERVICE_HANDLER_H
 
-#include "ace/Synch.h"
 #include "ace/Acceptor.h"
-#include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/svc_export.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Synch_Traits.h"
 
 #include "jaws3/Protocol_Handler.h"
 
diff --git a/ACE/examples/APG/Logging/LogManager.h b/ACE/examples/APG/Logging/LogManager.h
index 523abff55d8..d1689d7d3aa 100644
--- a/ACE/examples/APG/Logging/LogManager.h
+++ b/ACE/examples/APG/Logging/LogManager.h
@@ -1,8 +1,9 @@
 #include "ace/streams.h"
-#include "ace/Synch.h"
-#include "ace/Singleton.h"
+
 #include "ace/Log_Msg.h"
 #include "ace/Log_Msg_Callback.h"
+#include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
 
 #ifndef LOG_MANAGER_H
 #define LOG_MANAGER_H
@@ -92,7 +93,7 @@ LogManager::redirectToCallback (ACE_Log_Msg_Callback * callback)
 // Listing 2
 
 // Listing 3 code/ch03
-typedef ACE_Singleton<LogManager, ACE_Null_Mutex>
+typedef ACE_Singleton<LogManager, ACE_SYNCH_NULL_MUTEX>
         LogManagerSingleton;
 #define LOG_MANAGER LogManagerSingleton::instance()
 // Listing 3
diff --git a/ACE/examples/APG/Logging/Use_LogManager.cpp b/ACE/examples/APG/Logging/Use_LogManager.cpp
index d7b7c3607d9..afc23cc1f6d 100644
--- a/ACE/examples/APG/Logging/Use_LogManager.cpp
+++ b/ACE/examples/APG/Logging/Use_LogManager.cpp
@@ -1,3 +1,6 @@
+
+#include "ace/Synch.h"
+
 #include "LogManager.h"
 
 // Listing 1 code/ch03
diff --git a/ACE/examples/APG/ThreadSafety/ClientContext.h b/ACE/examples/APG/ThreadSafety/ClientContext.h
index 168d4824bc2..f013ffe963a 100644
--- a/ACE/examples/APG/ThreadSafety/ClientContext.h
+++ b/ACE/examples/APG/ThreadSafety/ClientContext.h
@@ -7,9 +7,9 @@
 #define __CLIENTCONTEXT_H_
 
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
-typedef ACE_Hash_Map_Manager<const char *, void *, ACE_Null_Mutex>
+typedef ACE_Hash_Map_Manager<const char *, void *, ACE_SYNCH_NULL_MUTEX>
 Map;
 
 // Listing 1 code/ch14
diff --git a/ACE/examples/APG/Threads/Message_Receiver.h b/ACE/examples/APG/Threads/Message_Receiver.h
index 92f1ab61256..4697f54f026 100644
--- a/ACE/examples/APG/Threads/Message_Receiver.h
+++ b/ACE/examples/APG/Threads/Message_Receiver.h
@@ -10,7 +10,7 @@
 #include "ace/Message_Block.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 #include "ace/Task.h"
 
 // Listing 1 code/ch12
diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.h b/ACE/examples/APG/Timers/PTimerDispatcher.h
index 43047c67a8a..1954d3fd65d 100644
--- a/ACE/examples/APG/Timers/PTimerDispatcher.h
+++ b/ACE/examples/APG/Timers/PTimerDispatcher.h
@@ -2,8 +2,9 @@
 #if !defined(PTIMER_DISPATCHER_H)
 #define PTIMER_DISPATCHER_H
 
+#include "ace/Event.h"
 #include "ace/Singleton.h"
-#include "ace/Synch.h"  // needed for ACE_Event
+#include "ace/Synch_Traits.h"
 
 #include "Upcall.h"
 class PCB;
@@ -31,7 +32,7 @@ private:
   ACE_Event timer_;
 };
 
-typedef ACE_Singleton<PTimer_Dispatcher, ACE_Null_Mutex> PTimer;
+typedef ACE_Singleton<PTimer_Dispatcher, ACE_SYNCH_NULL_MUTEX> PTimer;
 
 #endif /*TIMER_DISPATCHER_H*/
 
diff --git a/ACE/examples/APG/Timers/TimerDispatcher.h b/ACE/examples/APG/Timers/TimerDispatcher.h
index 06ce42a8d8a..e587ab6fb05 100644
--- a/ACE/examples/APG/Timers/TimerDispatcher.h
+++ b/ACE/examples/APG/Timers/TimerDispatcher.h
@@ -2,9 +2,10 @@
 #if !defined(TIMER_DISPATCHER_H)
 #define TIMER_DISPATCHER_H
 
+#include "ace/Event.h"
 #include "ace/Event_Handler.h"
 #include "ace/Singleton.h"
-#include "ace/Synch.h"  // needed for ACE_Event
+#include "ace/Synch_Traits.h"
 #include "ace/Timer_Queue.h"
 
 // Listing 1 code/ch20
@@ -31,7 +32,7 @@ private:
   ACE_Event timer_;
 };
 
-typedef ACE_Singleton<Timer_Dispatcher, ACE_Null_Mutex> Timer;
+typedef ACE_Singleton<Timer_Dispatcher, ACE_SYNCH_NULL_MUTEX> Timer;
 // Listing 1
 
 #endif /*TIMER_DISPATCHER_H*/
diff --git a/ACE/examples/APG/Timers/Upcall.h b/ACE/examples/APG/Timers/Upcall.h
index 5b2c1c7593e..07e2e7c4afb 100644
--- a/ACE/examples/APG/Timers/Upcall.h
+++ b/ACE/examples/APG/Timers/Upcall.h
@@ -2,21 +2,21 @@
 #if !defined(UPCALL_H)
 #define UPCALL_H
 
+#include "ace/Synch_Traits.h"
 #include "ace/Timer_Queue_T.h"
 #include "ace/Timer_Heap_T.h"
-#include "ace/Synch.h"
 
 #include "PCB.h"
 
 // Listing 1 code/ch20
 class UpcallHandler;
 
-typedef ACE_Timer_Queue_T<PCB*, UpcallHandler, ACE_Null_Mutex>
+typedef ACE_Timer_Queue_T<PCB*, UpcallHandler, ACE_SYNCH_NULL_MUTEX>
   PTimerQueue;
 
 // Create a special heap-based timer queue that allows you to
 // control exactly how timer evetns are handled.
-typedef ACE_Timer_Heap_T<PCB*, UpcallHandler, ACE_Null_Mutex>
+typedef ACE_Timer_Heap_T<PCB*, UpcallHandler, ACE_SYNCH_NULL_MUTEX>
   PTimerHeap;
 // Listing 1
 
diff --git a/ACE/examples/C++NPv2/TP_Logging_Server.cpp b/ACE/examples/C++NPv2/TP_Logging_Server.cpp
index 10bb93f0586..832110af219 100644
--- a/ACE/examples/C++NPv2/TP_Logging_Server.cpp
+++ b/ACE/examples/C++NPv2/TP_Logging_Server.cpp
@@ -5,6 +5,8 @@
 #include "ace/OS_Memory.h"
 #include "ace/Guard_T.h"
 #include "ace/Message_Block.h"
+#include "ace/Synch.h"
+
 #include "TP_Logging_Server.h"
 
 int TP_Logging_Handler::handle_input (ACE_HANDLE) {
diff --git a/ACE/examples/C++NPv2/TP_Logging_Server.h b/ACE/examples/C++NPv2/TP_Logging_Server.h
index 0f0ca357b76..a4b1ac67f3a 100644
--- a/ACE/examples/C++NPv2/TP_Logging_Server.h
+++ b/ACE/examples/C++NPv2/TP_Logging_Server.h
@@ -7,8 +7,9 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Singleton.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 #include "ace/Task.h"
+
 #include "Logging_Acceptor.h"
 #include "Logging_Event_Handler.h"
 #include "Reactor_Logging_Server_T.h"
@@ -29,7 +30,7 @@ public:
   virtual int svc (void);
 };
 
-typedef ACE_Unmanaged_Singleton<TP_Logging_Task, ACE_Null_Mutex>
+typedef ACE_Unmanaged_Singleton<TP_Logging_Task, ACE_SYNCH_NULL_MUTEX>
         TP_LOGGING_TASK;
 
 /*******************************************************/
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
index 5ccb0e01bff..a412ac358cf 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
@@ -26,7 +26,6 @@
 #include "ace/Timer_Heap_T.h"
 #include "ace/Timer_Queue_Adapters.h"
 #include "ace/svc_export.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
 #include "Driver.h"
 #include "Custom_Handler.h"
 
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index 03471912ad9..2a251ffc218 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -22,8 +22,6 @@
 #include "ace/Condition_T.h"
 #include "ace/Thread_Mutex.h"
 
-
-
 // Administrivia methods...
 Handler::Handler(const ACE_Time_Value &expiration_time)
   :  expires_ (expiration_time),
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
index 97446bf213c..b6071552713 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
@@ -16,18 +16,18 @@
 #ifndef _THREAD_TIMER_QUEUE_TEST_H_
 #define _THREAD_TIMER_QUEUE_TEST_H_
 
-#include "ace/Task.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Null_Mutex.h"
+#include "ace/Event_Handler_Handle_Timeout_Upcall.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Task.h"
+#include "ace/Time_Value.h"
 #include "ace/Timer_Heap_T.h"
 #include "ace/Timer_Queue_Adapters.h"
 #include "ace/svc_export.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
-#include "ace/Event_Handler_Handle_Timeout_Upcall.h"
+
 #include "Driver.h"
 
 // These typedefs ensure that we use the minimal amount of locking
@@ -36,11 +36,11 @@ typedef ACE_Event_Handler_Handle_Timeout_Upcall
         Upcall;
 typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
                          Upcall,
-                         ACE_Null_Mutex>
+                         ACE_SYNCH_NULL_MUTEX>
         Timer_Heap;
 typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
                                   Upcall,
-                                  ACE_Null_Mutex>
+                                  ACE_SYNCH_NULL_MUTEX>
         Timer_Heap_Iterator;
 typedef ACE_Thread_Timer_Queue_Adapter<Timer_Heap>
         Thread_Timer_Queue;
diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h
index 2cb7febf4dc..0f6a1ba492a 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Addr.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h
@@ -19,7 +19,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/INET_Addr.h"
-#include "ace/Synch.h"
 #include "ace/SString.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
index 4547109ab46..ecf18953dc9 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -13,14 +13,15 @@
 #include "HTBP_Channel.inl"
 #endif
 
-#include "HTBP_Session.h"
-#include "HTBP_Filter_Factory.h"
-
 #include "ace/Auto_Ptr.h"
 #include "ace/Message_Block.h"
-#include "ace/Reactor.h"
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/OS_NS_time.h"
+#include "ace/Reactor.h"
+#include "ace/Synch.h"
+
+#include "HTBP_Session.h"
+#include "HTBP_Filter_Factory.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h
index 87f2dd7785a..30f895b32d8 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h
@@ -12,6 +12,7 @@
 #define ACE_HTBP_CHANNEL_H
 #include /**/ "ace/pre.h"
 
+#include "ace/INET_Addr.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Message_Block.h"
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
index dd32c94e668..4337dd04eb5 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
@@ -1,13 +1,13 @@
-#include "ace/Log_Msg.h"
-
-#include "HTBP_Session.h"
 #include "HTBP_Filter.h"
 
 #if !defined (__ACE_INLINE__)
 #include "HTBP_Filter.inl"
 #endif
 
+#include "ace/Log_Msg.h"
+#include "ace/Synch.h"
 
+#include "HTBP_Session.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
index 6e7e81b1316..36493c0b439 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
@@ -2,6 +2,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Synch.h"
 #include "HTBP_Session.h"
 #include "HTBP_Inside_Squid_Filter.h"
 
@@ -9,6 +10,11 @@
 #include "HTBP_Inside_Squid_Filter.inl"
 #endif
 
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
+
+#include "HTBP_Session.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ssize_t
diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
index 568dd8b4b25..f9096ce13e9 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
@@ -8,9 +8,12 @@
  */
 //=============================================================================
 #include "HTBP_Notifier.h"
+
+#include "ace/Reactor.h"
+#include "ace/Synch.h"
+
 #include "HTBP_Channel.h"
 #include "HTBP_Session.h"
-#include "ace/Reactor.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
index 61d50294456..e024f6fa75b 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
@@ -1,12 +1,14 @@
-#include "ace/Log_Msg.h"
-
-#include "HTBP_Session.h"
 #include "HTBP_Outside_Squid_Filter.h"
 
 #if !defined (__ACE_INLINE__)
 #include "HTBP_Outside_Squid_Filter.inl"
 #endif
 
+#include "ace/Log_Msg.h"
+#include "ace/Synch.h"
+
+#include "HTBP_Session.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ssize_t
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
index 8bb83f3b66f..b62a6923424 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
@@ -1,19 +1,19 @@
-// SOCK_Stream.cpp
-#include "ace/Log_Msg.h"
-
+#include "ace/Synch.h"
 #include "HTBP_Session.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Event_Handler.h"
+
+#if !defined (__ACE_INLINE__)
+#include "HTBP_Session.inl"
+#endif
+
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/Event_Handler.h"
+#include "ace/Log_Msg.h"
+#include "ace/SOCK_Connector.h"
 
 #include "HTBP_Filter.h"
 #include "HTBP_ID_Requestor.h"
 
-#if !defined (__ACE_INLINE__)
-#include "HTBP_Session.inl"
-#endif
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE::HTBP::Session::Session_Map ACE::HTBP::Session::session_map_;
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h
index 7098bf0b8fa..aecdfe22e1e 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.h
@@ -12,10 +12,10 @@
 #define ACE_HTBP_SESSION_H
 #include /**/ "ace/pre.h"
 
-#include "ace/SOCK_IO.h"
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 #include "ace/Message_Queue.h"
+#include "ace/SOCK_IO.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
index 77e7a3415b0..f14c8e003f6 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
@@ -9,10 +9,11 @@
 //=============================================================================
 #include "HTBP_Stream.h"
 
-#include "HTBP_Session.h"
-#include "HTBP_Filter_Factory.h"
-
 #include "ace/Message_Block.h"
+#include "ace/Synch.h"
+
+#include "HTBP_Filter_Factory.h"
+#include "HTBP_Session.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/protocols/ace/TMCast/LinkListener.hpp b/ACE/protocols/ace/TMCast/LinkListener.hpp
index 76944d9d4c9..7e4de5ba688 100644
--- a/ACE/protocols/ace/TMCast/LinkListener.hpp
+++ b/ACE/protocols/ace/TMCast/LinkListener.hpp
@@ -1,12 +1,11 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 
 // OS primitives
-#include <ace/OS_NS_string.h>
-#include <ace/OS_NS_stdlib.h>
-#include <ace/Synch.h>
-#include <ace/SOCK_Dgram_Mcast.h>
-#include <ace/Refcounted_Auto_Ptr.h>
-
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/Refcounted_Auto_Ptr.h"
+#include "ace/SOCK_Dgram_Mcast.h"
+#include "ace/Synch_Traits.h"
 
 #include "Messaging.hpp"
 #include "Protocol.hpp"
@@ -150,7 +149,7 @@ namespace ACE_TMCast
 
   private:
     // FUZZ: disable check_for_ACE_Guard
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
+    typedef ACE_Guard<ACE_SYNCH_MUTEX> AutoLock;
     // FUZZ: enable check_for_ACE_Guard
 
     ACE_hthread_t thread_;
diff --git a/ACE/protocols/ace/TMCast/Messaging.hpp b/ACE/protocols/ace/TMCast/Messaging.hpp
index 883f52273e5..f4046f0c68b 100644
--- a/ACE/protocols/ace/TMCast/Messaging.hpp
+++ b/ACE/protocols/ace/TMCast/Messaging.hpp
@@ -3,8 +3,8 @@
 #ifndef TMCAST_MESSAGING_HPP
 #define TMCAST_MESSAGING_HPP
 
-#include <ace/Synch.h>
-#include <ace/Bound_Ptr.h>
+#include "ace/Bound_Ptr.h"
+#include "ace/Synch_Traits.h"
 
 #include "MTQueue.hpp"
 
@@ -22,7 +22,7 @@ namespace ACE_TMCast
   MessagePtr;
 
   typedef
-  MTQueue<MessagePtr, ACE_Thread_Mutex, ACE_Condition<ACE_Thread_Mutex> >
+  MTQueue<MessagePtr, ACE_SYNCH_MUTEX, ACE_SYNCH_CONDITION >
   MessageQueue;
 
   struct MessageQueueAutoLock
diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp
index 43ff7a9ee8c..57c601749ba 100644
--- a/ACE/protocols/ace/TMCast/TransactionController.hpp
+++ b/ACE/protocols/ace/TMCast/TransactionController.hpp
@@ -1,9 +1,9 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 
+#include "ace/Bound_Ptr.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdlib.h"
-#include "ace/Synch.h"
-#include "ace/Bound_Ptr.h"
+#include "ace/Synch_Traits.h"
 
 #include "Protocol.hpp"
 #include "Messaging.hpp"
@@ -366,7 +366,7 @@ namespace ACE_TMCast
 
   private:
     // FUZZ: disable check_for_ACE_Guard
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
+    typedef ACE_Guard<ACE_SYNCH_MUTEX> AutoLock;
     // FUZZ: enable check_for_ACE_Guard
 
     // bool trace_;
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
index 4716ef081c4..d4e8cd6b671 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
@@ -2,9 +2,10 @@
  * client for a reactor based connection establishment test using HTBP
  */
 
-#include "ace/Log_Msg.h"
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_socket.h"
+#include "ace/Synch.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
index d2bc3bb661a..a24011b9fa4 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
@@ -2,21 +2,21 @@
  * server for a reactor based connection establishment test using HTBP
  */
 
-#include "ace/Log_Msg.h"
-
-#include "ace/HTBP/HTBP_Session.h"
-#include "ace/HTBP/HTBP_Stream.h"
-#include "ace/HTBP/HTBP_Addr.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Event_Handler.h"
-#include "ace/Reactor.h"
 #include "ace/Get_Opt.h"
+#include "ace/Event_Handler.h"
+#include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/os_netdb.h"
+#include "ace/Reactor.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Stream.h"
+#include "ace/Synch.h"
+
+#include "ace/HTBP/HTBP_Session.h"
+#include "ace/HTBP/HTBP_Stream.h"
+#include "ace/HTBP/HTBP_Addr.h"
 
 unsigned port = 8088;
 const ACE_TCHAR *notifier_file = 0;
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
index 3567e4c897f..b46468ecb4f 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
@@ -31,10 +31,11 @@
 // This first #undef protects against command-line definitions.
 #undef ACE_NDEBUG
 #include "ace/streams.h"
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "ace/Log_Msg.h"
+
 #include "ace/ACE.h"
+#include "ace/Log_Msg.h"
+#include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
 
 // The second #undef protects against being reset in a config.h file.
 #undef ACE_NDEBUG
@@ -303,7 +304,7 @@ randomize (int array[], size_t size)
     }
 }
 
-typedef ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> ace_file_stream;
+typedef ACE_Singleton<ACE_Test_Output, ACE_NULL_MUTEX> ace_file_stream;
 
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> *
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
index cfe26926333..1b94d1fe166 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
@@ -1,13 +1,14 @@
+#include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/Synch.h"
+
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Addr.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
 #include "ace/HTBP/HTBP_Environment.h"
 
-#include "ace/Log_Msg.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_sys_socket.h"
-
 const ssize_t Send_Size = 4*1024;
 const size_t Loops = 10;
 const size_t Total_Size = Send_Size * Loops;
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
index 2e43f9bfba4..d228e1dd3cc 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
@@ -1,16 +1,16 @@
-#include "ace/Log_Msg.h"
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/os_include/os_netdb.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Stream.h"
+#include "ace/Synch.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Addr.h"
 
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_sys_socket.h"
-#include "ace/os_include/os_netdb.h"
-
 const size_t Send_Size = 4*1024;
 const size_t Loops = 10;
 const size_t Total_Size = Send_Size * Loops;
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
index 23a8d837836..f343a5554d9 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
@@ -16,19 +16,19 @@
  */
 //=============================================================================
 
-
-#include "ace/HTBP/HTBP_Stream.h"
-#include "ace/HTBP/HTBP_Session.h"
-#include "ace/HTBP/HTBP_ID_Requestor.h"
-#include "ace/HTBP/HTBP_Environment.h"
-
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/Synch.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Stream.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_sys_socket.h"
+
+#include "ace/HTBP/HTBP_Stream.h"
+#include "ace/HTBP/HTBP_Session.h"
+#include "ace/HTBP/HTBP_ID_Requestor.h"
+#include "ace/HTBP/HTBP_Environment.h"
 
 // Change to non-zero if test fails
 static int Test_Result = 0;
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
index 05e2bf4c069..0e4b115faf0 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
@@ -16,22 +16,22 @@
  */
 //=============================================================================
 
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/os_include/os_netdb.h"
+#include "ace/SOCK_Connector.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Stream.h"
+#include "ace/Synch.h"
+#include "ace/Thread.h"
+#include "ace/Thread_Manager.h"
 
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
 #include "ace/HTBP/HTBP_Environment.h"
 
-#include "ace/Thread.h"
-#include "ace/Thread_Manager.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_sys_socket.h"
-#include "ace/os_include/os_netdb.h"
-
 // Change to non-zero if test fails
 static int Test_Result = 0;
 
diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/protocols/tests/HTBP/ping/client.cpp
index 6ae5ff57fd2..881acf64917 100644
--- a/ACE/protocols/tests/HTBP/ping/client.cpp
+++ b/ACE/protocols/tests/HTBP/ping/client.cpp
@@ -7,6 +7,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/os_netdb.h"
+#include "ace/Synch.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/protocols/tests/HTBP/ping/server.cpp
index e0a52fba7eb..0fb22f90765 100644
--- a/ACE/protocols/tests/HTBP/ping/server.cpp
+++ b/ACE/protocols/tests/HTBP/ping/server.cpp
@@ -2,19 +2,19 @@
  * server for a basic connection establishment test using HTBP
  */
 
+#include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/os_include/os_netdb.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Stream.h"
+#include "ace/Synch.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Addr.h"
 
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_sys_socket.h"
-#include "ace/os_include/os_netdb.h"
-
 unsigned port = 8088;
 const ACE_TCHAR *notifier_file = 0;
 int
diff --git a/ACE/tests/Recursive_Condition_Bug_Test.cpp b/ACE/tests/Recursive_Condition_Bug_Test.cpp
index 365c80209ed..bbfaa98a0fb 100644
--- a/ACE/tests/Recursive_Condition_Bug_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Bug_Test.cpp
@@ -14,14 +14,14 @@
  */
 //=============================================================================
 
-
-#include "test_config.h"
+#include "ace/Activation_Queue.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Synch.h"
 #include "ace/Task_T.h"
-#include "ace/Activation_Queue.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Timer_Queue_Adapters.h"
-#include "ace/Condition_Recursive_Thread_Mutex.h"
+
+#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp
index cfda711b41e..da75b000977 100644
--- a/ACE/tests/Recursive_Condition_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Test.cpp
@@ -11,17 +11,16 @@
  */
 //=============================================================================
 
-
-#include "test_config.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_sys_time.h"
 #include "ace/Event_Handler.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_sys_time.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Synch.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Timer_Queue_Adapters.h"
 
-
+#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
@@ -60,7 +59,7 @@ private:
 
 // These are for the basic functionality tests.
 ACE_SYNCH_RECURSIVE_MUTEX mutex_;
-ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_);
+ACE_SYNCH_RECURSIVE_CONDITION condition_ (mutex_);
 // Test driver sets this to non-zero before spawning and to zero for
 // waiter.
 int protected_int = 0;
diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.h b/ACE/tests/Refcounted_Auto_Ptr_Test.h
index bc723826f68..1b59494f791 100644
--- a/ACE/tests/Refcounted_Auto_Ptr_Test.h
+++ b/ACE/tests/Refcounted_Auto_Ptr_Test.h
@@ -15,7 +15,7 @@
 #define ACE_TESTS_REFCOUNTED_AUTO_PTR_TEST_H
 
 #include "ace/Atomic_Op.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
 struct Printer
 {