10 files changed, 26 insertions, 39 deletions
diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h
index 0f6a1ba492a..2cb7febf4dc 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Addr.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h
@@ -19,6 +19,7 @@
 #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 ecf18953dc9..4547109ab46 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -13,15 +13,14 @@
 #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 30f895b32d8..87f2dd7785a 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h
@@ -12,7 +12,6 @@
 #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 4337dd04eb5..dd32c94e668 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 36493c0b439..6e7e81b1316 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
@@ -2,7 +2,6 @@
 #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"
 
@@ -10,11 +9,6 @@
 #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 f9096ce13e9..568dd8b4b25 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
@@ -8,12 +8,9 @@
  */
 //=============================================================================
 #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 e024f6fa75b..61d50294456 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
@@ -1,14 +1,12 @@
+#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 b62a6923424..8bb83f3b66f 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
@@ -1,19 +1,19 @@
-#include "ace/Synch.h"
-#include "HTBP_Session.h"
-
-#if !defined (__ACE_INLINE__)
-#include "HTBP_Session.inl"
-#endif
+// SOCK_Stream.cpp
+#include "ace/Log_Msg.h"
 
+#include "HTBP_Session.h"
+#include "ace/SOCK_Connector.h"
+#include "ace/Event_Handler.h"
 #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 aecdfe22e1e..7098bf0b8fa 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_Traits.h"
+#include "ace/Synch.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 f14c8e003f6..77e7a3415b0 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
@@ -9,11 +9,10 @@
 //=============================================================================
 #include "HTBP_Stream.h"
 
-#include "ace/Message_Block.h"
-#include "ace/Synch.h"
-
-#include "HTBP_Filter_Factory.h"
 #include "HTBP_Session.h"
+#include "HTBP_Filter_Factory.h"
+
+#include "ace/Message_Block.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL