ChangeLogTag:Thu Mar 23 14:34:26 2000 Nanbor Wang <nanbor@cs.wustl.edu>

author: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-03-23 21:27:03 +0000
committer: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-03-23 21:27:03 +0000
commit: 18f46df5315adfa2e6869b91bcb49c2e3c9ff8ae (patch)
tree: 5e4f74d88bedce48662f399e445ea71b9948b185
parent: 0d8ebf3cb3cf506b3b4ba259122aa04b0b53378a (diff)
download: ATCD-18f46df5315adfa2e6869b91bcb49c2e3c9ff8ae.tar.gz
325 files changed, 343 insertions, 322 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dd920bffe8..88807971809 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 23 14:34:26 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/*.h: Moved the inclusion of <pre.h> down after the
+	  definition of header guard macro.  The original order violated
+	  the ACE programming guideline.  Thanks to Carlos for catching
+	  this.
+
 Wed Mar 23 15:10:01 2000  Chad Elliott  <elliott_c@ociweb.com>
 
         * tests/run_tests.sh
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 4dd920bffe8..88807971809 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu Mar 23 14:34:26 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/*.h: Moved the inclusion of <pre.h> down after the
+	  definition of header guard macro.  The original order violated
+	  the ACE programming guideline.  Thanks to Carlos for catching
+	  this.
+
 Wed Mar 23 15:10:01 2000  Chad Elliott  <elliott_c@ociweb.com>
 
         * tests/run_tests.sh
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 4dd920bffe8..88807971809 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Thu Mar 23 14:34:26 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/*.h: Moved the inclusion of <pre.h> down after the
+	  definition of header guard macro.  The original order violated
+	  the ACE programming guideline.  Thanks to Carlos for catching
+	  this.
+
 Wed Mar 23 15:10:01 2000  Chad Elliott  <elliott_c@ociweb.com>
 
         * tests/run_tests.sh
diff --git a/ace/ACE.h b/ace/ACE.h
index e9492237752..15703f492f0 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ACE_H
-#include "ace/pre.h"
 #define ACE_ACE_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/ARGV.h b/ace/ARGV.h
index 584399cd916..5585a5150f9 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ARGUMENT_VECTOR_H
-#include "ace/pre.h"
 #define ACE_ARGUMENT_VECTOR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h
index c4640837c64..86206c6b3ef 100644
--- a/ace/ATM_Acceptor.h
+++ b/ace/ATM_Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ATM_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_ATM_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/Time_Value.h"
 #include "ace/ATM_Stream.h"
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
index d2b4d4e1201..4e78efd4c35 100644
--- a/ace/ATM_Addr.h
+++ b/ace/ATM_Addr.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 #ifndef ACE_ATM_ADDR_H
-#include "ace/pre.h"
 #define ACE_ATM_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 #include "ace/Addr.h"
diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h
index 6b7053a2ac4..7f42588a7ed 100644
--- a/ace/ATM_Connector.h
+++ b/ace/ATM_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ATM_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_ATM_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/ATM_Stream.h"
 #include "ace/ATM_Params.h"
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index 9e37075b853..3f73dd819f7 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 #ifndef ACE_ATM_PARAMS_H
-#include "ace/pre.h"
 #define ACE_ATM_PARAMS_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h
index 1ae44da6344..ed3a1eceb1f 100644
--- a/ace/ATM_QoS.h
+++ b/ace/ATM_QoS.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ATM_QoS_H
-#include "ace/pre.h"
 #define ACE_ATM_QoS_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h
index 191d81f4fbc..85efd040c86 100644
--- a/ace/ATM_Stream.h
+++ b/ace/ATM_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ATM_STREAM_H
-#include "ace/pre.h"
 #define ACE_ATM_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/ATM_Addr.h"
 #include "ace/ATM_Params.h"
diff --git a/ace/Acceptor.h b/ace/Acceptor.h
index 668094dc635..fd9003eaab4 100644
--- a/ace/Acceptor.h
+++ b/ace/Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/Service_Config.h"
 
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index 341276d1934..3ad3ac04b0d 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_ACTIVATION_QUEUE_H
-#include "ace/pre.h"
 #define ACE_ACTIVATION_QUEUE_H
+#include "ace/pre.h"
 
 #include "ace/Synch_T.h"
 
diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index 93af5063a9b..7395cf68f9d 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ACTIVE_MAP_MANAGER_H
-#include "ace/pre.h"
 #define ACE_ACTIVE_MAP_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h
index 143c1012761..860f1168f3a 100644
--- a/ace/Active_Map_Manager_T.h
+++ b/ace/Active_Map_Manager_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ACTIVE_MAP_MANAGER_T_H
-#include "ace/pre.h"
 #define ACE_ACTIVE_MAP_MANAGER_T_H
+#include "ace/pre.h"
 
 #include "ace/Map_Manager.h"
 #include "ace/Active_Map_Manager.h"
diff --git a/ace/Addr.h b/ace/Addr.h
index a77e90d90f6..2420d3d891d 100644
--- a/ace/Addr.h
+++ b/ace/Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_ADDR_H
-#include "ace/pre.h"
 #define ACE_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index 266cf5e03fd..4fb697372e2 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -15,8 +15,8 @@
 // ========================================================================
 
 #ifndef ACE_ARG_SHIFTER_H
-#include "ace/pre.h"
 #define ACE_ARG_SHIFTER_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Array.h b/ace/Array.h
index 2512c4e48bd..03766a18c37 100644
--- a/ace/Array.h
+++ b/ace/Array.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_ARRAY_H
-#include "ace/pre.h"
 #define ACE_ARRAY_H
+#include "ace/pre.h"
 
 #include "ace/Containers.h"
 
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index f66c016b69d..001952cbdf2 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 #ifndef ACE_ASYNCH_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_ASYNCH_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 129853068a4..485f54c204f 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -31,8 +31,8 @@
 // ============================================================================
 
 #ifndef ACE_ASYNCH_IO_H
-#include "ace/pre.h"
 #define ACE_ASYNCH_IO_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index 17ebd4ccb34..db2a6bc475d 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -26,8 +26,8 @@
 // ============================================================================
 
 #ifndef ACE_ASYNCH_IO_IMPL_H
-#include "ace/pre.h"
 #define ACE_ASYNCH_IO_IMPL_H
+#include "ace/pre.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/ace/Auto_IncDec_T.h b/ace/Auto_IncDec_T.h
index 4f5eb9a77db..39a8818ae81 100644
--- a/ace/Auto_IncDec_T.h
+++ b/ace/Auto_IncDec_T.h
@@ -15,8 +15,8 @@
 //============================================================================
 
 #ifndef ACE_AUTO_INCDEC_T_H
-#include "ace/pre.h"
 #define ACE_AUTO_INCDEC_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 17da0e8fa6a..263e37d903f 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_AUTO_PTR_H
-#include "ace/pre.h"
 #define ACE_AUTO_PTR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
index 3a72fbcc77f..7873daaacd7 100644
--- a/ace/Based_Pointer_Repository.h
+++ b/ace/Based_Pointer_Repository.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_BASED_POINTER_REPOSITORY_H
-#include "ace/pre.h"
 #define ACE_BASED_POINTER_REPOSITORY_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"                  // Need ACE_Export
 
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
index 943be79caea..3ae2f0cc833 100644
--- a/ace/Based_Pointer_T.h
+++ b/ace/Based_Pointer_T.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_BASED_POINTER_T_H
-#include "ace/pre.h"
 #define ACE_BASED_POINTER_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"              // Need ACE_Export
 
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 8b4da1e0d09..13439e7410c 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -34,8 +34,8 @@
 // ============================================================================
 
 #ifndef ACE_CDR_H
-#include "ace/pre.h"
 #define ACE_CDR_H
+#include "ace/pre.h"
 
 #include "ace/Message_Block.h"
 #include "ace/SString.h"
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h
index c213e1cea61..5efe99f729e 100644
--- a/ace/CORBA_Handler.h
+++ b/ace/CORBA_Handler.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_CORBA_HANDLER_H
-#include "ace/pre.h"
 #define ACE_CORBA_HANDLER_H
+#include "ace/pre.h"
 
 #include "ace/Service_Config.h"
 
diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
index 6666aa72232..0c6b9e89307 100644
--- a/ace/CORBA_Ref.h
+++ b/ace/CORBA_Ref.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_CORBA_REF_H
-#include "ace/pre.h"
 #define ACE_CORBA_REF_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index ddf99692569..c06df17bd53 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -24,8 +24,8 @@
 // Macros for handling CORBA exceptions.
 
 #ifndef ACE_CORBA_MACROS_H
-#include "ace/pre.h"
 #define ACE_CORBA_MACROS_H
+#include "ace/pre.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 92f6d79c0a6..30d957b91ac 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef CACHE_MAP_MANAGER_T_H
-#include "ace/pre.h"
 #define CACHE_MAP_MANAGER_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index 08ecc715885..d8e7629b959 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef CACHED_CONNECT_STRATEGY_T_H
-#include "ace/pre.h"
 #define CACHED_CONNECT_STRATEGY_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index d4c1e3d0444..8fd8c86aa06 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef CACHING_STRATEGIES_H
-#include "ace/pre.h"
 #define CACHING_STRATEGIES_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h
index f8e26ad736f..0d50b88fd22 100644
--- a/ace/Caching_Utility_T.h
+++ b/ace/Caching_Utility_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef CACHING_UTILITY_H
-#include "ace/pre.h"
 #define CACHING_UTILITY_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Capabilities.h b/ace/Capabilities.h
index f1ce931f7ff..f10595deca5 100644
--- a/ace/Capabilities.h
+++ b/ace/Capabilities.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_CAPABILITIES_H
-#include "ace/pre.h"
 #define ACE_CAPABILITIES_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 #include "ace/Synch.h"
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index 4e4349b304c..e7353fd7e6f 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef CLEANUP_STRATEGIES_H
-#include "ace/pre.h"
 #define CLEANUP_STRATEGIES_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Codeset_IBM1047.h b/ace/Codeset_IBM1047.h
index b2c1b1be143..7c9c923394b 100644
--- a/ace/Codeset_IBM1047.h
+++ b/ace/Codeset_IBM1047.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_CODESET_IMB1047_H
-#include "ace/pre.h"
 #define ACE_CODESET_IMB1047_H
+#include "ace/pre.h"
 
 #include "ace/inc_user_config.h"
 
diff --git a/ace/Configuration.h b/ace/Configuration.h
index 44f2f31ad15..7abb890f9da 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -31,8 +31,8 @@
 // ============================================================================
 
 #ifndef ACE_CONFIGURATION_H
-#include "ace/pre.h"
 #define ACE_CONFIGURATION_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 #include "ace/SString.h"
diff --git a/ace/Connector.h b/ace/Connector.h
index b5788037d35..9dadf19d350 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/Service_Config.h"
 
diff --git a/ace/Containers.h b/ace/Containers.h
index e9893f56182..46512fe9836 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_CONTAINERS_H
-#include "ace/pre.h"
 #define ACE_CONTAINERS_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 #include "ace/Malloc_Base.h"
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 3490955e171..97606d4b42b 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_CONTAINERS_T_H
-#include "ace/pre.h"
 #define ACE_CONTAINERS_T_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/DEV.h b/ace/DEV.h
index 182be995890..7dea7fed39f 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DEV_H
-#include "ace/pre.h"
 #define ACE_DEV_H
+#include "ace/pre.h"
 
 #include "ace/IO_SAP.h"
 
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index a5a485b9653..9a770925410 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DEV_ADDR_H
-#include "ace/pre.h"
 #define ACE_DEV_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/Addr.h"
 
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index d30af366cc3..cde72dc39ac 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DEV_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_DEV_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/DEV_IO.h"
 
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 666f494df45..85410750b01 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DEV_IO_H
-#include "ace/pre.h"
 #define ACE_DEV_IO_H
+#include "ace/pre.h"
 
 #include "ace/DEV.h"
 
diff --git a/ace/DLL.h b/ace/DLL.h
index f8b9fc2551d..ad615786df7 100644
--- a/ace/DLL.h
+++ b/ace/DLL.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DLL_H
-#include "ace/pre.h"
 #define ACE_DLL_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index 5a48ac0df7e..bd16b791da6 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DATE_TIME_H
-#include "ace/pre.h"
 #define ACE_DATE_TIME_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Dirent.h b/ace/Dirent.h
index bc2ffb43f69..bcb197243bb 100644
--- a/ace/Dirent.h
+++ b/ace/Dirent.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef ACE_DIRENT_H
-#include "ace/pre.h"
 #define ACE_DIRENT_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Dump.h b/ace/Dump.h
index 689811ade6b..5c1ea0f357d 100644
--- a/ace/Dump.h
+++ b/ace/Dump.h
@@ -49,8 +49,8 @@
 // ============================================================================
 
 #ifndef ACE_DUMP_H
-#include "ace/pre.h"
 #define ACE_DUMP_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Dump_T.h b/ace/Dump_T.h
index c3ad0fe43e3..88b2765f721 100644
--- a/ace/Dump_T.h
+++ b/ace/Dump_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DUMP_T_H
-#include "ace/pre.h"
 #define ACE_DUMP_T_H
+#include "ace/pre.h"
 
 #include "ace/Dump.h"
 
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index a742394697f..3d16a9a8ca7 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DYNAMIC_H
-#include "ace/pre.h"
 #define ACE_DYNAMIC_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index 4de8153b3f4..0cb9a3e8ca7 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_DYNAMIC_SERVICE_H
-#include "ace/pre.h"
 #define ACE_DYNAMIC_SERVICE_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index 53cc1808e5d..7c2f6d59a11 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_ENV_VALUE_T_H
-#include "ace/pre.h"
 #define ACE_ENV_VALUE_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"             // Need to get ACE_static_cast definition
 
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 4d7e5b4aedd..0f2f719960c 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_HANDLER_H
-#include "ace/pre.h"
 #define ACE_EVENT_HANDLER_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index d9840287d9c..0ba36bf27ac 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_HANDLER_T_H
-#include "ace/pre.h"
 #define ACE_EVENT_HANDLER_T_H
+#include "ace/pre.h"
 
 #include "ace/Event_Handler.h"
 
diff --git a/ace/FIFO.h b/ace/FIFO.h
index 3f0415fe61c..fa4941a87f7 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_H
-#include "ace/pre.h"
 #define ACE_FIFO_H
+#include "ace/pre.h"
 
 #include "ace/IPC_SAP.h"
 
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index 1ac761d62e1..d0ea5b1b4a9 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_RECV_H
-#include "ace/pre.h"
 #define ACE_FIFO_RECV_H
+#include "ace/pre.h"
 
 #include "ace/FIFO.h"
 
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index 1fa77f1a398..cbffd271450 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_RECV_MSG_H
-#include "ace/pre.h"
 #define ACE_FIFO_RECV_MSG_H
+#include "ace/pre.h"
 
 #include "ace/FIFO_Recv.h"
 
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 891a65f6cbd..fe33b7129db 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_SEND_H
-#include "ace/pre.h"
 #define ACE_FIFO_SEND_H
+#include "ace/pre.h"
 
 #include "ace/FIFO.h"
 
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index 4136e914b36..18e297e4f2e 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_SEND_MSG_H
-#include "ace/pre.h"
 #define ACE_FIFO_SEND_MSG_H
+#include "ace/pre.h"
 
 #include "ace/FIFO_Send.h"
 
diff --git a/ace/FILE.h b/ace/FILE.h
index 07e4a2beaa2..92f60ab7abb 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FILE_H
-#include "ace/pre.h"
 #define ACE_FILE_H
+#include "ace/pre.h"
 
 #include "ace/IO_SAP.h"
 
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index 144554a9b96..c101c677592 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FILE_ADDR_H
-#include "ace/pre.h"
 #define ACE_FILE_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/Addr.h"
 
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index 78a44c2fdd7..8a52471d059 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FILE_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_FILE_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/FILE_IO.h"
 
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 98b4a54e096..a1458ad3aa0 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FILE_IO_H
-#include "ace/pre.h"
 #define ACE_FILE_IO_H
+#include "ace/pre.h"
 
 #include "ace/FILE.h"
 
diff --git a/ace/Filecache.h b/ace/Filecache.h
index 364bd72d92b..7c2bafb94d5 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_FILECACHE_H
-#include "ace/pre.h"
 #define ACE_FILECACHE_H
+#include "ace/pre.h"
 
 #include "ace/Mem_Map.h"
 
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index f14d1e1f944..f13a731c978 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -21,8 +21,8 @@
 // ============================================================================
 
 #ifndef ACE_FLREACTOR_H
-#include "ace/pre.h"
 #define ACE_FLREACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Select_Reactor.h"
 
diff --git a/ace/Free_List.h b/ace/Free_List.h
index d6c51161112..41650439d1c 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_FREE_LIST_H
-#include "ace/pre.h"
 #define ACE_FREE_LIST_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Functor.h b/ace/Functor.h
index 7647f2dcf7d..15ac688d797 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -36,8 +36,8 @@
 // ============================================================================
 
 #ifndef ACE_FUNCTOR_H
-#include "ace/pre.h"
 #define ACE_FUNCTOR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index 564e07e007a..d3a59fa7749 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -34,8 +34,8 @@
 // ============================================================================
 
 #ifndef ACE_FUNCTOR_T_H
-#include "ace/pre.h"
 #define ACE_FUNCTOR_T_H
+#include "ace/pre.h"
 
 #include "ace/Functor.h"
 
diff --git a/ace/Future.h b/ace/Future.h
index e9e8ee656e4..fcb62306ff6 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef ACE_FUTURE_H
-#include "ace/pre.h"
 #define ACE_FUTURE_H
+#include "ace/pre.h"
 
 #include /**/ "ace/Containers.h"
 #include /**/ "ace/Synch.h"
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index e42634dc88d..a96dfd7b2dd 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_FUTURE_SET_H
-#include "ace/pre.h"
 #define ACE_FUTURE_SET_H
+#include "ace/pre.h"
 
 #include /**/ "ace/Thread.h"
 #include /**/ "ace/Message_Queue.h"
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index b70e8f997c3..70005adec98 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_GET_OPT_H
-#include "ace/pre.h"
 #define ACE_GET_OPT_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h
index 44d92e6adb5..6cf11614e76 100644
--- a/ace/Handle_Gobbler.h
+++ b/ace/Handle_Gobbler.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_HANDLE_GOBBLER_H
-#include "ace/pre.h"
 #define ACE_HANDLE_GOBBLER_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 7a5930b0c21..aacb7609b05 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_HANDLE_SET_H
-#include "ace/pre.h"
 #define ACE_HANDLE_SET_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index 6192e3df89b..ca3ba4239d6 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef HASH_CACHE_MAP_MANAGER_T_H
-#include "ace/pre.h"
 #define HASH_CACHE_MAP_MANAGER_T_H
+#include "ace/pre.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Cache_Map_Manager_T.h"
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index 78564cebfcd..c68381f1b18 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_HASH_MAP_MANAGER_H
-#include "ace/pre.h"
 #define ACE_HASH_MAP_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 #include "ace/Functor.h"
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index 13c061a8fcf..0d72060380a 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_HASH_MAP_MANAGER_T_H
-#include "ace/pre.h"
 #define ACE_HASH_MAP_MANAGER_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 #include "ace/Functor.h"
diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h
index 685b416cb0b..4799edf38ce 100644
--- a/ace/Hash_Map_With_Allocator_T.h
+++ b/ace/Hash_Map_With_Allocator_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_H
-#include "ace/pre.h"
 #define ACE_HASH_MAP_WITH_ALLOCATOR_T_H
+#include "ace/pre.h"
 
 #include "ace/Hash_Map_Manager.h"
 
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index f36341d6b94..3915e894c04 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_HIGH_RES_TIMER_H
-#include "ace/pre.h"
 #define ACE_HIGH_RES_TIMER_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 7355e9a96ca..640e66fcceb 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_INET_ADDR_H
-#include "ace/pre.h"
 #define ACE_INET_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/IOStream.h b/ace/IOStream.h
index e70c60f84ac..61d97b796c4 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_IOSTREAM_H
-#include "ace/pre.h"
 #define ACE_IOSTREAM_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index a566d557d0b..2ca1d8ba50a 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -20,8 +20,8 @@
 // ============================================================================
 
 #ifndef ACE_IOSTREAM_T_H
-#include "ace/pre.h"
 #define ACE_IOSTREAM_T_H
+#include "ace/pre.h"
 
 #include "ace/IOStream.h"
 
diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h
index e8fa683a04a..5e00425ea66 100644
--- a/ace/IO_Cntl_Msg.h
+++ b/ace/IO_Cntl_Msg.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_IO_CNTL_MSG_H
-#include "ace/pre.h"
 #define ACE_IO_CNTL_MSG_H
+#include "ace/pre.h"
 
 class ACE_Export ACE_IO_Cntl_Msg
 {
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index d020dd9f6b6..6f41465ebfb 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_IO_SAP_H
-#include "ace/pre.h"
 #define ACE_IO_SAP_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index 1160ea2cdae..910dfe1c7e1 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_IPC_SAP_H
-#include "ace/pre.h"
 #define ACE_IPC_SAP_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h
index 2ac698017a2..eaa16fc4e49 100644
--- a/ace/LOCK_SOCK_Acceptor.h
+++ b/ace/LOCK_SOCK_Acceptor.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCK_SOCK_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_LOCK_SOCK_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Acceptor.h"
 
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index da0b299319e..bdbc3003d47 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_H
-#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_H
+#include "ace/pre.h"
 
 #include "ace/SOCK.h"
 
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index 49495889539..fa50d24f7ca 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Acceptor.h"
 
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index c143fe4fdcc..919d3f26c05 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_CODGRAM_H
-#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_CODGRAM_H
+#include "ace/pre.h"
 
 #include "ace/LSOCK.h"
 
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index d418dcd4525..a7f2f6bceb7 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Connector.h"
 
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index a30a68f4386..723cc924430 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_DGRAM_H
-#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_DGRAM_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Dgram.h"
 
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index 8541fa790b4..1784193d204 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_STREAM_H
-#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Stream.h"
 
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 2566cbe83c3..edf83a69771 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_NAME_SPACE_H
-#include "ace/pre.h"
 #define ACE_LOCAL_NAME_SPACE_H
+#include "ace/pre.h"
 
 #include "ace/SString.h"
 
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index db40986eb92..8ca7aa10392 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_NAME_SPACE_T_H
-#include "ace/pre.h"
 #define ACE_LOCAL_NAME_SPACE_T_H
+#include "ace/pre.h"
 
 #include "ace/Name_Space.h"
 
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 0f0348912f1..2706f075d73 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -45,8 +45,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_MUTEX_H
-#include "ace/pre.h"
 #define ACE_LOCAL_MUTEX_H
+#include "ace/pre.h"
 
 #include "ace/Synch_T.h"
 
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 7a95d3c747f..d6ae05c35a4 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOG_MSG_H
-#include "ace/pre.h"
 #define ACE_LOG_MSG_H
+#include "ace/pre.h"
 
 // This stuff must come first to avoid problems with circular
 // headers...
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index b7a386bfe25..393458aced3 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_LOG_PRIORITY_H
-#include "ace/pre.h"
 #define ACE_LOG_PRIORITY_H
+#include "ace/pre.h"
 
 enum ACE_Log_Priority
 {
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index a5bd01147a1..3b5460c1f9f 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -21,8 +21,8 @@
 #include "ace/Log_Priority.h"
 
 #ifndef ACE_LOG_RECORD_H
-#include "ace/pre.h"
 #define ACE_LOG_RECORD_H
+#include "ace/pre.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h
index efcdb813e3c..230aaf4317d 100644
--- a/ace/MEM_Acceptor.h
+++ b/ace/MEM_Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_MEM_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Acceptor.h"
 
diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h
index c890cc42b31..2f3dbe743ca 100644
--- a/ace/MEM_Addr.h
+++ b/ace/MEM_Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_ADDR_H
-#include "ace/pre.h"
 #define ACE_MEM_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h
index a934e766c9d..10a5f9ade73 100644
--- a/ace/MEM_Connector.h
+++ b/ace/MEM_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_MEM_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Connector.h"
 
diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h
index e17b3ed3167..445cdfc70c7 100644
--- a/ace/MEM_IO.h
+++ b/ace/MEM_IO.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_IO_H
-#include "ace/pre.h"
 #define ACE_MEM_IO_H
+#include "ace/pre.h"
 
 #include "ace/SOCK.h"
 #include "ace/MEM_SAP.h"
diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h
index ff8a67a69cf..99243173af9 100644
--- a/ace/MEM_SAP.h
+++ b/ace/MEM_SAP.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_SAP_H
-#include "ace/pre.h"
 #define ACE_MEM_SAP_H
+#include "ace/pre.h"
 
 #include "ace/Malloc.h"
 
diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h
index e2debe7488d..5aeff9e1190 100644
--- a/ace/MEM_Stream.h
+++ b/ace/MEM_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_STREAM_H
-#include "ace/pre.h"
 #define ACE_MEM_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/MEM_IO.h"
 
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 4d649db9957..9ae32ba4c19 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MALLOC_H
-#include "ace/pre.h"
 #define ACE_MALLOC_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h
index 2dcd1f998b1..4fc87199788 100644
--- a/ace/Malloc_Base.h
+++ b/ace/Malloc_Base.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MALLOC_BASE_H
-#include "ace/pre.h"
 #define ACE_MALLOC_BASE_H
+#include "ace/pre.h"
 
 // The definition of this class is located in Malloc.cpp.
 
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 3a74461ce58..75d62e3494c 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MALLOC_T_H
-#include "ace/pre.h"
 #define ACE_MALLOC_T_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index a69a47418a6..d5b8eb71d8d 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MANAGED_OBJECT_H
-#include "ace/pre.h"
 #define ACE_MANAGED_OBJECT_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Map.h b/ace/Map.h
index 35843d3a282..57547a5454c 100644
--- a/ace/Map.h
+++ b/ace/Map.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MAP_H
-#include "ace/pre.h"
 #define ACE_MAP_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 07882c12d0b..dde1cdde82e 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MAP_MANAGER_H
-#include "ace/pre.h"
 #define ACE_MAP_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Map_T.h b/ace/Map_T.h
index f873b3f2a3c..7d970d198b4 100644
--- a/ace/Map_T.h
+++ b/ace/Map_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MAP_T_H
-#include "ace/pre.h"
 #define ACE_MAP_T_H
+#include "ace/pre.h"
 
 #include "ace/Map.h"
 #include "ace/Pair.h"
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index f0a80990ab2..754bb946f6e 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEM_MAP_H
-#include "ace/pre.h"
 #define ACE_MEM_MAP_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index a7d3a962dfb..3b1e28cb081 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEMORY_POOL_H
-#include "ace/pre.h"
 #define ACE_MEMORY_POOL_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index b75881a4a80..8df4d6fab40 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -21,8 +21,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #ifndef ACE_MESSAGE_BLOCK_H
-#include "ace/pre.h"
 #define ACE_MESSAGE_BLOCK_H
+#include "ace/pre.h"
 
 #include "ace/Malloc.h"
 
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index ab6e9c07876..1aee946e693 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MESSAGE_BLOCK_T_H
-#include "ace/pre.h"
 #define ACE_MESSAGE_BLOCK_T_H
+#include "ace/pre.h"
 
 #include "ace/Message_Block.h"
 
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index 066ad07c761..7d1df9e0ec3 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MESSAGE_QUEUE_H
-#include "ace/pre.h"
 #define ACE_MESSAGE_QUEUE_H
+#include "ace/pre.h"
 
 #include "ace/Message_Block.h"
 
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index d8bea613711..51db6122ba6 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MESSAGE_QUEUE_T_H
-#include "ace/pre.h"
 #define ACE_MESSAGE_QUEUE_T_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Method_Object.h b/ace/Method_Object.h
index bc89e3ad153..5f992bb2d04 100644
--- a/ace/Method_Object.h
+++ b/ace/Method_Object.h
@@ -20,8 +20,8 @@
 // ============================================================================
 
 #ifndef ACE_METHOD_OBJECT_H
-#include "ace/pre.h"
 #define ACE_METHOD_OBJECT_H
+#include "ace/pre.h"
 
 #include "ace/Method_Request.h"
 
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index b1f586f7bb3..69739e39ffe 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_METHOD_REQUEST_H
-#include "ace/pre.h"
 #define ACE_METHOD_REQUEST_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Min_Max.h b/ace/Min_Max.h
index b2f2aed8053..5d3617c9096 100644
--- a/ace/Min_Max.h
+++ b/ace/Min_Max.h
@@ -2,8 +2,8 @@
 // $Id$
 
 #ifndef ACE_MIN_MAX_H
-#include "ace/pre.h"
 #define ACE_MIN_MAX_H
+#include "ace/pre.h"
 
 // ============================================================================
 //
diff --git a/ace/Module.h b/ace/Module.h
index 40b6c8e7ec3..0fc5363ae1a 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MODULE_H
-#include "ace/pre.h"
 #define ACE_MODULE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index 8a07555a224..a51857f2a23 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_MSG_WFMO_REACTOR_H
-#include "ace/pre.h"
 #define ACE_MSG_WFMO_REACTOR_H
+#include "ace/pre.h"
 
 #include "ace/WFMO_Reactor.h"
 
diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h
index f840f0f8ba9..03ccf42285b 100644
--- a/ace/Multiplexor.h
+++ b/ace/Multiplexor.h
@@ -20,8 +20,8 @@
 // ============================================================================
 
 #ifndef ACE_MULTIPLEXOR_H
-#include "ace/pre.h"
 #define ACE_MULTIPLEXOR_H
+#include "ace/pre.h"
 
 #include "ace/Module.h"
 
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index edc24e36265..4fad417691d 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_NT_SERVICE_H
-#include "ace/pre.h"
 #define ACE_NT_SERVICE_H
+#include "ace/pre.h"
 
 #include "ace/inc_user_config.h"
 
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index a3d3b657763..604062a1cce 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_NAME_PROXY_H
-#include "ace/pre.h"
 #define ACE_NAME_PROXY_H
+#include "ace/pre.h"
 
 #include "ace/INET_Addr.h"
 
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index 27560661de4..8e1784083c4 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_NAME_REQUEST_REPLY_H
-#include "ace/pre.h"
 #define ACE_NAME_REQUEST_REPLY_H
+#include "ace/pre.h"
 
 #include "ace/Time_Value.h"
 
diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index 0ca98b39ca1..97e7a7b954c 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_NAME_SPACE_H
-#include "ace/pre.h"
 #define ACE_NAME_SPACE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index 28ba36f56ad..723d28ffc61 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_NAMING_CONTEXT_H
-#include "ace/pre.h"
 #define ACE_NAMING_CONTEXT_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/OS.h b/ace/OS.h
index 3861cff5c72..e4daeab1db8 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_OS_H
-#include "ace/pre.h"
 # define ACE_OS_H
+#include "ace/pre.h"
 
 // This file should be a link to the platform/compiler-specific
 // configuration file (e.g., config-sunos5-sunc++-4.x.h).
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 3b5cf27a92c..8d6f56e2897 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_OBJECT_MANAGER_H
-#include "ace/pre.h"
 #define ACE_OBJECT_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Obstack.h b/ace/Obstack.h
index fc6676e65a8..28e9461c2ea 100644
--- a/ace/Obstack.h
+++ b/ace/Obstack.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_OBSTACK_H
-#include "ace/pre.h"
 #define ACE_OBSTACK_H
+#include "ace/pre.h"
 
 #include "ace/Malloc.h"
 
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index 5229cd2dd68..20dc6dd7915 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -25,8 +25,8 @@
 // ============================================================================
 
 #ifndef ACE_POSIX_ASYNCH_IO_H
-#include "ace/pre.h"
 #define ACE_POSIX_ASYNCH_IO_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 53bd4aadd29..de8dece5e4d 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_POSIX_PROACTOR_H
-#include "ace/pre.h"
 #define ACE_POSIX_PROACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Proactor_Impl.h"
 
diff --git a/ace/Pair.h b/ace/Pair.h
index 6774f65ab47..fdb7ea64d09 100644
--- a/ace/Pair.h
+++ b/ace/Pair.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PAIR_H
-#include "ace/pre.h"
 #define ACE_PAIR_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Pair_T.h b/ace/Pair_T.h
index c5f77b61247..18787e4902b 100644
--- a/ace/Pair_T.h
+++ b/ace/Pair_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PAIR_T_H
-#include "ace/pre.h"
 #define ACE_PAIR_T_H
+#include "ace/pre.h"
 
 #include "ace/Pair.h"
 
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index beca56374c7..8e9c0867eb6 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PARSE_NODE_H
-#include "ace/pre.h"
 #define ACE_PARSE_NODE_H
+#include "ace/pre.h"
 
 #include "ace/Service_Types.h"
 
diff --git a/ace/Pipe.h b/ace/Pipe.h
index a6c2bbe833c..7fe3a772d04 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PIPE_H
-#include "ace/pre.h"
 #define ACE_PIPE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index 3096b4e9303..7da8019ea85 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PRIORITY_REACTOR_H
-#include "ace/pre.h"
 #define ACE_PRIORITY_REACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Containers.h"
 
diff --git a/ace/Proactor.h b/ace/Proactor.h
index a5b8eab1a51..3cd900d9c95 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_PROACTOR_H
-#include "ace/pre.h"
 #define ACE_PROACTOR_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index 8fa4a98d190..bb302387088 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PROACTOR_IMPL_H
-#include "ace/pre.h"
 #define ACE_PROACTOR_IMPL_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Process.h b/ace/Process.h
index 53fc0572388..d5d4325d4e1 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PROCESS_H
-#include "ace/pre.h"
 #define ACE_PROCESS_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index 19063c0ef9c..1458f3d1091 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PROCESS_MANAGER_H
-#include "ace/pre.h"
 #define ACE_PROCESS_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 #include "ace/Reactor.h"
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 707370c5ed9..ddaae18d85e 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_PROFILE_TIMER_H
-#include "ace/pre.h"
 #define ACE_PROFILE_TIMER_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/QoS_Session.h b/ace/QoS_Session.h
index 6996efbe8f3..31d17b7b771 100644
--- a/ace/QoS_Session.h
+++ b/ace/QoS_Session.h
@@ -15,8 +15,8 @@
 // ===========================================================================
 
 #ifndef ACE_QOS_SESSION_H
-#include "ace/pre.h"
 #define ACE_QOS_SESSION_H
+#include "ace/pre.h"
 
 #include "ace/INET_Addr.h"
 
diff --git a/ace/QoS_Session_Factory.h b/ace/QoS_Session_Factory.h
index 3c64a726b4a..f4c18336f58 100644
--- a/ace/QoS_Session_Factory.h
+++ b/ace/QoS_Session_Factory.h
@@ -15,8 +15,8 @@
 // ===========================================================================
 
 #ifndef ACE_QOS_SESSION_FACTORY_H
-#include "ace/pre.h"
 #define ACE_QOS_SESSION_FACTORY_H
+#include "ace/pre.h"
 
 #include "ace/QoS_Session.h"
 
diff --git a/ace/QoS_Session_Impl.h b/ace/QoS_Session_Impl.h
index e64e0f6fbb3..d1429ba4d47 100644
--- a/ace/QoS_Session_Impl.h
+++ b/ace/QoS_Session_Impl.h
@@ -15,8 +15,8 @@
 // ===========================================================================
 
 #ifndef ACE_QOS_SESSION_IMPL_H
-#include "ace/pre.h"
 #define ACE_QOS_SESSION_IMPL_H
+#include "ace/pre.h"
 
 #include "ace/QoS_Session.h"
 
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index 087c55049ea..e2afc998db0 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -14,8 +14,8 @@
 //    integrated in to ACE by Balachandran Natarajan <bala@cs.wustl.edu>
 // ============================================================================
 #ifndef ACE_QTREACTOR_H
-#include "ace/pre.h"
 #define ACE_QTREACTOR_H
+#include "ace/pre.h"
 
 
 #include "ace/Select_Reactor.h"
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 4a0a92c23ac..87b63deb38e 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_RB_TREE_H
-#include "ace/pre.h"
 #define ACE_RB_TREE_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 #include "ace/Functor.h"
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 693b08fa6ec..5eeaa1655e1 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_REACTOR_H
-#include "ace/pre.h"
 #define ACE_REACTOR_H
+#include "ace/pre.h"
 
 class ACE_Reactor_Impl;
 
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 3cba6952ab0..2f84a748d12 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_REACTOR_IMPL_H
-#include "ace/pre.h"
 #define ACE_REACTOR_IMPL_H
+#include "ace/pre.h"
 
 // Timer Queue is a complicated template class. A simple forward
 // declaration will not work
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 4319143d5e0..84688f9bc0c 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_READ_BUFFER_H
-#include "ace/pre.h"
 #define ACE_READ_BUFFER_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Registry.h b/ace/Registry.h
index d2af5161518..b5c072b9678 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_REGISTRY_H
-#include "ace/pre.h"
 #define ACE_REGISTRY_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h
index 9e6be5b43f7..2c1458a7aa8 100644
--- a/ace/Registry_Name_Space.h
+++ b/ace/Registry_Name_Space.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_REGISTRY_NAME_SPACE_H
-#include "ace/pre.h"
 #define ACE_REGISTRY_NAME_SPACE_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index cafb8537f1b..ef8cd125237 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_REMOTE_NAME_SPACE_H
-#include "ace/pre.h"
 #define ACE_REMOTE_NAME_SPACE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index 707fdd76ce7..9ed159ecd0c 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_REMOTE_MUTEX_H
-#include "ace/pre.h"
 #define ACE_REMOTE_MUTEX_H
+#include "ace/pre.h"
 
 #include "ace/INET_Addr.h"
 
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 4edd1c4cb56..84e4d7af2bf 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -15,8 +15,8 @@
 //============================================================================
 
 #ifndef ACE_SOCK_H
-#include "ace/pre.h"
 #define ACE_SOCK_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index 77807506bb7..b4871f328c8 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_SOCK_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Stream.h"
 
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 2d400f1321a..a865b8075ce 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_CODGRAM_H
-#include "ace/pre.h"
 #define ACE_SOCK_CODGRAM_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_IO.h"
 
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 9a673384b3a..ddf7381b84e 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_SOCK_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Stream.h"
 
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index d6748a9a85e..567d5d34142 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -15,8 +15,8 @@
 // ===========================================================================
 
 #ifndef ACE_SOCK_DGRAM_H
-#include "ace/pre.h"
 #define ACE_SOCK_DGRAM_H
+#include "ace/pre.h"
 
 #include "ace/SOCK.h"
 
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index 92fdb93e234..577081cfb09 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_DGRAM_BCAST_H
-#include "ace/pre.h"
 #define ACE_SOCK_DGRAM_BCAST_H
+#include "ace/pre.h"
 
 #include "ace/INET_Addr.h"
 
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 5fccc4a6dfd..b727eaa024f 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_DGRAM_MCAST_H
-#include "ace/pre.h"
 #define ACE_SOCK_DGRAM_MCAST_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Dgram.h"
 
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index 99328a56d3d..0ad3ef62682 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_IO_H
-#include "ace/pre.h"
 #define ACE_SOCK_IO_H
+#include "ace/pre.h"
 
 #include "ace/SOCK.h"
 
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index 7ef3d37cdb1..a020ab6e3fc 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_STREAM_H
-#include "ace/pre.h"
 #define ACE_SOCK_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_IO.h"
 
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index b22f2e78b01..a9fcfe334e5 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_H
-#include "ace/pre.h"
 #define ACE_SPIPE_H
+#include "ace/pre.h"
 
 #include "ace/IPC_SAP.h"
 
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index f0f8ab07e78..2e4d08fa338 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_SPIPE_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/SPIPE_Stream.h"
 
diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h
index 6e8662f90e8..33769a9b494 100644
--- a/ace/SPIPE_Addr.h
+++ b/ace/SPIPE_Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_ADDR_H
-#include "ace/pre.h"
 #define ACE_SPIPE_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/Addr.h"
 
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 1795c3788e7..9bc38a1f7c7 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_SPIPE_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/SPIPE_Stream.h"
 
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index 0028dc324ae..60fd3ac2bb3 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_STREAM_H
-#include "ace/pre.h"
 #define ACE_SPIPE_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/SPIPE.h"
 
diff --git a/ace/SString.h b/ace/SString.h
index f15fc632d71..650c480c02f 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SSTRING_H
-#include "ace/pre.h"
 #define ACE_SSTRING_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/SV_Message.h b/ace/SV_Message.h
index 384c42e7359..64d36b235a6 100644
--- a/ace/SV_Message.h
+++ b/ace/SV_Message.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SV_MESSAGE_H
-#include "ace/pre.h"
 #define ACE_SV_MESSAGE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index e1287096bc9..a06139e6aa1 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SV_MESSAGE_QUEUE_H
-#include "ace/pre.h"
 #define ACE_SV_MESSAGE_QUEUE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index 0ed51c05258..6d3cbd81dc6 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SV_SEMAPHORE_COMPLEX_H
-#include "ace/pre.h"
 #define ACE_SV_SEMAPHORE_COMPLEX_H
+#include "ace/pre.h"
 
 #include "ace/SV_Semaphore_Simple.h"
 
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 7618a9444fc..9350fb8cd7b 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SV_SEMAPHORE_SIMPLE_H
-#include "ace/pre.h"
 #define ACE_SV_SEMAPHORE_SIMPLE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index 6cc1df87039..73b33d75c0b 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_SV_SHARED_MEMORY_H
-#include "ace/pre.h"
 #define ACE_SV_SHARED_MEMORY_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h
index 5b7ad55b88f..c8f2a3a5f84 100644
--- a/ace/Sched_Params.h
+++ b/ace/Sched_Params.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef ACE_SCHED_PARAMS_H
-#include "ace/pre.h"
 #define ACE_SCHED_PARAMS_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 445ed3fc181..65c59c765bd 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SELECT_REACTOR_H
-#include "ace/pre.h"
 #define ACE_SELECT_REACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Select_Reactor_T.h"
 
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index 5fd5d204280..10da5893a13 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SELECT_REACTOR_BASE_H
-#include "ace/pre.h"
 #define ACE_SELECT_REACTOR_BASE_H
+#include "ace/pre.h"
 
 #include "ace/Signal.h"
 
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 33d4825cbba..120516c0aa0 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SELECT_REACTOR_T_H
-#include "ace/pre.h"
 #define ACE_SELECT_REACTOR_T_H
+#include "ace/pre.h"
 
 #include "ace/Select_Reactor_Base.h"
 
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 7b15888efcc..299c07eb4de 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_SERVICE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/Service_Object.h"
 
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index f19bb1e342d..ac03ec0237c 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_MANAGER_H
-#include "ace/pre.h"
 #define ACE_SERVICE_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_Stream.h"
 
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index d92c5496bdf..21ea527b311 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_OBJECT_H
-#include "ace/pre.h"
 #define ACE_SERVICE_OBJECT_H
+#include "ace/pre.h"
 
 #include "ace/Shared_Object.h"
 
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index 4cc58a038fc..04e46defc01 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_REPOSITORY_H
-#include "ace/pre.h"
 #define ACE_SERVICE_REPOSITORY_H
+#include "ace/pre.h"
 
 #include "ace/Service_Types.h"
 
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index 1335dd9892e..9c20d0c9f32 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_TYPE_H
-#include "ace/pre.h"
 #define ACE_SERVICE_TYPE_H
+#include "ace/pre.h"
 
 #include "ace/Service_Object.h"
 
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index b7d81a89f11..2faf3a94d1f 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_MEMORY_H
-#include "ace/pre.h"
 #define ACE_SHARED_MEMORY_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index 7367b87aea3..e1049681b2e 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_MALLOC_MM_H
-#include "ace/pre.h"
 #define ACE_SHARED_MALLOC_MM_H
+#include "ace/pre.h"
 
 #include "ace/Shared_Memory.h"
 
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index 1c74b241bae..bf7fd7d36cb 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_MALLOC_SV_H
-#include "ace/pre.h"
 #define ACE_SHARED_MALLOC_SV_H
+#include "ace/pre.h"
 
 #include "ace/Shared_Memory.h"
 
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index 5e88e65bb13..87c01462db3 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_OBJECT_H
-#include "ace/pre.h"
 #define ACE_SHARED_OBJECT_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Signal.h b/ace/Signal.h
index d4b9aaea018..e1489c380b1 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SIGNAL_HANDLER_H
-#include "ace/pre.h"
 #define ACE_SIGNAL_HANDLER_H
+#include "ace/pre.h"
 
 #if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H)
 # error ace/Signal.h was #included instead of signal.h by ace/OS.h:  fix!!!!
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 88b3a9aad93..bbef2cd335e 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef ACE_SINGLETON_H
-#include "ace/pre.h"
 #define ACE_SINGLETON_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Stats.h b/ace/Stats.h
index 1732e4dcc0f..099b62be7c9 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_STATS_H
-#include "ace/pre.h"
 #define ACE_STATS_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Strategies.h b/ace/Strategies.h
index 8edec9bfa25..856fc3a3458 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_STRATEGIES_H
-#include "ace/pre.h"
 #define ACE_STRATEGIES_H
+#include "ace/pre.h"
 
 #include "ace/Event_Handler.h"
 
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index f8f064c8410..2f3e2669fbf 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_STRATEGIES_T_H
-#include "ace/pre.h"
 #define ACE_STRATEGIES_T_H
+#include "ace/pre.h"
 
 #include "ace/Strategies.h"
 
diff --git a/ace/Stream.h b/ace/Stream.h
index 8ffc95e4ef6..498b220d11b 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_STREAM_H
-#include "ace/pre.h"
 #define ACE_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index 5bde8ae0329..2617b6ecddd 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -22,8 +22,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #ifndef ACE_STREAM_MODULES
-#include "ace/pre.h"
 #define ACE_STREAM_MODULES
+#include "ace/pre.h"
 
 template <ACE_SYNCH_DECL>
 class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE>
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 9fc125de749..ada552ffd28 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SVC_CONF_H
-#include "ace/pre.h"
 #define ACE_SVC_CONF_H
+#include "ace/pre.h"
 
 // Globally visible macros, type decls, and extern var decls for
 // Service Configurator utility.
diff --git a/ace/Svc_Conf_Tokens.h b/ace/Svc_Conf_Tokens.h
index 259109ee07e..98a63ac0e53 100644
--- a/ace/Svc_Conf_Tokens.h
+++ b/ace/Svc_Conf_Tokens.h
@@ -1,8 +1,8 @@
 // $Id$
 
 #ifndef SVC_CONF_TOKENS_H
-#include "ace/pre.h"
 #define SVC_CONF_TOKENS_H
+#include "ace/pre.h"
 
 #define ACE_DYNAMIC 257
 #define ACE_STATIC 258
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index d5e8fbfb95c..4907e066f03 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SVC_HANDLER_H
-#include "ace/pre.h"
 #define ACE_SVC_HANDLER_H
+#include "ace/pre.h"
 
 // Forward decls.
 class ACE_Connection_Recycling_Strategy;
diff --git a/ace/Synch.h b/ace/Synch.h
index 5208412ed8d..6bb3ca2267c 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef ACE_SYNCH_H
-#include "ace/pre.h"
 #define ACE_SYNCH_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h
index bf7a529fd67..5ce8d3f9b96 100644
--- a/ace/Synch_Options.h
+++ b/ace/Synch_Options.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SYNCH_OPTIONS_H
-#include "ace/pre.h"
 #define ACE_SYNCH_OPTIONS_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 8bafe6f1d3c..e9e27d2c85b 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_SYNCH_T_H
-#include "ace/pre.h"
 #define ACE_SYNCH_T_H
+#include "ace/pre.h"
 
 #include "ace/Event_Handler.h"
 
diff --git a/ace/System_Time.h b/ace/System_Time.h
index 8ec32980f27..488aea7eaeb 100644
--- a/ace/System_Time.h
+++ b/ace/System_Time.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_SYSTEM_TIME_H
-#include "ace/pre.h"
 #define ACE_SYSTEM_TIME_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/TLI.h b/ace/TLI.h
index 132dd8a47e7..852804bd594 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TLI_H
-#include "ace/pre.h"
 #define ACE_TLI_H
+#include "ace/pre.h"
 
 #include "ace/IPC_SAP.h"
 
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 08d05e805ea..60992af2ec8 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TLI_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_TLI_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/TLI.h"
 
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 2ebc8ed3c8e..b514bf54614 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TLI_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_TLI_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/TLI_Stream.h"
 
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index 2d48dd71d77..7c0bb7c2022 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TLI_STREAM_H
-#include "ace/pre.h"
 #define ACE_TLI_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/TLI.h"
 
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index e5b0dcce11b..81bfdd69382 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -30,8 +30,8 @@
 // ============================================================================
 
 #ifndef ACE_TP_REACTOR_H
-#include "ace/pre.h"
 #define ACE_TP_REACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Select_Reactor.h"
 
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index b66cd26e644..4c0e768a78d 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_TTY_IO_H
-#include "ace/pre.h"
 #define ACE_TTY_IO_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Task.h b/ace/Task.h
index 9e0fd7470ea..f5e6cbbf162 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TASK_H
-#include "ace/pre.h"
 #define ACE_TASK_H
+#include "ace/pre.h"
 
 #include "ace/Service_Object.h"
 
diff --git a/ace/Task_T.h b/ace/Task_T.h
index ffbdb7fe49b..5620af26d96 100644
--- a/ace/Task_T.h
+++ b/ace/Task_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TASK_T_H
-#include "ace/pre.h"
 #define ACE_TASK_T_H
+#include "ace/pre.h"
 
 #include "ace/Message_Queue.h"
 
diff --git a/ace/Thread.h b/ace/Thread.h
index ab99ea293af..8948ebda2c1 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_THREAD_H
-#include "ace/pre.h"
 #define ACE_THREAD_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 5db1095a063..ba4c443f742 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_THREAD_MANAGER_H
-#include "ace/pre.h"
 #define ACE_THREAD_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/Thread.h"
 
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index 81973bf9430..ed7022e0dc8 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -20,8 +20,8 @@
 // ============================================================================
 
 #ifndef ACE_TIME_REQUEST_REPLY_H
-#include "ace/pre.h"
 #define ACE_TIME_REQUEST_REPLY_H
+#include "ace/pre.h"
 
 #include "ace/Time_Value.h"
 
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 4f1913ed47d..4ac2bed868d 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIME_VALUE_H
-#include "ace/pre.h"
 #define ACE_TIME_VALUE_H
+#include "ace/pre.h"
 
 // This file is no longer used and is only here due to backwards
 // compatibility.  All the functionality has been merged into OS.h.
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index 9c916e7c34d..5070a863a14 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -42,8 +42,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMEPROBE_H
-#include "ace/pre.h"
 #define ACE_TIMEPROBE_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index 9a6cbd41376..3850020415a 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -2,8 +2,8 @@
 // $Id$
 
 #ifndef ACE_TIMEPROBE_T_H
-#include "ace/pre.h"
 #define ACE_TIMEPROBE_T_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h
index c511414e39d..c86d3bd1730 100644
--- a/ace/Timer_Hash.h
+++ b/ace/Timer_Hash.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HASH_H
-#include "ace/pre.h"
 #define ACE_TIMER_HASH_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Hash_T.h"
 
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 763d4312d56..a35ff3cc2da 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HASH_T_H
-#include "ace/pre.h"
 #define ACE_TIMER_HASH_T_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Queue_T.h"
 
diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index 0ad4ceb403c..dcaabc00051 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HEAP_H
-#include "ace/pre.h"
 #define ACE_TIMER_HEAP_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Heap_T.h"
 
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index b21f71dcb5c..54b74e660ba 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HEAP_T_H
-#include "ace/pre.h"
 #define ACE_TIMER_HEAP_T_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Queue_T.h"
 
diff --git a/ace/Timer_List.h b/ace/Timer_List.h
index 7cee4ab95ca..3f9c6b462b3 100644
--- a/ace/Timer_List.h
+++ b/ace/Timer_List.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_LIST_H
-#include "ace/pre.h"
 #define ACE_TIMER_LIST_H
+#include "ace/pre.h"
 
 #include "ace/Timer_List_T.h"
 
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index 5b1dfe79a72..d8e1970f8c2 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_LIST_T_H
-#include "ace/pre.h"
 #define ACE_TIMER_LIST_T_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Queue_T.h"
 
diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h
index 177c9f79c4b..e754cd60f96 100644
--- a/ace/Timer_Queue.h
+++ b/ace/Timer_Queue.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_QUEUE_H
-#include "ace/pre.h"
 #define ACE_TIMER_QUEUE_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index 4e3906b05a4..fa624572013 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_QUEUE_T_H
-#include "ace/pre.h"
 #define ACE_TIMER_QUEUE_T_H
+#include "ace/pre.h"
 
 #include "ace/Free_List.h"
 
diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h
index be18550a8ce..0aeae495b40 100644
--- a/ace/Timer_Wheel.h
+++ b/ace/Timer_Wheel.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_WHEEL_H
-#include "ace/pre.h"
 #define ACE_TIMER_WHEEL_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Wheel_T.h"
 
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index d2a68e0cee3..5736c28effa 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_WHEEL_T_H
-#include "ace/pre.h"
 #define ACE_TIMER_WHEEL_T_H
+#include "ace/pre.h"
 
 #include "ace/Timer_Queue_T.h"
 
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index 82e88b4172c..2c0cca41f52 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 #ifndef ACE_TKREACTOR_H
-#include "ace/pre.h"
 #define ACE_TKREACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Select_Reactor.h"
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Token.h b/ace/Token.h
index 32d7d9838d2..7f7c3aa97aa 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_H
-#include "ace/pre.h"
 #define ACE_TOKEN_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 22c638ff6f5..4e97bf152f6 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -25,8 +25,8 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_COLLECTION_H
-#include "ace/pre.h"
 #define ACE_TOKEN_COLLECTION_H
+#include "ace/pre.h"
 
 #include "ace/Map_Manager.h"
 
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index 5b3dad386b9..c3aea5fb3f6 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -20,8 +20,8 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_INVARIANTS_H
-#include "ace/pre.h"
 #define ACE_TOKEN_INVARIANTS_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index 49393c01ce3..bd829dd4476 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_MANAGER_H
-#include "ace/pre.h"
 #define ACE_TOKEN_MANAGER_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index 5ab739dfe6c..a5904b45416 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -20,8 +20,8 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_REQUEST_REPLY_H
-#include "ace/pre.h"
 #define ACE_TOKEN_REQUEST_REPLY_H
+#include "ace/pre.h"
 
 #include "ace/Local_Tokens.h"
 
diff --git a/ace/Trace.h b/ace/Trace.h
index a836a42d7b4..b002ccf4f00 100644
--- a/ace/Trace.h
+++ b/ace/Trace.h
@@ -16,8 +16,8 @@
 
 
 #ifndef ACE_TRACE_H
-#include "ace/pre.h"
 #define ACE_TRACE_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h
index f5b86ed3a61..01e72802ee2 100644
--- a/ace/Typed_SV_Message.h
+++ b/ace/Typed_SV_Message.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TYPED_SV_MESSAGE_H
-#include "ace/pre.h"
 #define ACE_TYPED_SV_MESSAGE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"
 
diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h
index b00df1ea3ce..09752d33d65 100644
--- a/ace/Typed_SV_Message_Queue.h
+++ b/ace/Typed_SV_Message_Queue.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_TYPED_MESSAGE_QUEUE_H
-#include "ace/pre.h"
 #define ACE_TYPED_MESSAGE_QUEUE_H
+#include "ace/pre.h"
 
 #include "ace/SV_Message_Queue.h"
 
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index 26137ef7316..af00161b766 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_UNIX_ADDR_H
-#include "ace/pre.h"
 #define ACE_UNIX_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/Addr.h"
 
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index f82222524e0..fcad01e71d3 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_ACCEPTOR_H
-#include "ace/pre.h"
 #define ACE_UPIPE_ACCEPTOR_H
+#include "ace/pre.h"
 
 #include "ace/UPIPE_Stream.h"
 
diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h
index 8b8de4b9d81..d0b37436555 100644
--- a/ace/UPIPE_Addr.h
+++ b/ace/UPIPE_Addr.h
@@ -16,8 +16,8 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_ADDR_H
-#include "ace/pre.h"
 #define ACE_UPIPE_ADDR_H
+#include "ace/pre.h"
 
 #include "ace/SPIPE_Addr.h"
 
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index 763b8870fb8..b4132f5d6d8 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_CONNECTOR_H
-#include "ace/pre.h"
 #define ACE_UPIPE_CONNECTOR_H
+#include "ace/pre.h"
 
 #include "ace/UPIPE_Stream.h"
 
diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h
index 341b3b476ff..ce7ba6e0e00 100644
--- a/ace/UPIPE_Stream.h
+++ b/ace/UPIPE_Stream.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_STREAM_H
-#include "ace/pre.h"
 #define ACE_UPIPE_STREAM_H
+#include "ace/pre.h"
 
 #include "ace/Stream.h"
 
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 88d6f0ae9b8..f177196ed9b 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_WFMO_REACTOR_H
-#include "ace/pre.h"
 #define ACE_WFMO_REACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Signal.h"
 
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index 659cfb5eb82..f3f6d60838f 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -28,8 +28,8 @@
 // ============================================================================
 
 #ifndef ACE_WIN32_ASYNCH_IO_H
-#include "ace/pre.h"
 #define ACE_WIN32_ASYNCH_IO_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
index 31aaee9308e..8fa3a67f25e 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_WIN32_PROACTOR_H
-#include "ace/pre.h"
 #define ACE_WIN32_PROACTOR_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 #include "ace/WIN32_Asynch_IO.h"
diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h
index 4c6d3502c57..d7589668055 100644
--- a/ace/XTI_ATM_Mcast.h
+++ b/ace/XTI_ATM_Mcast.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_XTI_ATM_MCAST_H
-#include "ace/pre.h"
 #define ACE_XTI_ATM_MCAST_H
+#include "ace/pre.h"
 
 #include "ace/TLI_Connector.h"
 #include "ace/ATM_Addr.h"
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index cd8eda4e440..6dc3f57ae25 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #ifndef ACE_XTREACTOR_H
-#include "ace/pre.h"
 #define ACE_XTREACTOR_H
+#include "ace/pre.h"
 
 #include "ace/Select_Reactor.h"
 
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 68308c40c1c..a39d508a614 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -1,8 +1,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_WINCE_H
-#include "ace/pre.h"
 #define ACE_CONFIG_WINCE_H
+#include "ace/pre.h"
 
 #if !defined (ACE_HAS_WINCE)
 #define ACE_HAS_WINCE 1
diff --git a/ace/config-aix-3.2.5.h b/ace/config-aix-3.2.5.h
index 7e90c04b453..f6fd6be24db 100644
--- a/ace/config-aix-3.2.5.h
+++ b/ace/config-aix-3.2.5.h
@@ -5,8 +5,8 @@
 // with xlC.  Thanks to Bob Olson <olson@mcs.anl.gov> for this.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 /*#define ACE_HAS_PTHREADS*/
 
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index e7489e8fb76..7609098a90a 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -6,8 +6,8 @@
 // g++/egcs.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if defined (__xlC__) || (__IBMCPP__)
    // AIX xlC, IBM C/C++, and Visual Age C++ compilers
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 2f6e4978ed2..4e69705bb73 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -8,8 +8,8 @@
 // It uses the Chorus POSIX threads interface.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define CHORUS 3.1b
 #if defined (linux)
diff --git a/ace/config-cray.h b/ace/config-cray.h
index 1ffc9f33352..20d66fa333b 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -2,8 +2,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_CRAY_H
-#include "ace/pre.h"
 #define ACE_CONFIG_CRAY_H
+#include "ace/pre.h"
 
 /*
     The following predefined macros are used within ACE ifdefs.
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
index 3a06ed7f261..ed17af5c8a4 100644
--- a/ace/config-cxx-common.h
+++ b/ace/config-cxx-common.h
@@ -1,8 +1,8 @@
 // $Id$
 
 #ifndef ACE_CXX_COMMON_H
-#include "ace/pre.h"
 #define ACE_CXX_COMMON_H
+#include "ace/pre.h"
 
 #if !defined (ACE_CONFIG_INCLUDE_CXX_COMMON)
 # error ace/config-cxx-common.h: ACE configuration error!  Do not #include this file directly!
diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h
index 5e3d2d41fc2..f288b544339 100644
--- a/ace/config-cygwin32-common.h
+++ b/ace/config-cygwin32-common.h
@@ -8,8 +8,8 @@
 // and configures based on those.
 
 #ifndef ACE_CYGWIN32_COMMON_H
-#include "ace/pre.h"
 #define ACE_CYGWIN32_COMMON_H
+#include "ace/pre.h"
 
 #define CYGWIN32
 
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index d036d664cdc..ec433dc1e17 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -5,8 +5,8 @@
 // platforms using GNU C++.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-cygwin32-common.h"
 
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index 4d65ec2b111..b19d56cf7f1 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -5,8 +5,8 @@
 // 4.11 platforms using the EPC compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_DGUX
 
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index c347bf9be27..b53126b59ed 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -5,8 +5,8 @@
 // 4.x platforms using the Green Hills Multi C++ compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_DGUX
 
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index 7e5d2ba6eae..60d17701d15 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -7,8 +7,8 @@
 // Notice that the threaded version of ACE is only supported for -current.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include <osreldate.h>
 // Make sure we source in the OS version.
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index 60c2a5c5e8b..d6bb6cff6ff 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -7,8 +7,8 @@
 // platforms using GNU C++ but without the POSIX (pthread) threads package
 
 #ifndef ACE_CONFIG_FREEBSD_H
-#include "ace/pre.h"
 #define ACE_CONFIG_FREEBSD_H
+#include "ace/pre.h"
 
 #include <osreldate.h>
 // Make sure we source in the OS version.
diff --git a/ace/config-fsu-pthread.h b/ace/config-fsu-pthread.h
index f0507540b13..4ce0c5fa4e3 100644
--- a/ace/config-fsu-pthread.h
+++ b/ace/config-fsu-pthread.h
@@ -1,8 +1,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_FSU_PTHREAD_H
-#include "ace/pre.h"
 #define ACE_CONFIG_FSU_PTHREAD_H
+#include "ace/pre.h"
 
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 5da6df51ece..bb70a3aa8d1 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -6,8 +6,8 @@
 // to all g++ platforms, including egcs.
 
 #ifndef ACE_GNUG_COMMON_H
-#include "ace/pre.h"
 #define ACE_GNUG_COMMON_H
+#include "ace/pre.h"
 
 #if __GNUC__ > 2  ||  ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)  || \
     (defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x540)
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
index cd042e64595..8e0b61f5666 100644
--- a/ace/config-ghs-common.h
+++ b/ace/config-ghs-common.h
@@ -6,8 +6,8 @@
 // to all Green Hills platforms.
 
 #ifndef ACE_GHS_COMMON_H
-#include "ace/pre.h"
 #define ACE_GHS_COMMON_H
+#include "ace/pre.h"
 
 #if !defined (ACE_CONFIG_INCLUDE_GHS_COMMON)
 # error ace/config-ghs-common.h: ACE configuration error!  Do not #include this file directly!
diff --git a/ace/config-hpux-10.x-g++.h b/ace/config-hpux-10.x-g++.h
index 662f2500aeb..239e63e43a0 100644
--- a/ace/config-hpux-10.x-g++.h
+++ b/ace/config-hpux-10.x-g++.h
@@ -5,8 +5,8 @@
 // platforms running HP/UX 10.x using G++.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
 // this must appear before its #include.
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 70297439e13..dfb63912c15 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -7,8 +7,8 @@
 // HP-UX file (config-hpux-10.x.h) for the platform information.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // There are 2 compiler-specific sections, plus a 3rd for common to both.
 // First is the HP C++ section...
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 5608d86d317..6970104f83f 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -17,8 +17,8 @@
 #define HPUX_10
 
 #ifndef _HPUX_SOURCE
-#include "ace/pre.h"
 #define _HPUX_SOURCE
+#include "ace/pre.h"
 #endif
 
 // Some things are different for 10.10 vs. 10.20 vs. 10.30
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 23ac7e5b803..27d33c8135f 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -5,8 +5,8 @@
 // platforms running HP-UX 11.00 using aC++, CC, or gcc (2.95 and up).
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if defined (__GNUG__)
 
diff --git a/ace/config-hpux-9.x-orbix.h b/ace/config-hpux-9.x-orbix.h
index e60d854e607..e81e1ceed89 100644
--- a/ace/config-hpux-9.x-orbix.h
+++ b/ace/config-hpux-9.x-orbix.h
@@ -5,8 +5,8 @@
 // platforms running HP/UX 9.x.  Dave added Orbix stuff
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // Compiling for HPUX.
 #if !defined (HPUX)
diff --git a/ace/config-hpux-9.x.h b/ace/config-hpux-9.x.h
index 873e68682d1..7b919ed5948 100644
--- a/ace/config-hpux-9.x.h
+++ b/ace/config-hpux-9.x.h
@@ -5,8 +5,8 @@
 // for HP platforms running HP/UX 9.x.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // Compiling for HPUX.
 #if !defined (HPUX)
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index 1c2fc55e23d..b449d59a5b1 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -17,8 +17,8 @@
 #define HPUX_11
 
 #ifndef _HPUX_SOURCE
-#include "ace/pre.h"
 #define _HPUX_SOURCE
+#include "ace/pre.h"
 #endif
 
 #include /**/ <sys/stdsyms.h>
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index 554652ede15..35098a8170c 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -6,8 +6,8 @@
 // and libg++ v2.6.x.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // Platform supports STREAM pipes (note that this is disabled by
 // default, see the manual page on pipe(2) to find out how to enable
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index db27c89fc15..554167e9ec3 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -5,8 +5,8 @@
 // Indigo2EX running Irix 5.3 platform using the GNU C++ Compiler
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
 // this must appear before its #include.
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index aedaf586c0e..269bab43bb6 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -6,8 +6,8 @@
 // the SGI C++ Compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define IRIX5
 
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index 7e4483c0bf6..1317197244e 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -5,8 +5,8 @@
 // Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
 // this must appear before its #include.
diff --git a/ace/config-irix6.x-kcc.h b/ace/config-irix6.x-kcc.h
index b2f28063028..e14b2cd8f97 100644
--- a/ace/config-irix6.x-kcc.h
+++ b/ace/config-irix6.x-kcc.h
@@ -5,8 +5,8 @@
 // Indigo2EX running Irix 6.5 platform using the KAI C++ compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-kcc-common.h"
 
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index 6a960e61528..08f9fb59176 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -19,8 +19,8 @@
 // Since this files gets included from config-irix6.x-sgic++.h we
 // cannot use ACE_CONFIG_H here.
 #ifndef ACE_CONFIG_IRIX6X_NTHR_H
-#include "ace/pre.h"
 #define ACE_CONFIG_IRIX6X_NTHR_H
+#include "ace/pre.h"
 
 // Include this file to set the _MIPS_SIM*ABI* macros.
 #include /**/ <sgidefs.h>
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index 48eeb4453b7..4a80f49f6ba 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -5,8 +5,8 @@
 // installed.
 
 #ifndef ACE_CONFIG_IRIX6X_H
-#include "ace/pre.h"
 #define ACE_CONFIG_IRIX6X_H
+#include "ace/pre.h"
 
 // Include basic (non-threaded) configuration
 #include "ace/config-irix6.x-sgic++-nothreads.h"
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index 215f8693b31..dd3b1c8057a 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -22,8 +22,8 @@
 //
 
 #ifndef ACE_KCC_COMMON_H
-#include "ace/pre.h"
 #define ACE_KCC_COMMON_H
+#include "ace/pre.h"
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
 # define ACE_SIZEOF_LONG_DOUBLE 12
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 820ac9ffc84..9e731fc2535 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -8,8 +8,8 @@
 // and configures based on those.
 
 #ifndef ACE_LINUX_COMMON_H
-#include "ace/pre.h"
 #define ACE_LINUX_COMMON_H
+#include "ace/pre.h"
 
 #define ACE_HAS_BYTESEX_H
 
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index da15ed8da7d..e76bb53315d 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -26,8 +26,8 @@
         however.) */
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-linux-common.h"
 
diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h
index bf3a1c821d0..1371714910f 100644
--- a/ace/config-linux-pthread.h
+++ b/ace/config-linux-pthread.h
@@ -5,8 +5,8 @@
 // platforms using GNU C++ and the MIT threads package.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-linux-common.h"
 
diff --git a/ace/config-linux.h b/ace/config-linux.h
index ffc20c77cff..2f8b40a0ceb 100644
--- a/ace/config-linux.h
+++ b/ace/config-linux.h
@@ -5,8 +5,8 @@
 // platforms using GNU C++.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-linux-common.h"
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 9bc2c0f4304..53354f97cf3 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -11,8 +11,8 @@
 // processes
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index 6e69f6b2202..19f5f30886c 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -5,8 +5,8 @@
 // 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS).
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-minimal.h b/ace/config-minimal.h
index 548beda70a5..11d66eb7b01 100644
--- a/ace/config-minimal.h
+++ b/ace/config-minimal.h
@@ -5,8 +5,8 @@
 // ACE_OS adaptation layer.
 
 #ifndef ACE_CONFIG_MINIMAL_H
-#include "ace/pre.h"
 #define ACE_CONFIG_MINIMAL_H
+#include "ace/pre.h"
 
 #define ACE_HAS_MINIMAL_ACE_OS
 
diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h
index 73f8499c63d..03eda51c41b 100644
--- a/ace/config-mit-pthread.h
+++ b/ace/config-mit-pthread.h
@@ -1,8 +1,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_MIT_PTHREAD_H
-#include "ace/pre.h"
 #define ACE_CONFIG_MIT_PTHREAD_H
+#include "ace/pre.h"
 
 // Platform uses int for select() rather than fd_set.
 #if !defined(ACE_HAS_SELECT_H)
diff --git a/ace/config-mklinux.h b/ace/config-mklinux.h
index 6e72ac73c0a..31957b70be0 100644
--- a/ace/config-mklinux.h
+++ b/ace/config-mklinux.h
@@ -5,8 +5,8 @@
 // platforms using GNU C++.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-linux-common.h"
 
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index b6ac80ac34a..721e4005651 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -4,8 +4,8 @@
 // Config file for MVS with OpenEdition
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // The following #defines are hacks to get around things
 // that seem to be missing or different in MVS land
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 4e87c8e8f5d..386ef450277 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -7,8 +7,8 @@
 // platforms using GNU g++.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
index d1ce13c264a..6412896a0a3 100644
--- a/ace/config-osf1-3.2.h
+++ b/ace/config-osf1-3.2.h
@@ -5,8 +5,8 @@
 // platforms with the DEC 5.1 C++ compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_LACKS_SETSCHED
 #define ACE_LACKS_RWLOCK_T
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 93b98a77691..fa54b414a98 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -15,8 +15,8 @@
 // by uname -a.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if !defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h
index 573ab544caf..85a8984fc00 100644
--- a/ace/config-pharlap.h
+++ b/ace/config-pharlap.h
@@ -5,8 +5,8 @@
 // It has been tested with PharLap TNT Embedded ToolSuite version 9.1.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_HAS_PHARLAP
 // Some features are only available with the Realtime edition of ETS.
diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h
index 18ab9875778..954dcd9e2f9 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -5,8 +5,8 @@
 // using the Diab Data D-C++ 4.2 p3 compiler (or a later version)
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // #if ! defined (__ACE_INLINE__)
 // # define __ACE_INLINE__
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index 866af14f016..65d26b1cb71 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -8,8 +8,8 @@
 
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // #if ! defined (__ACE_INLINE__)
 // # define __ACE_INLINE__
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index 5893cb6417f..7c439aa677d 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -5,8 +5,8 @@
 // using the Diab Data D-C++ 4.2a compiler (or a later version)
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // #if ! defined (__ACE_INLINE__)
 // # define __ACE_INLINE__
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index 0a3af1b62f4..aa077e2bca6 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -5,8 +5,8 @@
 // using the Diab Data D-C++ 4.1a compiler
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // #if ! defined (__ACE_INLINE__)
 // # define __ACE_INLINE__
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index 359b934ce30..f288b93f18e 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -35,8 +35,8 @@
 
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 ////////////////////////////////////////////////////////////////
 //                                                            //
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index 9d30744e642..0d1338b9c42 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -4,8 +4,8 @@
 // 2.0 (Beta) with GNU C++ and the POSIX (pthread) threads package.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define _POSIX_C_SOURCE 199506
 #define _QNX_SOURCE
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 02d37d128e6..bb7df289328 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -5,8 +5,8 @@
 // version 4.2 without threads.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h
index 1ca56814ec7..2c873f48c87 100644
--- a/ace/config-sco-5.0.0-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-fsu-pthread.h
@@ -2,8 +2,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-g++-common.h"
 #include "ace/config-sco-5.0.0.h"
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index 972d48d1cb7..70ce1167694 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -5,8 +5,8 @@
 // version 5.0 with MIT pthreads.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if !defined (__ACE_INLINE__)
 #define __ACE_INLINE__
diff --git a/ace/config-sco-5.0.0-nothread.h b/ace/config-sco-5.0.0-nothread.h
index 8e48980625f..ca241adbd1d 100644
--- a/ace/config-sco-5.0.0-nothread.h
+++ b/ace/config-sco-5.0.0-nothread.h
@@ -2,8 +2,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config-g++-common.h"
 #include "ace/config-sco-5.0.0.h"
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 2cf88d7384f..b8a2b738182 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -2,8 +2,8 @@
 // $Id$
 
 #ifndef ACE_CONFIG_SCO_5_0_0_H
-#include "ace/pre.h"
 #define ACE_CONFIG_SCO_5_0_0_H
+#include "ace/pre.h"
 
 // Compiling for SCO.
 #if !defined (SCO)
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 4cda64bc547..23924199d72 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -4,8 +4,8 @@
 // for SunOS4 platforms using the GNU g++ compiler
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index 6b2d5df7c21..fe723d7db6b 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -5,8 +5,8 @@
 // for SunOS4 platforms using the Lucid 3.2 compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 02011c77273..4d070ae887e 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -5,8 +5,8 @@
 // platforms using the SunC++ 4.x compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
index 0df13a023d9..8c5266605b7 100644
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ b/ace/config-sunos4-sun4.x-orbix.h
@@ -5,8 +5,8 @@
 // for SunOS4 platforms using the SunC++ 4.x compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index 8c1e54e2115..a5f1fd23063 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -5,8 +5,8 @@
 // for SunOS4 platforms using the SunC++ 4.x compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_GETPGID
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 62f8178c9f6..a36db3e17af 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -5,8 +5,8 @@
 // platforms using the Centerline 2.x C++ compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index 3845659c06f..648557989db 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -5,8 +5,8 @@
 // platforms using the GNU g++ compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index 64b9352934c..fa44d1521e5 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -6,8 +6,8 @@
 // MT-Orbix CORBA IDL compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index 0fc3b7b1e39..76392130c56 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -5,8 +5,8 @@
 // platforms using the SunC++ 4.0.x compiler.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index ccae637b26b..e752b6eaa6e 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -8,8 +8,8 @@
 //   * Green Hills 1.8.8 and later
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // Compiler version-specific settings:
 #if defined (__SUNPRO_CC)
diff --git a/ace/config-sunos5.x-sunc++-4.x-orbix.h b/ace/config-sunos5.x-sunc++-4.x-orbix.h
index 84226b06533..f48b35c2e8e 100644
--- a/ace/config-sunos5.x-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.x-sunc++-4.x-orbix.h
@@ -6,8 +6,8 @@
 // Orbix 2.x CORBA IDL compiler.
 
 #ifndef ACE_CONFIG_ORBIX_H
-#include "ace/pre.h"
 #define ACE_CONFIG_ORBIX_H
+#include "ace/pre.h"
 
 // Pick up correct platform definition file based on compiler's predefined
 // macros.
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index c24de85f3bd..86625f19e21 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -16,8 +16,8 @@
 // Janne (Jan.Perman@osd.Ericsson.se)
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 091136c6cf9..e5558870db1 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -6,8 +6,8 @@
 // config-osf1-4.0.h, and adds deltas for newer platforms.
 
 #ifndef ACE_CONFIG_TRU64_H
-#include "ace/pre.h"
 #define ACE_CONFIG_TRU64_H
+#include "ace/pre.h"
 
 #if defined (DIGITAL_UNIX)
 #  include "ace/config-osf1-4.0.h"
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index 888c934aea4..92fe9d4c58a 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -4,8 +4,8 @@
 // The following configuration file is designed to work
 // for Unixware platforms running UnixWare 2.01.
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
 
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index b44b53d25fe..fced5901150 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -5,8 +5,8 @@
 // for Unixware platforms running UnixWare 2.1.2 and gcc version 2.7.2.2
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
 
diff --git a/ace/config-visualage.h b/ace/config-visualage.h
index 6687a7ec3c4..ccaaec9c776 100644
--- a/ace/config-visualage.h
+++ b/ace/config-visualage.h
@@ -5,8 +5,8 @@
 // configurations for IBM's VisualAge C++ compiler on Win32 and AIX.
 
 #ifndef CONFIG_VISUALAGE_H
-#include "ace/pre.h"
 #define CONFIG_VISUALAGE_H
+#include "ace/pre.h"
 
 #ifdef __TOS_WIN__
    #include "ace/config-win32.h"
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 748fd3ba0fe..0387c805ff9 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -7,8 +7,8 @@
 // 2) The Green Hills 1.8.8 (not 1.8.7!!!!) and 1.8.9 compilers.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if ! defined (VXWORKS)
 # define VXWORKS
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 1951327a5f9..5e05c7055f3 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -4,8 +4,8 @@
 // The following configuration file contains defines for Borland compilers.
 
 #ifndef ACE_WIN32_BORLAND_H
-#include "ace/pre.h"
 #define ACE_WIN32_BORLAND_H
+#include "ace/pre.h"
 
 #if defined (__BORLANDC__)
 
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index a2dd62a19f1..9b4d1de6398 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -6,8 +6,8 @@
 // compilers 2.0, 4.0, 4.1, 4.2, 5.0 and 6.0
 
 #ifndef ACE_WIN32_COMMON_H
-#include "ace/pre.h"
 #define ACE_WIN32_COMMON_H
+#include "ace/pre.h"
 
 // Complain if WIN32 is not already defined.
 #if !defined (WIN32) && !defined (ACE_HAS_WINCE)
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 57dfc03555b..ed0fe0f6404 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -5,8 +5,8 @@
 // common to all Win32/MSVC/MFC combinations.
 
 #ifndef ACE_WIN32_MSVC_H
-#include "ace/pre.h"
 #define ACE_WIN32_MSVC_H
+#include "ace/pre.h"
 
 #if defined (_MSC_VER)
 
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index 5fb83a8e19f..dbc791391d8 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -6,8 +6,8 @@
 // common to all VisualAge compilers.
 
 #ifndef ACE_WIN32_VISUALAGECPP_H
-#include "ace/pre.h"
 #define ACE_WIN32_VISUALAGECPP_H
+#include "ace/pre.h"
 
 #if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 
diff --git a/ace/config-win32.h b/ace/config-win32.h
index 8617cd69c38..58cc18a6fa8 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -6,8 +6,8 @@
 // variety of compilers.
 
 #ifndef ACE_CONFIG_H
-#include "ace/pre.h"
 #define ACE_CONFIG_H
+#include "ace/pre.h"
 
 #if defined (ACE_HAS_WINCE) || defined (UNDER_CE)
 # include "ace/config-WinCE.h"
diff --git a/ace/inc_user_config.h b/ace/inc_user_config.h
index f6b6cd39b62..081922f60e9 100644
--- a/ace/inc_user_config.h
+++ b/ace/inc_user_config.h
@@ -5,8 +5,8 @@
 // config.h directly.
 
 #ifndef ACE_INC_USER_CONFIG_H
-#include "ace/pre.h"
 #define ACE_INC_USER_CONFIG_H
+#include "ace/pre.h"
 
 #include "ace/config.h"
 
diff --git a/ace/iosfwd.h b/ace/iosfwd.h
index d6afd67c047..5ec6bef19f9 100644
--- a/ace/iosfwd.h
+++ b/ace/iosfwd.h
@@ -25,8 +25,8 @@
 // ============================================================================
 
 #ifndef ACE_IOSFWD_H
-#include "ace/pre.h"
 #define ACE_IOSFWD_H
+#include "ace/pre.h"
 
 #include "ace/inc_user_config.h"
 
diff --git a/ace/streams.h b/ace/streams.h
index 3fcbbbab480..4043eb7e698 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -22,8 +22,8 @@
 // ============================================================================
 
 #ifndef ACE_STREAMS_H
-#include "ace/pre.h"
 #define ACE_STREAMS_H
+#include "ace/pre.h"
 
 #include "ace/inc_user_config.h"
 
diff --git a/ace/ws2tcpip.h b/ace/ws2tcpip.h
index 0df97c7a992..5640f2e5989 100644
--- a/ace/ws2tcpip.h
+++ b/ace/ws2tcpip.h
@@ -16,8 +16,8 @@
 */
 
 #ifndef _WS2TCPIP_H_
-#include "ace/pre.h"
 #define _WS2TCPIP_H_
+#include "ace/pre.h"
 
 /* Structure to keep interface specific information */
author	nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-03-23 21:27:03 +0000
committer	nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-03-23 21:27:03 +0000
commit	18f46df5315adfa2e6869b91bcb49c2e3c9ff8ae (patch)
tree	5e4f74d88bedce48662f399e445ea71b9948b185
parent	0d8ebf3cb3cf506b3b4ba259122aa04b0b53378a (diff)
download	ATCD-18f46df5315adfa2e6869b91bcb49c2e3c9ff8ae.tar.gz