ChangeLogTag:Sat Mar 18 05:42:06 2000 Nanbor Wang <nanbor@cs.wustl.edu>

343 files changed, 871 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 46fa8915aa9..f2b78c3cf49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,51 @@
+Sat Mar 18 05:42:06 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/pre.h:
+        * ace/post.h: Added two new file.  <pre.h> preserves the current
+          alignment setting of the compiler and <post.h> restores the
+          alignment setting.  They are used to make ACE a better team
+          player with other library on NT platforms.
+
+        * include/makeinclude/compiler.bor:
+        * include/makeinclude/make_flags.bor: Applied the changes for the
+          updated Borland makefiles.
+
+          When using ACE+TAO on Win32 (using either MSVC or BCB) you
+          currently must ensure that your application's compiler options
+          are set to be the same as those used to build ACE+TAO. For
+          example, since ACE+TAO is built using 8-byte alignment, your
+          application must also use this alignment otherwise bad things
+          can happen.
+
+          Other libraries on Win32 free the developer from this burden by
+          explicitly setting these options in the source code. For
+          example, the Windows SDK header files contain things like
+
+             #include <pshpack4.h>
+             ...
+             #include <poppack.h>
+
+          where these header files contain the appropriate #pragmas for
+          setting alignment options. (BTW, structure alignment is not the
+          only option that may be set, I'm just using it as an
+          example. Warnings could be disabled, and - my ulterior motive -
+          I have a few problematic BCB compiler options that I would like
+          to control.)
+
+          This sort of thing helps a library to play nicely with any other
+          libraries or source code someone may be using. It somewhat
+          simplifies the instructions for setting up project that uses
+          ACE+TAO, and it lets developers change their compiler options
+          with abandon without breaking ACE+TAO.
+
+          Thanks to Christopher Kohlhoff <chris@kohlhoff.com> for
+          providing the patches.
+
 Fri Mar 17 23:28:20 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* examples/OS/Process/process.cpp (tokenize): Fixed a typo in the
-	  code.  Thanks to Byron Harris <harris_b@ociweb.com> for noticing
- 	  this.
+        * examples/OS/Process/process.cpp (tokenize): Fixed a typo in the
+          code.  Thanks to Byron Harris <harris_b@ociweb.com> for noticing
+          this.
 
 Fri Mar 17 20:43:20 2000  Sangwoo Jin <swjinjin@sei.co.kr>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 46fa8915aa9..f2b78c3cf49 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,8 +1,51 @@
+Sat Mar 18 05:42:06 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/pre.h:
+        * ace/post.h: Added two new file.  <pre.h> preserves the current
+          alignment setting of the compiler and <post.h> restores the
+          alignment setting.  They are used to make ACE a better team
+          player with other library on NT platforms.
+
+        * include/makeinclude/compiler.bor:
+        * include/makeinclude/make_flags.bor: Applied the changes for the
+          updated Borland makefiles.
+
+          When using ACE+TAO on Win32 (using either MSVC or BCB) you
+          currently must ensure that your application's compiler options
+          are set to be the same as those used to build ACE+TAO. For
+          example, since ACE+TAO is built using 8-byte alignment, your
+          application must also use this alignment otherwise bad things
+          can happen.
+
+          Other libraries on Win32 free the developer from this burden by
+          explicitly setting these options in the source code. For
+          example, the Windows SDK header files contain things like
+
+             #include <pshpack4.h>
+             ...
+             #include <poppack.h>
+
+          where these header files contain the appropriate #pragmas for
+          setting alignment options. (BTW, structure alignment is not the
+          only option that may be set, I'm just using it as an
+          example. Warnings could be disabled, and - my ulterior motive -
+          I have a few problematic BCB compiler options that I would like
+          to control.)
+
+          This sort of thing helps a library to play nicely with any other
+          libraries or source code someone may be using. It somewhat
+          simplifies the instructions for setting up project that uses
+          ACE+TAO, and it lets developers change their compiler options
+          with abandon without breaking ACE+TAO.
+
+          Thanks to Christopher Kohlhoff <chris@kohlhoff.com> for
+          providing the patches.
+
 Fri Mar 17 23:28:20 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* examples/OS/Process/process.cpp (tokenize): Fixed a typo in the
-	  code.  Thanks to Byron Harris <harris_b@ociweb.com> for noticing
- 	  this.
+        * examples/OS/Process/process.cpp (tokenize): Fixed a typo in the
+          code.  Thanks to Byron Harris <harris_b@ociweb.com> for noticing
+          this.
 
 Fri Mar 17 20:43:20 2000  Sangwoo Jin <swjinjin@sei.co.kr>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 46fa8915aa9..f2b78c3cf49 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,8 +1,51 @@
+Sat Mar 18 05:42:06 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/pre.h:
+        * ace/post.h: Added two new file.  <pre.h> preserves the current
+          alignment setting of the compiler and <post.h> restores the
+          alignment setting.  They are used to make ACE a better team
+          player with other library on NT platforms.
+
+        * include/makeinclude/compiler.bor:
+        * include/makeinclude/make_flags.bor: Applied the changes for the
+          updated Borland makefiles.
+
+          When using ACE+TAO on Win32 (using either MSVC or BCB) you
+          currently must ensure that your application's compiler options
+          are set to be the same as those used to build ACE+TAO. For
+          example, since ACE+TAO is built using 8-byte alignment, your
+          application must also use this alignment otherwise bad things
+          can happen.
+
+          Other libraries on Win32 free the developer from this burden by
+          explicitly setting these options in the source code. For
+          example, the Windows SDK header files contain things like
+
+             #include <pshpack4.h>
+             ...
+             #include <poppack.h>
+
+          where these header files contain the appropriate #pragmas for
+          setting alignment options. (BTW, structure alignment is not the
+          only option that may be set, I'm just using it as an
+          example. Warnings could be disabled, and - my ulterior motive -
+          I have a few problematic BCB compiler options that I would like
+          to control.)
+
+          This sort of thing helps a library to play nicely with any other
+          libraries or source code someone may be using. It somewhat
+          simplifies the instructions for setting up project that uses
+          ACE+TAO, and it lets developers change their compiler options
+          with abandon without breaking ACE+TAO.
+
+          Thanks to Christopher Kohlhoff <chris@kohlhoff.com> for
+          providing the patches.
+
 Fri Mar 17 23:28:20 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* examples/OS/Process/process.cpp (tokenize): Fixed a typo in the
-	  code.  Thanks to Byron Harris <harris_b@ociweb.com> for noticing
- 	  this.
+        * examples/OS/Process/process.cpp (tokenize): Fixed a typo in the
+          code.  Thanks to Byron Harris <harris_b@ociweb.com> for noticing
+          this.
 
 Fri Mar 17 20:43:20 2000  Sangwoo Jin <swjinjin@sei.co.kr>
 
diff --git a/ace/ACE.h b/ace/ACE.h
index 796dfea3142..e9492237752 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ACE_H
+#include "ace/pre.h"
 #define ACE_ACE_H
 
 #include "ace/OS.h"
@@ -699,4 +700,5 @@ private:
 #include "ace/ACE.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif  /* ACE_ACE_H */
diff --git a/ace/ARGV.h b/ace/ARGV.h
index d6b0516dbaa..584399cd916 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ARGUMENT_VECTOR_H
+#include "ace/pre.h"
 #define ACE_ARGUMENT_VECTOR_H
 
 #include "ace/ACE.h"
@@ -151,4 +152,5 @@ private:
 #include "ace/ARGV.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_ARGUMENT_VECTOR_H */
diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h
index 581bc812698..c4640837c64 100644
--- a/ace/ATM_Acceptor.h
+++ b/ace/ATM_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ATM_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_ATM_ACCEPTOR_H
 
 #include "ace/Time_Value.h"
@@ -101,5 +102,6 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
+#include "ace/post.h"
 #endif /* ACE_ATM_ACCEPTOR_H */
 
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
index 9ec40ed4347..d2b4d4e1201 100644
--- a/ace/ATM_Addr.h
+++ b/ace/ATM_Addr.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef ACE_ATM_ADDR_H
+#include "ace/pre.h"
 #define ACE_ATM_ADDR_H
 
 #include "ace/ACE.h"
@@ -153,5 +154,6 @@ private:
 #include "ace/ATM_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_ATM_ADDR_H */
 
diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h
index 0202bb1def1..6b7053a2ac4 100644
--- a/ace/ATM_Connector.h
+++ b/ace/ATM_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ATM_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_ATM_CONNECTOR_H
 
 #include "ace/ATM_Stream.h"
@@ -138,5 +139,6 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
+#include "ace/post.h"
 #endif /* ACE_ATM_CONNECTOR_H */
 
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index 42642670a7c..9e37075b853 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef ACE_ATM_PARAMS_H
+#include "ace/pre.h"
 #define ACE_ATM_PARAMS_H
 
 #include "ace/ACE.h"
@@ -165,5 +166,6 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
+#include "ace/post.h"
 #endif /* ACE_ATM_PARAMS_H */
 
diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h
index d4d7189bda4..1ae44da6344 100644
--- a/ace/ATM_QoS.h
+++ b/ace/ATM_QoS.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ATM_QoS_H
+#include "ace/pre.h"
 #define ACE_ATM_QoS_H
 
 #include "ace/ACE.h"
@@ -92,5 +93,6 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
+#include "ace/post.h"
 #endif /* ACE_ATM_QoS_H */
 
diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h
index 3cdbd2c134b..191d81f4fbc 100644
--- a/ace/ATM_Stream.h
+++ b/ace/ATM_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ATM_STREAM_H
+#include "ace/pre.h"
 #define ACE_ATM_STREAM_H
 
 #include "ace/ATM_Addr.h"
@@ -91,5 +92,6 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
+#include "ace/post.h"
 #endif /* ACE_ATM_STREAM_H */
 
diff --git a/ace/Acceptor.h b/ace/Acceptor.h
index 615229f7cea..668094dc635 100644
--- a/ace/Acceptor.h
+++ b/ace/Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_ACCEPTOR_H
 
 #include "ace/Service_Config.h"
@@ -527,4 +528,5 @@ private:
 #pragma implementation ("Acceptor.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_ACCEPTOR_H */
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index c7ca55f6a26..341276d1934 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_ACTIVATION_QUEUE_H
+#include "ace/pre.h"
 #define ACE_ACTIVATION_QUEUE_H
 
 #include "ace/Synch_T.h"
@@ -92,5 +93,6 @@ protected:
 #include "ace/Activation_Queue.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_ACTIVATION_QUEUE_H */
 
diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index 713aedd17b4..93af5063a9b 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ACTIVE_MAP_MANAGER_H
+#include "ace/pre.h"
 #define ACE_ACTIVE_MAP_MANAGER_H
 
 #include "ace/OS.h"
@@ -100,4 +101,5 @@ private:
 // Include the templates here.
 #include "ace/Active_Map_Manager_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_ACTIVE_MAP_MANAGER_H */
diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h
index 074d410fd32..143c1012761 100644
--- a/ace/Active_Map_Manager_T.h
+++ b/ace/Active_Map_Manager_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ACTIVE_MAP_MANAGER_T_H
+#include "ace/pre.h"
 #define ACE_ACTIVE_MAP_MANAGER_T_H
 
 #include "ace/Map_Manager.h"
@@ -191,4 +192,5 @@ private:
 #pragma implementation ("Active_Map_Manager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_ACTIVE_MAP_MANAGER_T_H */
diff --git a/ace/Addr.h b/ace/Addr.h
index 1d9a2051ed8..a77e90d90f6 100644
--- a/ace/Addr.h
+++ b/ace/Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_ADDR_H
+#include "ace/pre.h"
 #define ACE_ADDR_H
 
 #include "ace/ACE.h"
@@ -104,4 +105,5 @@ protected:
 #include "ace/Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_ADDR_H */
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index 579c55ef4f5..266cf5e03fd 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -15,6 +15,7 @@
 // ========================================================================
 
 #ifndef ACE_ARG_SHIFTER_H
+#include "ace/pre.h"
 #define ACE_ARG_SHIFTER_H
 
 #include "ace/OS.h"
@@ -162,4 +163,5 @@ private:
   // argument.
 };
 
+#include "ace/post.h"
 #endif /* ACE_ARG_SHIFTER_H */
diff --git a/ace/Array.h b/ace/Array.h
index faa4a450607..2512c4e48bd 100644
--- a/ace/Array.h
+++ b/ace/Array.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_ARRAY_H
+#include "ace/pre.h"
 #define ACE_ARRAY_H
 
 #include "ace/Containers.h"
@@ -39,4 +40,5 @@
 #pragma implementation ("Containers.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_ARRAY_H */
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index 57b57328fbd..f66c016b69d 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef ACE_ASYNCH_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_ASYNCH_ACCEPTOR_H
 
 #include "ace/OS.h"
@@ -181,5 +182,6 @@ private:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
+#include "ace/post.h"
 #endif /* ACE_ASYNCH_ACCEPTOR_H */
 
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 1f819f95a49..129853068a4 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -31,6 +31,7 @@
 // ============================================================================
 
 #ifndef ACE_ASYNCH_IO_H
+#include "ace/pre.h"
 #define ACE_ASYNCH_IO_H
 
 #include "ace/OS.h"
@@ -1112,4 +1113,5 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
+#include "ace/post.h"
 #endif /* ACE_ASYNCH_IO_H */
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index e04df1c8bce..17ebd4ccb34 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -26,6 +26,7 @@
 // ============================================================================
 
 #ifndef ACE_ASYNCH_IO_IMPL_H
+#include "ace/pre.h"
 #define ACE_ASYNCH_IO_IMPL_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -500,4 +501,5 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS  || !ACE_HAS_WINCE && ACE_WIN32 */
+#include "ace/post.h"
 #endif /* ACE_ASYNCH_IO_IMPL_H */
diff --git a/ace/Auto_IncDec_T.h b/ace/Auto_IncDec_T.h
index 024729bf7be..4f5eb9a77db 100644
--- a/ace/Auto_IncDec_T.h
+++ b/ace/Auto_IncDec_T.h
@@ -15,6 +15,7 @@
 //============================================================================
 
 #ifndef ACE_AUTO_INCDEC_T_H
+#include "ace/pre.h"
 #define ACE_AUTO_INCDEC_T_H
 
 #include "ace/OS.h"
@@ -80,4 +81,5 @@ private:
 #pragma implementation ("Auto_IncDec_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_AUTO_INCDEC_T_H */
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index d08058cd29e..17da0e8fa6a 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_AUTO_PTR_H
+#include "ace/pre.h"
 #define ACE_AUTO_PTR_H
 
 #include "ace/ACE.h"
@@ -156,4 +157,5 @@ public:
 #pragma implementation ("Auto_Ptr.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_AUTO_PTR_H */
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
index 4d743d0530e..3a72fbcc77f 100644
--- a/ace/Based_Pointer_Repository.h
+++ b/ace/Based_Pointer_Repository.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_BASED_POINTER_REPOSITORY_H
+#include "ace/pre.h"
 #define ACE_BASED_POINTER_REPOSITORY_H
 
 #include "ace/OS.h"                  // Need ACE_Export
@@ -63,4 +64,5 @@ private:
 typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
         ACE_BASED_POINTER_REPOSITORY;
 
+#include "ace/post.h"
 #endif /* ACE_BASED_POINTER_REPOSITORY_H */
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
index 6dafb87cc6b..943be79caea 100644
--- a/ace/Based_Pointer_T.h
+++ b/ace/Based_Pointer_T.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_BASED_POINTER_T_H
+#include "ace/pre.h"
 #define ACE_BASED_POINTER_T_H
 
 #include "ace/OS.h"              // Need ACE_Export
@@ -184,4 +185,5 @@ public:
 #pragma implementation ("Based_Pointer_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_BASED_POINTER_T_H */
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index e88ea07613c..8b4da1e0d09 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -34,6 +34,7 @@
 // ============================================================================
 
 #ifndef ACE_CDR_H
+#include "ace/pre.h"
 #define ACE_CDR_H
 
 #include "ace/Message_Block.h"
@@ -1145,4 +1146,5 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
 
 #endif /* __ACE_INLINE */
 
+#include "ace/post.h"
 #endif /* ACE_CDR_H */
diff --git a/ace/CLASSIX/CLASSIX_Addr.h b/ace/CLASSIX/CLASSIX_Addr.h
index 0afb1675a89..21089659649 100644
--- a/ace/CLASSIX/CLASSIX_Addr.h
+++ b/ace/CLASSIX/CLASSIX_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_ADDR_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_ADDR_H
 
 #include "ace/ACE.h"
@@ -94,4 +95,5 @@ private:
 #include "ace/CLASSIX/CLASSIX_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_ADDR_H */
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.h b/ace/CLASSIX/CLASSIX_CLD_Connector.h
index 2825841bcdd..324d484e65e 100644
--- a/ace/CLASSIX/CLASSIX_CLD_Connector.h
+++ b/ace/CLASSIX/CLASSIX_CLD_Connector.h
@@ -17,6 +17,7 @@
 */
 
 #ifndef ACE_CLASSIX_CLD_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_CLD_CONNECTOR_H
 
 #include "ace/CLASSIX/CLASSIX_Stream.h"
@@ -129,4 +130,5 @@ class ACE_CLASSIX_CLD_Connector
 #include "ace/CLASSIX/CLASSIX_CLD_Connector.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_CLD_CONNECTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.h b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
index 02f58f89bb4..b095b394ba7 100644
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.h
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_CO_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_CO_ACCEPTOR_H
 
 #include "ace/CLASSIX/CLASSIX_Stream.h"
@@ -141,4 +142,5 @@ private:
 #include "ace/CLASSIX/CLASSIX_CO_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_CO_ACCEPTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.h b/ace/CLASSIX/CLASSIX_CO_Connector.h
index 610739dc18d..b59e04a72e2 100644
--- a/ace/CLASSIX/CLASSIX_CO_Connector.h
+++ b/ace/CLASSIX/CLASSIX_CO_Connector.h
@@ -17,6 +17,7 @@
 */
 
 #ifndef ACE_CLASSIX_CO_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_CO_CONNECTOR_H
 
 #include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
@@ -113,4 +114,5 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
 #include "ace/CLASSIX/CLASSIX_CO_Connector.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_CO_CONNECTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
index a21a770f83d..35166b99ca0 100644
--- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
+++ b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_DGRAM_MCAST_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_DGRAM_MCAST_H
 
 /* ------------------------------------------------------------------------- */
@@ -89,4 +90,5 @@ class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream
 
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_DGRAM_MCAST_H */
diff --git a/ace/CLASSIX/CLASSIX_Group.h b/ace/CLASSIX/CLASSIX_Group.h
index ed92c5970d1..5c4c6dfabc5 100644
--- a/ace/CLASSIX/CLASSIX_Group.h
+++ b/ace/CLASSIX/CLASSIX_Group.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_GROUP_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_GROUP_H
 
 /* ------------------------------------------------------------------------- */
@@ -113,4 +114,5 @@ class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
 #include "ace/CLASSIX/CLASSIX_Group.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_GROUP_H */
diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.h b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
index 7531d69404f..eb469fcf81a 100644
--- a/ace/CLASSIX/CLASSIX_Group_Dynamic.h
+++ b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_GROUP_DYNAMIC_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_GROUP_DYNAMIC_H
 
 /* ------------------------------------------------------------------------- */
@@ -58,4 +59,5 @@ class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group
 #include "ace/CLASSIX/CLASSIX_Group_Dynamic.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_GROUP_DYNAMIC_H */
diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.h b/ace/CLASSIX/CLASSIX_Group_Stamp.h
index a69d732edc2..f71149616d3 100644
--- a/ace/CLASSIX/CLASSIX_Group_Stamp.h
+++ b/ace/CLASSIX/CLASSIX_Group_Stamp.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_GROUP_STAMP_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_GROUP_STAMP_H
 
 /* ------------------------------------------------------------------------- */
@@ -85,4 +86,5 @@ class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group
 #include "ace/CLASSIX/CLASSIX_Group_Stamp.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_GROUP_STAMP_H */
diff --git a/ace/CLASSIX/CLASSIX_OS.h b/ace/CLASSIX/CLASSIX_OS.h
index e708a5e7d9e..7f2118d5089 100644
--- a/ace/CLASSIX/CLASSIX_OS.h
+++ b/ace/CLASSIX/CLASSIX_OS.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_OS_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_OS_H
 
 /* ------------------------------------------------------------------------- */
@@ -129,4 +130,5 @@ class ACE_CLASSIX_Msg
 #include "ace/CLASSIX/CLASSIX_OS.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_OS_H */
diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.h b/ace/CLASSIX/CLASSIX_Peer_SAP.h
index 8a3d784ebcb..93e65996763 100644
--- a/ace/CLASSIX/CLASSIX_Peer_SAP.h
+++ b/ace/CLASSIX/CLASSIX_Peer_SAP.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_PEER_SAP_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_PEER_SAP_H
 
 /* ------------------------------------------------------------------------- */
@@ -103,4 +104,5 @@ class ACE_CLASSIX_Peer_SAP
 
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_PEER_SAP_H */
diff --git a/ace/CLASSIX/CLASSIX_Port.h b/ace/CLASSIX/CLASSIX_Port.h
index 2bb45d4cf7c..65bb1745d18 100644
--- a/ace/CLASSIX/CLASSIX_Port.h
+++ b/ace/CLASSIX/CLASSIX_Port.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_PORT_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_PORT_H
 
 #include "ace/Singleton.h"
@@ -157,4 +158,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_PORT_H */
diff --git a/ace/CLASSIX/CLASSIX_Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h
index 5fdfb6309bd..beef0356c63 100644
--- a/ace/CLASSIX/CLASSIX_Port_Core.h
+++ b/ace/CLASSIX/CLASSIX_Port_Core.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_PORT_CORE_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_PORT_CORE_H
 
 /* ------------------------------------------------------------------------- */
@@ -98,4 +99,5 @@ private:
 #include "ace/CLASSIX/CLASSIX_Port_Core.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_PORT_CORE_H */
diff --git a/ace/CLASSIX/CLASSIX_Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h
index 82e94a6c157..ce237daceb3 100644
--- a/ace/CLASSIX/CLASSIX_Port_Default.h
+++ b/ace/CLASSIX/CLASSIX_Port_Default.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef  ACE_CLASSIX_PORT_DEFAULT_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_PORT_DEFAULT_H
 
 #include "ace/Singleton.h"
@@ -75,4 +76,5 @@ typedef ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX>
         ACE_CLASSIX_DEFAULT_PORT;
 /* ------------------------------------------------------------------------- */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_PORT_DEFAULT_H */
diff --git a/ace/CLASSIX/CLASSIX_SAP.h b/ace/CLASSIX/CLASSIX_SAP.h
index cefbdf031c8..c8c5df0e18e 100644
--- a/ace/CLASSIX/CLASSIX_SAP.h
+++ b/ace/CLASSIX/CLASSIX_SAP.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_SAP_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_SAP_H
 
 /* ------------------------------------------------------------------------- */
@@ -140,4 +141,5 @@ class ACE_CLASSIX_SAP
 #include "ace/CLASSIX/CLASSIX_SAP.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_SAP_H */
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.h b/ace/CLASSIX/CLASSIX_Select_Reactor.h
index baf37704c04..98063a60c1f 100644
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.h
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.h
@@ -17,6 +17,7 @@
 */
 
 #ifndef ACE_CLASSIX_REACTOR_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_REACTOR_H
 
 /* ------------------------------------------------------------------------- */
@@ -204,4 +205,5 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
 #include "ace/CLASSIX/CLASSIX_Select_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_REACTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_Stream.h b/ace/CLASSIX/CLASSIX_Stream.h
index 75ec415fe38..0ebced26877 100644
--- a/ace/CLASSIX/CLASSIX_Stream.h
+++ b/ace/CLASSIX/CLASSIX_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CLASSIX_STREAM_H
+#include "ace/pre.h"
 #define ACE_CLASSIX_STREAM_H
 
 /* ------------------------------------------------------------------------- */
@@ -267,4 +268,5 @@ class ACE_CLASSIX_Stream
 #include "ace/CLASSIX/CLASSIX_Stream.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CLASSIX_Stream_H */
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h
index b973adaa73a..c213e1cea61 100644
--- a/ace/CORBA_Handler.h
+++ b/ace/CORBA_Handler.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_CORBA_HANDLER_H
+#include "ace/pre.h"
 #define ACE_CORBA_HANDLER_H
 
 #include "ace/Service_Config.h"
@@ -251,4 +252,5 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ORBIX */
+#include "ace/post.h"
 #endif /* ACE_CORBA_HANDLER_H */
diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
index 2b5f1a57f98..6666aa72232 100644
--- a/ace/CORBA_Ref.h
+++ b/ace/CORBA_Ref.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_CORBA_REF_H
+#include "ace/pre.h"
 #define ACE_CORBA_REF_H
 
 #include "ace/ACE.h"
@@ -82,4 +83,5 @@ private:
 #pragma implementation ("CORBA_Ref.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* CORBA_REF_H */
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index e41d7dee878..ddf99692569 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -24,6 +24,7 @@
 // Macros for handling CORBA exceptions.
 
 #ifndef ACE_CORBA_MACROS_H
+#include "ace/pre.h"
 #define ACE_CORBA_MACROS_H
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -408,4 +409,5 @@
 #   define ACE_PRINT_EXCEPTION(EX,INFO) ACE_PRINT_TAO_EXCEPTION(EX,INFO)
 # endif /* ACE_PRINT_EXCEPTION */
 
+#include "ace/post.h"
 #endif /* ACE_CORBA_MACROS_H */
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 3db249f2d9a..92f6d79c0a6 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef CACHE_MAP_MANAGER_T_H
+#include "ace/pre.h"
 #define CACHE_MAP_MANAGER_T_H
 
 #include "ace/OS.h"
@@ -394,4 +395,5 @@ protected:
 #pragma implementation ("Cache_Map_Manager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* CACHE_MAP_MANAGER_T_H */
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index dec8a016d61..08ecc715885 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef CACHED_CONNECT_STRATEGY_T_H
+#include "ace/pre.h"
 #define CACHED_CONNECT_STRATEGY_T_H
 
 #include "ace/OS.h"
@@ -189,4 +190,5 @@ protected:
 #pragma implementation ("Cached_Connect_Strategy_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* CACHED_CONNECT_STRATEGY_T_H */
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index 18464503a92..d4c1e3d0444 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef CACHING_STRATEGIES_H
+#include "ace/pre.h"
 #define CACHING_STRATEGIES_H
 
 #include "ace/OS.h"
@@ -524,4 +525,5 @@ private:
 #pragma implementation ("Caching_Strategies_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* CACHING_STRATEGIES_H */
diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h
index cc6e3ffe114..f8e26ad736f 100644
--- a/ace/Caching_Utility_T.h
+++ b/ace/Caching_Utility_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef CACHING_UTILITY_H
+#include "ace/pre.h"
 #define CACHING_UTILITY_H
 
 #include "ace/OS.h"
@@ -308,4 +309,5 @@ protected:
 #pragma implementation ("Caching_Utility_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* CACHING_UTILITY_H */
diff --git a/ace/Capabilities.h b/ace/Capabilities.h
index d431c3989da..f1ce931f7ff 100644
--- a/ace/Capabilities.h
+++ b/ace/Capabilities.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CAPABILITIES_H
+#include "ace/pre.h"
 #define ACE_CAPABILITIES_H
 
 #include "ace/OS.h"
@@ -174,4 +175,5 @@ private:
 #include "ace/Capabilities.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* __ACE_CAPABILITIES_H__ */
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index a0c2e4294c9..4e4349b304c 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef CLEANUP_STRATEGIES_H
+#include "ace/pre.h"
 #define CLEANUP_STRATEGIES_H
 
 #include "ace/OS.h"
@@ -140,4 +141,5 @@ public:
 #pragma implementation ("Cleanup_Strategies_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* CLEANUP_STRATEGIES_H */
diff --git a/ace/Codeset_IBM1047.h b/ace/Codeset_IBM1047.h
index 7f1604e2edb..b2c1b1be143 100644
--- a/ace/Codeset_IBM1047.h
+++ b/ace/Codeset_IBM1047.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_CODESET_IMB1047_H
+#include "ace/pre.h"
 #define ACE_CODESET_IMB1047_H
 
 #include "ace/inc_user_config.h"
@@ -110,4 +111,5 @@ public:
 
 #endif /* ACE_MVS */
 
+#include "ace/post.h"
 #endif /* ACE_CODESET_IMB1047_H */
diff --git a/ace/Configuration.h b/ace/Configuration.h
index 8b6e7e6083e..44f2f31ad15 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -31,6 +31,7 @@
 // ============================================================================
 
 #ifndef ACE_CONFIGURATION_H
+#include "ace/pre.h"
 #define ACE_CONFIGURATION_H
 
 #include "ace/ACE.h"
@@ -674,4 +675,5 @@ private:
 #include "ace/Configuration.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIGURATION_H */
diff --git a/ace/Connector.h b/ace/Connector.h
index ddabc7351a4..b5788037d35 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_CONNECTOR_H
 
 #include "ace/Service_Config.h"
@@ -485,4 +486,5 @@ protected:
 #pragma implementation ("Connector.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_CONNECTOR_H */
diff --git a/ace/Containers.h b/ace/Containers.h
index 7ac2230b761..e9893f56182 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CONTAINERS_H
+#include "ace/pre.h"
 #define ACE_CONTAINERS_H
 
 #include "ace/OS.h"
@@ -68,4 +69,5 @@ protected:
 
 #include "ace/Containers_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_CONTAINERS_H */
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 288b4d7fb41..3490955e171 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_CONTAINERS_T_H
+#include "ace/pre.h"
 #define ACE_CONTAINERS_T_H
 
 #include "ace/ACE.h"
@@ -1840,4 +1841,5 @@ private:
 #pragma implementation ("Containers_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_CONTAINERS_T_H */
diff --git a/ace/DEV.h b/ace/DEV.h
index 9f573163f6a..182be995890 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DEV_H
+#include "ace/pre.h"
 #define ACE_DEV_H
 
 #include "ace/IO_SAP.h"
@@ -67,4 +68,5 @@ protected:
 #include "ace/DEV.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_DEV_H */
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index 9f98f1a4f6d..a5a485b9653 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DEV_ADDR_H
+#include "ace/pre.h"
 #define ACE_DEV_ADDR_H
 
 #include "ace/Addr.h"
@@ -84,4 +85,5 @@ private:
 #include "ace/DEV_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_DEV_ADDR_H */
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index db2173dd5b3..d30af366cc3 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DEV_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_DEV_CONNECTOR_H
 
 #include "ace/DEV_IO.h"
@@ -95,4 +96,5 @@ public:
 #include "ace/DEV_Connector.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_DEV_CONNECTOR_H */
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 990e1165b40..666f494df45 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DEV_IO_H
+#include "ace/pre.h"
 #define ACE_DEV_IO_H
 
 #include "ace/DEV.h"
@@ -124,4 +125,5 @@ private:
 #include "ace/DEV_IO.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_DEV_IO_H */
diff --git a/ace/DLL.h b/ace/DLL.h
index 59336ff0c24..f8b9fc2551d 100644
--- a/ace/DLL.h
+++ b/ace/DLL.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DLL_H
+#include "ace/pre.h"
 #define ACE_DLL_H
 
 #include "ace/OS.h"
@@ -103,4 +104,5 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL &))
 };
 
+#include "ace/post.h"
 #endif /* ACE_DLL_H */
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index b6a7d3b610c..5a48ac0df7e 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DATE_TIME_H
+#include "ace/pre.h"
 #define ACE_DATE_TIME_H
 
 #include "ace/ACE.h"
@@ -94,4 +95,5 @@ private:
 #include "ace/Date_Time.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_DATE_TIME_H */
diff --git a/ace/Dirent.h b/ace/Dirent.h
index 6a4c438779e..bc2ffb43f69 100644
--- a/ace/Dirent.h
+++ b/ace/Dirent.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef ACE_DIRENT_H
+#include "ace/pre.h"
 #define ACE_DIRENT_H
 
 #include "ace/OS.h"
@@ -104,4 +105,5 @@ private:
 #include "ace/Dirent.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_DIRENT_H */
diff --git a/ace/Dump.h b/ace/Dump.h
index 1bb165d0eb9..689811ade6b 100644
--- a/ace/Dump.h
+++ b/ace/Dump.h
@@ -49,6 +49,7 @@
 // ============================================================================
 
 #ifndef ACE_DUMP_H
+#include "ace/pre.h"
 #define ACE_DUMP_H
 
 #include "ace/Synch.h"
@@ -153,4 +154,5 @@ private:
 // Include the templates classes at this point.
 #include "ace/Dump_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_DUMP_H */
diff --git a/ace/Dump_T.h b/ace/Dump_T.h
index ca4f5e45d7b..c3ad0fe43e3 100644
--- a/ace/Dump_T.h
+++ b/ace/Dump_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DUMP_T_H
+#include "ace/pre.h"
 #define ACE_DUMP_T_H
 
 #include "ace/Dump.h"
@@ -74,4 +75,5 @@ private:
 #pragma implementation ("Dump_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_DUMP_T_H */
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index 23960bd3632..a742394697f 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DYNAMIC_H
+#include "ace/pre.h"
 #define ACE_DYNAMIC_H
 
 #include "ace/ACE.h"
@@ -66,4 +67,5 @@ private:
 #include "ace/Dynamic.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_DYNAMIC_H */
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index 605083d227b..4de8153b3f4 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_DYNAMIC_SERVICE_H
+#include "ace/pre.h"
 #define ACE_DYNAMIC_SERVICE_H
 
 #include "ace/OS.h"
@@ -45,4 +46,5 @@ public:
 # pragma implementation ("Dynamic_Service.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_DYNAMIC_SERVICE_H */
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index 69da5351c51..53cc1808e5d 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_ENV_VALUE_T_H
+#include "ace/pre.h"
 #define ACE_ENV_VALUE_T_H
 
 #include "ace/OS.h"             // Need to get ACE_static_cast definition
@@ -153,4 +154,5 @@ ACE_Convert (const ASYS_TCHAR *s, double &d)
 #pragma implementation ("Env_Value_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_ENV_VALUE_T_H */
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 2ab0c8f7106..4d7e5b4aedd 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_HANDLER_H
+#include "ace/pre.h"
 #define ACE_EVENT_HANDLER_H
 
 #include "ace/ACE.h"
@@ -193,4 +194,5 @@ public:
 #include "ace/Event_Handler.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_EVENT_HANDLER_H */
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 572337e5e36..d9840287d9c 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_HANDLER_T_H
+#include "ace/pre.h"
 #define ACE_EVENT_HANDLER_T_H
 
 #include "ace/Event_Handler.h"
@@ -186,4 +187,5 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
+#include "ace/post.h"
 #endif /* ACE_EVENT_HANDLER_H */
diff --git a/ace/FIFO.h b/ace/FIFO.h
index a671a1a50f6..3f0415fe61c 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_H
+#include "ace/pre.h"
 #define ACE_FIFO_H
 
 #include "ace/IPC_SAP.h"
@@ -74,4 +75,5 @@ private:
 #include "ace/FIFO.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_FIFO_H */
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index f5de468e91f..1ac761d62e1 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_RECV_H
+#include "ace/pre.h"
 #define ACE_FIFO_RECV_H
 
 #include "ace/FIFO.h"
@@ -71,4 +72,5 @@ private:
 #include "ace/FIFO_Recv.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_FIFO_RECV_H */
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index 57a0697b5a2..1fa77f1a398 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_RECV_MSG_H
+#include "ace/pre.h"
 #define ACE_FIFO_RECV_MSG_H
 
 #include "ace/FIFO_Recv.h"
@@ -76,4 +77,5 @@ public:
 #include "ace/FIFO_Recv_Msg.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_FIFO_RECV_MSG_H */
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 1a402f71746..891a65f6cbd 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_SEND_H
+#include "ace/pre.h"
 #define ACE_FIFO_SEND_H
 
 #include "ace/FIFO.h"
@@ -61,4 +62,5 @@ public:
 #include "ace/FIFO_Send.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_FIFO_SEND_H */
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index 78b2f82ac4a..4136e914b36 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FIFO_SEND_MSG_H
+#include "ace/pre.h"
 #define ACE_FIFO_SEND_MSG_H
 
 #include "ace/FIFO_Send.h"
@@ -75,4 +76,5 @@ public:
 #include "ace/FIFO_Send_Msg.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_FIFO_SEND_MSG_H */
diff --git a/ace/FILE.h b/ace/FILE.h
index 287c8e178f7..07e4a2beaa2 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FILE_H
+#include "ace/pre.h"
 #define ACE_FILE_H
 
 #include "ace/IO_SAP.h"
@@ -129,4 +130,5 @@ protected:
 #include "ace/FILE.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_FILE_H */
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index 5fa6beaa6f0..144554a9b96 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FILE_ADDR_H
+#include "ace/pre.h"
 #define ACE_FILE_ADDR_H
 
 #include "ace/Addr.h"
@@ -85,4 +86,5 @@ private:
 #include "ace/FILE_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_FILE_ADDR_H */
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index 6d8eb9b1333..78a44c2fdd7 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FILE_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_FILE_CONNECTOR_H
 
 #include "ace/FILE_IO.h"
@@ -94,4 +95,5 @@ public:
 #include "ace/FILE_Connector.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_FILE_CONNECTOR_H */
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 808bb76f730..98b4a54e096 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FILE_IO_H
+#include "ace/pre.h"
 #define ACE_FILE_IO_H
 
 #include "ace/FILE.h"
@@ -137,4 +138,5 @@ public:
 #include "ace/FILE_IO.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_FILE_IO_H */
diff --git a/ace/Filecache.h b/ace/Filecache.h
index 65e9d0606a3..364bd72d92b 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_FILECACHE_H
+#include "ace/pre.h"
 #define ACE_FILECACHE_H
 
 #include "ace/Mem_Map.h"
@@ -348,4 +349,5 @@ private:
 };
 
 
+#include "ace/post.h"
 #endif /* ACE_FILECACHE_H */
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index 182d11d7995..f14d1e1f944 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #ifndef ACE_FLREACTOR_H
+#include "ace/pre.h"
 #define ACE_FLREACTOR_H
 
 #include "ace/Select_Reactor.h"
@@ -110,4 +111,5 @@ private:
 
 #endif /* ACE_HAS_FL */
 
+#include "ace/post.h"
 #endif /* ACE_FLREACTOR_H */
diff --git a/ace/Free_List.h b/ace/Free_List.h
index 837e43f1207..d6c51161112 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_FREE_LIST_H
+#include "ace/pre.h"
 #define ACE_FREE_LIST_H
 
 #include "ace/OS.h"
@@ -142,4 +143,5 @@ private:
 #pragma implementation ("Free_List.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_FREE_LIST_H */
diff --git a/ace/Functor.h b/ace/Functor.h
index 90418778dc3..7647f2dcf7d 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -36,6 +36,7 @@
 // ============================================================================
 
 #ifndef ACE_FUNCTOR_H
+#include "ace/pre.h"
 #define ACE_FUNCTOR_H
 
 #include "ace/ACE.h"
@@ -389,4 +390,5 @@ public:
 // Include the templates here.
 #include "ace/Functor_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_FUNCTOR_H */
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index 5cfd4a5601f..564e07e007a 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -34,6 +34,7 @@
 // ============================================================================
 
 #ifndef ACE_FUNCTOR_T_H
+#include "ace/pre.h"
 #define ACE_FUNCTOR_T_H
 
 #include "ace/Functor.h"
@@ -140,4 +141,5 @@ public:
 #pragma implementation ("Functor_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_FUNCTOR_T_H */
diff --git a/ace/Future.h b/ace/Future.h
index 70778d40ac8..e9e8ee656e4 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef ACE_FUTURE_H
+#include "ace/pre.h"
 #define ACE_FUTURE_H
 
 #include /**/ "ace/Containers.h"
@@ -323,4 +324,5 @@ private:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /* ACE_FUTURE_H */
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index a3187a59312..e42634dc88d 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_FUTURE_SET_H
+#include "ace/pre.h"
 #define ACE_FUTURE_SET_H
 
 #include /**/ "ace/Thread.h"
@@ -115,4 +116,5 @@ private:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /* ACE_FUTURE_SET_H */
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index 0b03e7458dc..b70e8f997c3 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_GET_OPT_H
+#include "ace/pre.h"
 #define ACE_GET_OPT_H
 
 #include "ace/ACE.h"
@@ -132,4 +133,5 @@ private:
 #include "ace/Get_Opt.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_GET_OPT_H */
diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h
index a38455faa3e..44d92e6adb5 100644
--- a/ace/Handle_Gobbler.h
+++ b/ace/Handle_Gobbler.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_HANDLE_GOBBLER_H
+#include "ace/pre.h"
 #define ACE_HANDLE_GOBBLER_H
 
 #include "ace/OS.h"
@@ -60,4 +61,5 @@ private:
 
 #include "ace/Handle_Gobbler.i"
 
+#include "ace/post.h"
 #endif /* ACE_HANDLE_GOBBLER_H */
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 34b0350f7c0..7a5930b0c21 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_HANDLE_SET_H
+#include "ace/pre.h"
 #define ACE_HANDLE_SET_H
 
 #include "ace/ACE.h"
@@ -211,4 +212,5 @@ private:
 #include "ace/Handle_Set.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_HANDLE_SET */
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index 5958fdfb349..6192e3df89b 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef HASH_CACHE_MAP_MANAGER_T_H
+#include "ace/pre.h"
 #define HASH_CACHE_MAP_MANAGER_T_H
 
 #include "ace/Hash_Map_Manager_T.h"
@@ -194,4 +195,5 @@ protected:
 #pragma implementation ("Hash_Cache_Map_Manager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* HASH_CACHE_MAP_MANAGER_T_H */
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index a7b455152a8..78564cebfcd 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_HASH_MAP_MANAGER_H
+#include "ace/pre.h"
 #define ACE_HASH_MAP_MANAGER_H
 
 #include "ace/OS.h"
@@ -31,4 +32,5 @@
 // Include the templates here.
 #include "ace/Hash_Map_Manager_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_HASH_MAP_MANAGER_H */
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index bed469bf7c9..13c061a8fcf 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_HASH_MAP_MANAGER_T_H
+#include "ace/pre.h"
 #define ACE_HASH_MAP_MANAGER_T_H
 
 #include "ace/OS.h"
@@ -709,4 +710,5 @@ public:
 #pragma implementation ("Hash_Map_Manager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_HASH_MAP_MANAGER_T_H */
diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h
index 044908127dd..685b416cb0b 100644
--- a/ace/Hash_Map_With_Allocator_T.h
+++ b/ace/Hash_Map_With_Allocator_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_H
+#include "ace/pre.h"
 #define ACE_HASH_MAP_WITH_ALLOCATOR_T_H
 
 #include "ace/Hash_Map_Manager.h"
@@ -100,4 +101,5 @@ public:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 
+#include "ace/post.h"
 #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 2829e2b5747..f36341d6b94 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_HIGH_RES_TIMER_H
+#include "ace/pre.h"
 #define ACE_HIGH_RES_TIMER_H
 
 #include "ace/ACE.h"
@@ -225,4 +226,5 @@ private:
 #include "ace/High_Res_Timer.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_HIGH_RES_TIMER_H */
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index ea28b37efb4..7355e9a96ca 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_INET_ADDR_H
+#include "ace/pre.h"
 #define ACE_INET_ADDR_H
 
 #include "ace/ACE.h"
@@ -201,4 +202,5 @@ private:
 #include "ace/INET_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_INET_ADDR_H */
diff --git a/ace/IOStream.h b/ace/IOStream.h
index b1dbd58c543..e70c60f84ac 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_IOSTREAM_H
+#include "ace/pre.h"
 #define ACE_IOSTREAM_H
 
 #include "ace/OS.h"
@@ -494,4 +495,5 @@ typedef ostream& (*__omanip_)(ostream&);
 // Include the templates here.
 #include "ace/IOStream_T.h"
 #endif /* !ACE_LACKS_ACE_IOSTREAM */
+#include "ace/post.h"
 #endif /* ACE_IOSTREAM_H */
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index 289fe568a60..a566d557d0b 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #ifndef ACE_IOSTREAM_T_H
+#include "ace/pre.h"
 #define ACE_IOSTREAM_T_H
 
 #include "ace/IOStream.h"
@@ -276,4 +277,5 @@ protected:
 #pragma implementation ("IOStream_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 #endif /* ACE_LACKS_ACE_IOSTREAM */
+#include "ace/post.h"
 #endif /* ACE_IOSTREAM_T_H */
diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h
index e9420b4048d..e8fa683a04a 100644
--- a/ace/IO_Cntl_Msg.h
+++ b/ace/IO_Cntl_Msg.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_IO_CNTL_MSG_H
+#include "ace/pre.h"
 #define ACE_IO_CNTL_MSG_H
 
 class ACE_Export ACE_IO_Cntl_Msg
@@ -82,4 +83,5 @@ private:
   // Return value
 };
 
+#include "ace/post.h"
 #endif /* ACE_IO_CNTL_MSG_H */
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 24774993885..d020dd9f6b6 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_IO_SAP_H
+#include "ace/pre.h"
 #define ACE_IO_SAP_H
 
 #include "ace/ACE.h"
@@ -80,4 +81,5 @@ private:
 #include "ace/IO_SAP.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_IO_SAP_H */
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index e6ee95e1d45..1160ea2cdae 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_IPC_SAP_H
+#include "ace/pre.h"
 #define ACE_IPC_SAP_H
 
 #include "ace/ACE.h"
@@ -76,4 +77,5 @@ private:
 #include "ace/IPC_SAP.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_IPC_SAP_H */
diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h
index f7838ca79dd..2ac698017a2 100644
--- a/ace/LOCK_SOCK_Acceptor.h
+++ b/ace/LOCK_SOCK_Acceptor.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCK_SOCK_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_LOCK_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
@@ -58,4 +59,5 @@ protected:
 #pragma implementation ("LOCK_SOCK_Acceptor.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_LOCK_SOCK_ACCEPTOR_H */
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index 4774f1a6578..da0b299319e 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_H
+#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_H
 
 #include "ace/SOCK.h"
@@ -72,4 +73,5 @@ private:
 #endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_H */
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index f5ee37e4667..49495889539 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
@@ -89,4 +90,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_ACCEPTOR_H */
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index ba2baaaaa6b..c143fe4fdcc 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_CODGRAM_H
+#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_CODGRAM_H
 
 #include "ace/LSOCK.h"
@@ -68,4 +69,5 @@ public:
 #endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_CODGRAM_H */
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index f3a648ffe87..d418dcd4525 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_CONNECTOR_H
 
 #include "ace/SOCK_Connector.h"
@@ -100,4 +101,5 @@ public:
 #endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_CONNECTOR_H */
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index 5de995e2fe8..a30a68f4386 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_DGRAM_H
+#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_DGRAM_H
 
 #include "ace/SOCK_Dgram.h"
@@ -65,4 +66,5 @@ public:
 #endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_DGRAM_H */
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index 3381721833c..8541fa790b4 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_SOCK_STREAM_H
+#include "ace/pre.h"
 #define ACE_LOCAL_SOCK_STREAM_H
 
 #include "ace/SOCK_Stream.h"
@@ -72,4 +73,5 @@ public:
 #endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_STREAM_H */
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 1d6c035905c..2566cbe83c3 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_NAME_SPACE_H
+#include "ace/pre.h"
 #define ACE_LOCAL_NAME_SPACE_H
 
 #include "ace/SString.h"
@@ -117,4 +118,5 @@ private:
 // Include the ACE_Local_Name_Space templates stuff at this point.
 #include "ace/Local_Name_Space_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_LOCAL_NAME_SPACE_H */
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index dc0434f8ac6..db40986eb92 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_NAME_SPACE_T_H
+#include "ace/pre.h"
 #define ACE_LOCAL_NAME_SPACE_T_H
 
 #include "ace/Name_Space.h"
@@ -249,4 +250,5 @@ private:
 #pragma implementation ("Local_Name_Space_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_LOCAL_NAME_SPACE_T_H */
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index a00b875ad78..0f0348912f1 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -45,6 +45,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_MUTEX_H
+#include "ace/pre.h"
 #define ACE_LOCAL_MUTEX_H
 
 #include "ace/Synch_T.h"
@@ -1036,4 +1037,5 @@ protected:
 #if defined (__ACE_INLINE__)
 #include "ace/Local_Tokens.i"
 #endif /* __ACE_INLINE__ */
+#include "ace/post.h"
 #endif /* ACE_LOCAL_MUTEX_H */
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 0e5fbfadbb2..7a95d3c747f 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOG_MSG_H
+#include "ace/pre.h"
 #define ACE_LOG_MSG_H
 
 // This stuff must come first to avoid problems with circular
@@ -533,4 +534,5 @@ private:
 #define THREAD ACE_THREAD_HACK
 #undef ACE_THREAD_HACK
 #endif /* ACE_THREAD_HACK */
+#include "ace/post.h"
 #endif /* ACE_LOG_MSG_H */
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index 0ddb9591534..b7a386bfe25 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_LOG_PRIORITY_H
+#include "ace/pre.h"
 #define ACE_LOG_PRIORITY_H
 
 enum ACE_Log_Priority
@@ -74,4 +75,5 @@ enum ACE_Log_Priority
   LM_ENSURE_32_BITS = 0x7FFFFFFF
 };
 
+#include "ace/post.h"
 #endif /* ACE_LOG_PRIORITY_H */
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index f2d20db19b2..a5bd01147a1 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -21,6 +21,7 @@
 #include "ace/Log_Priority.h"
 
 #ifndef ACE_LOG_RECORD_H
+#include "ace/pre.h"
 #define ACE_LOG_RECORD_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -189,4 +190,5 @@ private:
 #include "ace/Log_Record.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_LOG_RECORD_H */
diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h
index 1a3dca72018..efcdb813e3c 100644
--- a/ace/MEM_Acceptor.h
+++ b/ace/MEM_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_MEM_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
@@ -153,4 +154,5 @@ private:
 #include "ace/MEM_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_MEM_ACCEPTOR_H */
diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h
index 8d683f7d4b6..c890cc42b31 100644
--- a/ace/MEM_Addr.h
+++ b/ace/MEM_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_ADDR_H
+#include "ace/pre.h"
 #define ACE_MEM_ADDR_H
 
 #include "ace/ACE.h"
@@ -140,4 +141,5 @@ private:
 #include "ace/MEM_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_MEM_ADDR_H */
diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h
index 2a31fa278b9..a934e766c9d 100644
--- a/ace/MEM_Connector.h
+++ b/ace/MEM_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_MEM_CONNECTOR_H
 
 #include "ace/SOCK_Connector.h"
@@ -106,4 +107,5 @@ private:
 #include "ace/MEM_Connector.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_MEM_CONNECTOR_H */
diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h
index 00c567f7ac3..e17b3ed3167 100644
--- a/ace/MEM_IO.h
+++ b/ace/MEM_IO.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_IO_H
+#include "ace/pre.h"
 #define ACE_MEM_IO_H
 
 #include "ace/SOCK.h"
@@ -158,4 +159,5 @@ private:
 #include "ace/MEM_IO.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h
index 85b493013a6..ff8a67a69cf 100644
--- a/ace/MEM_SAP.h
+++ b/ace/MEM_SAP.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_SAP_H
+#include "ace/pre.h"
 #define ACE_MEM_SAP_H
 
 #include "ace/Malloc.h"
@@ -96,4 +97,5 @@ protected:
 #include "ace/MEM_SAP.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h
index 6639a254874..e2debe7488d 100644
--- a/ace/MEM_Stream.h
+++ b/ace/MEM_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_STREAM_H
+#include "ace/pre.h"
 #define ACE_MEM_STREAM_H
 
 #include "ace/MEM_IO.h"
@@ -123,4 +124,5 @@ public:
 #include "ace/MEM_Stream.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_MEM_STREAM_H */
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 9803cac67b2..4d649db9957 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MALLOC_H
+#include "ace/pre.h"
 #define ACE_MALLOC_H
 
 #include "ace/ACE.h"
@@ -500,4 +501,5 @@ protected:
 #include "ace/Malloc_T.h"
 #include "ace/Memory_Pool.h"
 
+#include "ace/post.h"
 #endif /* ACE_MALLOC_H */
diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h
index 2d4f95c2a89..2dcd1f998b1 100644
--- a/ace/Malloc_Base.h
+++ b/ace/Malloc_Base.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MALLOC_BASE_H
+#include "ace/pre.h"
 #define ACE_MALLOC_BASE_H
 
 // The definition of this class is located in Malloc.cpp.
@@ -131,4 +132,5 @@ private:
   // Must delete the <allocator_> if non-0.
 };
 
+#include "ace/post.h"
 #endif /* ACE_MALLOC_BASE_H */
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 8476f81cdf6..3a74461ce58 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MALLOC_T_H
+#include "ace/pre.h"
 #define ACE_MALLOC_T_H
 
 #include "ace/ACE.h"
@@ -613,4 +614,5 @@ public:
 #pragma implementation ("Malloc_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MALLOC_H */
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index b14ca2cf820..a69a47418a6 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MANAGED_OBJECT_H
+#include "ace/pre.h"
 #define ACE_MANAGED_OBJECT_H
 
 #include "ace/OS.h"
@@ -155,4 +156,5 @@ private:
 #pragma implementation ("Managed_Object.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MANAGED_OBJECT_H */
diff --git a/ace/Map.h b/ace/Map.h
index de488018258..35843d3a282 100644
--- a/ace/Map.h
+++ b/ace/Map.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MAP_H
+#include "ace/pre.h"
 #define ACE_MAP_H
 
 #include "ace/OS.h"
@@ -30,4 +31,5 @@
 // Include the templates here.
 #include "ace/Map_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_MAP_H */
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index a162e3dd17d..07882c12d0b 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MAP_MANAGER_H
+#include "ace/pre.h"
 #define ACE_MAP_MANAGER_H
 
 #include "ace/OS.h"
@@ -548,4 +549,5 @@ public:
 #pragma implementation ("Map_Manager.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MAP_MANAGER_H */
diff --git a/ace/Map_T.h b/ace/Map_T.h
index 88b35feef50..f873b3f2a3c 100644
--- a/ace/Map_T.h
+++ b/ace/Map_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MAP_T_H
+#include "ace/pre.h"
 #define ACE_MAP_T_H
 
 #include "ace/Map.h"
@@ -1434,4 +1435,5 @@ private:
 #pragma implementation ("Map_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MAP_T_H */
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index d7de0ca1011..f0a80990ab2 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEM_MAP_H
+#include "ace/pre.h"
 #define ACE_MEM_MAP_H
 
 #include "ace/ACE.h"
@@ -204,4 +205,5 @@ private:
 #include "ace/Mem_Map.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_MEM_MAP_H */
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 137428f7012..a7d3a962dfb 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEMORY_POOL_H
+#include "ace/pre.h"
 #define ACE_MEMORY_POOL_H
 
 #include "ace/ACE.h"
@@ -670,4 +671,5 @@ private:
 #include "ace/Memory_Pool.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_MEMORY_POOL_H */
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index ab43c9b8570..b75881a4a80 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -21,6 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #ifndef ACE_MESSAGE_BLOCK_H
+#include "ace/pre.h"
 #define ACE_MESSAGE_BLOCK_H
 
 #include "ace/Malloc.h"
@@ -838,4 +839,5 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Message_Block_T.h"
+#include "ace/post.h"
 #endif /* ACE_MESSAGE_BLOCK_H */
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index b86b1df96dc..ab6e9c07876 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MESSAGE_BLOCK_T_H
+#include "ace/pre.h"
 #define ACE_MESSAGE_BLOCK_T_H
 
 #include "ace/Message_Block.h"
@@ -78,4 +79,5 @@ private:
 #pragma implementation ("Message_Block_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MESSAGE_BLOCK_T_H */
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index d028bcb999c..066ad07c761 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MESSAGE_QUEUE_H
+#include "ace/pre.h"
 #define ACE_MESSAGE_QUEUE_H
 
 #include "ace/Message_Block.h"
@@ -471,4 +472,5 @@ private:
 #include "ace/Message_Queue.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_MESSAGE_QUEUE_H */
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index 31af1dea39a..d8bea613711 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MESSAGE_QUEUE_T_H
+#include "ace/pre.h"
 #define ACE_MESSAGE_QUEUE_T_H
 
 #include "ace/Synch.h"
@@ -704,4 +705,5 @@ public:
 #pragma implementation ("Message_Queue_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MESSAGE_QUEUE_T_H */
diff --git a/ace/Method_Object.h b/ace/Method_Object.h
index 348ccdad669..bc89e3ad153 100644
--- a/ace/Method_Object.h
+++ b/ace/Method_Object.h
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #ifndef ACE_METHOD_OBJECT_H
+#include "ace/pre.h"
 #define ACE_METHOD_OBJECT_H
 
 #include "ace/Method_Request.h"
@@ -32,4 +33,5 @@
 // postal... ;-)
 typedef ACE_Method_Request ACE_Method_Object;
 
+#include "ace/post.h"
 #endif /* ACE_METHOD_OBJECT_H */
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index 5b9ab460f0e..b1f586f7bb3 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_METHOD_REQUEST_H
+#include "ace/pre.h"
 #define ACE_METHOD_REQUEST_H
 
 #include "ace/OS.h"
@@ -58,4 +59,5 @@ protected:
   // The priority of the request.
 };
 
+#include "ace/post.h"
 #endif /* ACE_METHOD_REQUEST_H */
diff --git a/ace/Min_Max.h b/ace/Min_Max.h
index 73552f95867..b2f2aed8053 100644
--- a/ace/Min_Max.h
+++ b/ace/Min_Max.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #ifndef ACE_MIN_MAX_H
+#include "ace/pre.h"
 #define ACE_MIN_MAX_H
 
 // ============================================================================
@@ -72,4 +73,5 @@ ace_range (const T &min, const T &max, const T &val)
 # define ACE_MAX(a,b)     ace_max((a),(b))
 # define ACE_RANGE(a,b,c) ace_range((a),(b),(c))
 
+#include "ace/post.h"
 #endif  /* ACE_MIN_MAX_H */
diff --git a/ace/Module.h b/ace/Module.h
index 45463b93a05..40b6c8e7ec3 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MODULE_H
+#include "ace/pre.h"
 #define ACE_MODULE_H
 
 #include "ace/ACE.h"
@@ -190,4 +191,5 @@ private:
 #pragma implementation ("Module.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_MODULE_H */
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index 10fdc10b4ef..8a07555a224 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_MSG_WFMO_REACTOR_H
+#include "ace/pre.h"
 #define ACE_MSG_WFMO_REACTOR_H
 
 #include "ace/WFMO_Reactor.h"
@@ -104,4 +105,5 @@ protected:
 #include "ace/Msg_WFMO_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_MSG_WFMO_REACTOR_H */
diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h
index 081cbabb2a2..f840f0f8ba9 100644
--- a/ace/Multiplexor.h
+++ b/ace/Multiplexor.h
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #ifndef ACE_MULTIPLEXOR_H
+#include "ace/pre.h"
 #define ACE_MULTIPLEXOR_H
 
 #include "ace/Module.h"
@@ -78,4 +79,5 @@ public:
 #endif /* 0 */
 
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /* ACE_MULTIPLEXOR_H */
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index c2ac0943f28..51a39e17f80 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_NT_SERVICE_H
+#include "ace/pre.h"
 #define ACE_NT_SERVICE_H
 
 #include "ace/inc_user_config.h"
@@ -362,4 +363,5 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, LPTSTR *lpszArgv);
 
 #endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
 
+#include "ace/post.h"
 #endif /* ACE_SERVICE_OBJECT_H */
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index 446afbc9cc7..a3d3b657763 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_NAME_PROXY_H
+#include "ace/pre.h"
 #define ACE_NAME_PROXY_H
 
 #include "ace/INET_Addr.h"
@@ -85,4 +86,5 @@ private:
   // Pointer to ACE_Reactor (used if we are run in "reactive-mode").
 };
 
+#include "ace/post.h"
 #endif /* ACE_NAME_PROXY_H */
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index 77470882185..27560661de4 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_NAME_REQUEST_REPLY_H
+#include "ace/pre.h"
 #define ACE_NAME_REQUEST_REPLY_H
 
 #include "ace/Time_Value.h"
@@ -250,4 +251,5 @@ private:
   // Transfer buffer.
 };
 
+#include "ace/post.h"
 #endif /* ACE_NAME_REQUEST_REPLY_H */
diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index b6f627757d0..0ca98b39ca1 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_NAME_SPACE_H
+#include "ace/pre.h"
 #define ACE_NAME_SPACE_H
 
 #include "ace/ACE.h"
@@ -146,4 +147,5 @@ public:
   // Dump the state of the object
 };
 
+#include "ace/post.h"
 #endif /* ACE_NAME_SPACE_H */
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index 00e23de449f..28ba36f56ad 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_NAMING_CONTEXT_H
+#include "ace/pre.h"
 #define ACE_NAMING_CONTEXT_H
 
 #include "ace/ACE.h"
@@ -330,4 +331,5 @@ private:
 
 ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context)
 
+#include "ace/post.h"
 #endif /* ACE_NAMING_CONTEXT_H */
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 56db2053c62..3b5cf27a92c 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_OBJECT_MANAGER_H
+#include "ace/pre.h"
 #define ACE_OBJECT_MANAGER_H
 
 #include "ace/OS.h"
@@ -431,4 +432,5 @@ public:
 
 #include "ace/Managed_Object.h"
 
+#include "ace/post.h"
 #endif /* ACE_OBJECT_MANAGER_H */
diff --git a/ace/Obstack.h b/ace/Obstack.h
index a65c4ef1a8c..fc6676e65a8 100644
--- a/ace/Obstack.h
+++ b/ace/Obstack.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_OBSTACK_H
+#include "ace/pre.h"
 #define ACE_OBSTACK_H
 
 #include "ace/Malloc.h"
@@ -107,4 +108,5 @@ protected:
 #include "ace/Obstack.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_OBSTACK_H */
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index 57335f7b003..5229cd2dd68 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -25,6 +25,7 @@
 // ============================================================================
 
 #ifndef ACE_POSIX_ASYNCH_IO_H
+#include "ace/pre.h"
 #define ACE_POSIX_ASYNCH_IO_H
 
 #include "ace/OS.h"
@@ -1650,4 +1651,5 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS */
+#include "ace/post.h"
 #endif /* ACE_POSIX_ASYNCH_IO_H */
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 4ffcd5620e1..53bd4aadd29 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_POSIX_PROACTOR_H
+#include "ace/pre.h"
 #define ACE_POSIX_PROACTOR_H
 
 #include "ace/Proactor_Impl.h"
@@ -428,4 +429,5 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS */
+#include "ace/post.h"
 #endif /* ACE_POSIX_PROACTOR_H */
diff --git a/ace/Pair.h b/ace/Pair.h
index f21097240f5..6774f65ab47 100644
--- a/ace/Pair.h
+++ b/ace/Pair.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PAIR_H
+#include "ace/pre.h"
 #define ACE_PAIR_H
 
 #include "ace/OS.h"
@@ -30,4 +31,5 @@
 // Include the templates here.
 #include "ace/Pair_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_PAIR_H */
diff --git a/ace/Pair_T.h b/ace/Pair_T.h
index 7e67cbf2e4f..c5f77b61247 100644
--- a/ace/Pair_T.h
+++ b/ace/Pair_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PAIR_T_H
+#include "ace/pre.h"
 #define ACE_PAIR_T_H
 
 #include "ace/Pair.h"
@@ -105,4 +106,5 @@ protected:
 #pragma implementation ("Pair_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_PAIR_T_H */
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index 56215ef3f1f..beca56374c7 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PARSE_NODE_H
+#include "ace/pre.h"
 #define ACE_PARSE_NODE_H
 
 #include "ace/Service_Types.h"
@@ -296,4 +297,5 @@ private:
 #include "ace/Parse_Node.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_PARSE_NODE_H */
diff --git a/ace/Pipe.h b/ace/Pipe.h
index 6f2604391ff..a6c2bbe833c 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PIPE_H
+#include "ace/pre.h"
 #define ACE_PIPE_H
 
 #include "ace/ACE.h"
@@ -78,4 +79,5 @@ private:
 #include "ace/Pipe.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_PIPE_H */
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index 3857a488533..3096b4e9303 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PRIORITY_REACTOR_H
+#include "ace/pre.h"
 #define ACE_PRIORITY_REACTOR_H
 
 #include "ace/Containers.h"
@@ -90,4 +91,5 @@ private:
 #include "ace/Priority_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_PRIORITY_REACTOR_H */
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 229f4470e7d..a5b8eab1a51 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_PROACTOR_H
+#include "ace/pre.h"
 #define ACE_PROACTOR_H
 
 #include "ace/OS.h"
@@ -470,4 +471,5 @@ public:
   // Placeholder to enable compilation on non-Win32 platforms
 };
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#include "ace/post.h"
 #endif /* ACE_PROACTOR_H */
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index 4aff7941c63..8fa4a98d190 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PROACTOR_IMPL_H
+#include "ace/pre.h"
 #define ACE_PROACTOR_IMPL_H
 
 #include "ace/OS.h"
@@ -195,4 +196,5 @@ public:
 };
 
 #endif /* (ACE_WIN32 && ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */
+#include "ace/post.h"
 #endif /* ACE_PROACTOR_IMPL_H */
diff --git a/ace/Process.h b/ace/Process.h
index cbabeb00703..53fc0572388 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PROCESS_H
+#include "ace/pre.h"
 #define ACE_PROCESS_H
 
 #include "ace/OS.h"
@@ -435,4 +436,5 @@ protected:
 #include "ace/Process.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_PROCESS_H */
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index 148b7f28e1d..19063c0ef9c 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PROCESS_MANAGER_H
+#include "ace/pre.h"
 #define ACE_PROCESS_MANAGER_H
 
 #include "ace/Synch.h"
@@ -385,4 +386,5 @@ private:
 #include "ace/Process_Manager.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_PROCESS_MANAGER_H */
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 186229778e7..707370c5ed9 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_PROFILE_TIMER_H
+#include "ace/pre.h"
 #define ACE_PROFILE_TIMER_H
 
 #include "ace/ACE.h"
@@ -126,5 +127,6 @@ private:
 # include "ace/Profile_Timer.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_PROFILE_TIMER_H */
 
diff --git a/ace/QoS_Session.h b/ace/QoS_Session.h
index 0ff765d8565..6996efbe8f3 100644
--- a/ace/QoS_Session.h
+++ b/ace/QoS_Session.h
@@ -15,6 +15,7 @@
 // ===========================================================================
 
 #ifndef ACE_QOS_SESSION_H
+#include "ace/pre.h"
 #define ACE_QOS_SESSION_H
 
 #include "ace/INET_Addr.h"
@@ -116,6 +117,7 @@ protected:
 
 };
 
+#include "ace/post.h"
 #endif /* ACE_QOS_SESSION_H */
 
 
diff --git a/ace/QoS_Session_Factory.h b/ace/QoS_Session_Factory.h
index 6d4f2d20044..3c64a726b4a 100644
--- a/ace/QoS_Session_Factory.h
+++ b/ace/QoS_Session_Factory.h
@@ -15,6 +15,7 @@
 // ===========================================================================
 
 #ifndef ACE_QOS_SESSION_FACTORY_H
+#include "ace/pre.h"
 #define ACE_QOS_SESSION_FACTORY_H
 
 #include "ace/QoS_Session.h"
@@ -76,6 +77,7 @@ private:
 
 };
 
+#include "ace/post.h"
 #endif /* ACE_QOS_SESSION_FACTORY_H */
 
 
diff --git a/ace/QoS_Session_Impl.h b/ace/QoS_Session_Impl.h
index 0680f26b9af..e64e0f6fbb3 100644
--- a/ace/QoS_Session_Impl.h
+++ b/ace/QoS_Session_Impl.h
@@ -15,6 +15,7 @@
 // ===========================================================================
 
 #ifndef ACE_QOS_SESSION_IMPL_H
+#include "ace/pre.h"
 #define ACE_QOS_SESSION_IMPL_H
 
 #include "ace/QoS_Session.h"
@@ -189,4 +190,5 @@ private:
 #include "ace/QoS_Session_Impl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_QOS_SESSION_IMPL_H */
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index e2420f4e7dc..087c55049ea 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -14,6 +14,7 @@
 //    integrated in to ACE by Balachandran Natarajan <bala@cs.wustl.edu>
 // ============================================================================
 #ifndef ACE_QTREACTOR_H
+#include "ace/pre.h"
 #define ACE_QTREACTOR_H
 
 
@@ -147,4 +148,5 @@ class ACE_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor
 
 #endif /*ACE_HAS_QT */
 
+#include "ace/post.h"
 #endif /* ACE_QTREACTOR_H */
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 50306570391..4a0a92c23ac 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_RB_TREE_H
+#include "ace/pre.h"
 #define ACE_RB_TREE_H
 
 #include "ace/OS.h"
@@ -691,4 +692,5 @@ public:
 #pragma implementation ("RB_Tree.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ! defined (ACE_RB_TREE_H) */
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 463c22986a1..693b08fa6ec 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_REACTOR_H
+#include "ace/pre.h"
 #define ACE_REACTOR_H
 
 class ACE_Reactor_Impl;
@@ -558,4 +559,5 @@ protected:
 #include "ace/Reactor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_REACTOR_H */
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 812ad3e67ef..3cba6952ab0 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_REACTOR_IMPL_H
+#include "ace/pre.h"
 #define ACE_REACTOR_IMPL_H
 
 // Timer Queue is a complicated template class. A simple forward
@@ -460,4 +461,5 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#include "ace/post.h"
 #endif /* ACE_REACTOR_IMPL_H */
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 23524cd7c58..4319143d5e0 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_READ_BUFFER_H
+#include "ace/pre.h"
 #define ACE_READ_BUFFER_H
 
 #include "ace/ACE.h"
@@ -108,4 +109,5 @@ private:
 # include "ace/Read_Buffer.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_READ_BUFFER_H */
diff --git a/ace/Registry.h b/ace/Registry.h
index 5fa265720cd..d2af5161518 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_REGISTRY_H
+#include "ace/pre.h"
 #define ACE_REGISTRY_H
 
 #include "ace/OS.h"
@@ -525,4 +526,5 @@ private:
 #endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */
 
 #endif /* ACE_WIN32 */
+#include "ace/post.h"
 #endif /* ACE_REGISTRY_H */
diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h
index e84fbef7b30..9e6be5b43f7 100644
--- a/ace/Registry_Name_Space.h
+++ b/ace/Registry_Name_Space.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_REGISTRY_NAME_SPACE_H
+#include "ace/pre.h"
 #define ACE_REGISTRY_NAME_SPACE_H
 
 #include "ace/OS.h"
@@ -122,4 +123,5 @@ private:
 };
 
 #endif /* ACE_WIN32 && UNICODE */
+#include "ace/post.h"
 #endif /* ACE_REGISTRY_NAME_SPACE_H */
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index 154c57ece5c..cafb8537f1b 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_REMOTE_NAME_SPACE_H
+#include "ace/pre.h"
 #define ACE_REMOTE_NAME_SPACE_H
 
 #include "ace/ACE.h"
@@ -125,4 +126,5 @@ private:
   // Interface to Name server process for NET_LOCAL namespace.
 };
 
+#include "ace/post.h"
 #endif /* ACE_REMOTE_NAME_SPACE_H */
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index 43471a556c7..707fdd76ce7 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_REMOTE_MUTEX_H
+#include "ace/pre.h"
 #define ACE_REMOTE_MUTEX_H
 
 #include "ace/INET_Addr.h"
@@ -288,4 +289,5 @@ private:
 #include "ace/Remote_Tokens.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_REMOTE_TOKEN_H */
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 8df2949fcf6..4edd1c4cb56 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -15,6 +15,7 @@
 //============================================================================
 
 #ifndef ACE_SOCK_H
+#include "ace/pre.h"
 #define ACE_SOCK_H
 
 #include "ace/ACE.h"
@@ -128,6 +129,7 @@ protected:
 #include "ace/SOCK.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_H */
 
 
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index cf9741fa2e3..77807506bb7 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Stream.h"
@@ -155,4 +156,5 @@ private:
 #include "ace/SOCK_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_ACCEPTOR_H */
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 7eeac05577a..2d400f1321a 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_CODGRAM_H
+#include "ace/pre.h"
 #define ACE_SOCK_CODGRAM_H
 
 #include "ace/SOCK_IO.h"
@@ -64,4 +65,5 @@ public:
 #include "ace/SOCK_CODgram.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_CODGRAM_H */
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 61a51b17326..9a673384b3a 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_SOCK_CONNECTOR_H
 
 #include "ace/SOCK_Stream.h"
@@ -205,4 +206,5 @@ protected:
 #include "ace/SOCK_Connector.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_CONNECTOR_H */
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index af31f35a287..d6748a9a85e 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -15,6 +15,7 @@
 // ===========================================================================
 
 #ifndef ACE_SOCK_DGRAM_H
+#include "ace/pre.h"
 #define ACE_SOCK_DGRAM_H
 
 #include "ace/SOCK.h"
@@ -196,4 +197,5 @@ private:
 #include "ace/SOCK_Dgram.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_DGRAM_H */
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index c74416f0714..92fdb93e234 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_DGRAM_BCAST_H
+#include "ace/pre.h"
 #define ACE_SOCK_DGRAM_BCAST_H
 
 #include "ace/INET_Addr.h"
@@ -122,4 +123,5 @@ private:
 #include "ace/SOCK_Dgram_Bcast.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_DGRAM_BCAST_H */
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 86a959e41d5..5fccc4a6dfd 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_DGRAM_MCAST_H
+#include "ace/pre.h"
 #define ACE_SOCK_DGRAM_MCAST_H
 
 #include "ace/SOCK_Dgram.h"
@@ -236,4 +237,5 @@ private:
 #include "ace/SOCK_Dgram_Mcast.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_DGRAM_MCAST_H */
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index f7bb6b7454a..99328a56d3d 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_IO_H
+#include "ace/pre.h"
 #define ACE_SOCK_IO_H
 
 #include "ace/SOCK.h"
@@ -142,4 +143,5 @@ public:
 #include "ace/SOCK_IO.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index f8bcb9c32e4..7ef3d37cdb1 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SOCK_STREAM_H
+#include "ace/pre.h"
 #define ACE_SOCK_STREAM_H
 
 #include "ace/SOCK_IO.h"
@@ -131,4 +132,5 @@ public:
 #include "ace/SOCK_Stream.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SOCK_STREAM_H */
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index 1d7cac465dc..b22f2e78b01 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_H
+#include "ace/pre.h"
 #define ACE_SPIPE_H
 
 #include "ace/IPC_SAP.h"
@@ -64,4 +65,5 @@ protected:
 #include "ace/SPIPE.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SPIPE_H */
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index 031ec388c76..f0f8ab07e78 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_SPIPE_ACCEPTOR_H
 
 #include "ace/SPIPE_Stream.h"
@@ -85,4 +86,5 @@ private:
 
 };
 
+#include "ace/post.h"
 #endif /* ACE_SPIPE_ACCEPTOR_H */
diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h
index f6a1f14c7a4..6e8662f90e8 100644
--- a/ace/SPIPE_Addr.h
+++ b/ace/SPIPE_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_ADDR_H
+#include "ace/pre.h"
 #define ACE_SPIPE_ADDR_H
 
 #include "ace/Addr.h"
@@ -118,4 +119,5 @@ private:
 #include "ace/SPIPE_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SPIPE_ADDR_H */
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 4e5c2d0ff9a..1795c3788e7 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_SPIPE_CONNECTOR_H
 
 #include "ace/SPIPE_Stream.h"
@@ -97,4 +98,5 @@ public:
 #include "ace/SPIPE_Connector.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SPIPE_CONNECTOR_H */
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index eec059af87d..0028dc324ae 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SPIPE_STREAM_H
+#include "ace/pre.h"
 #define ACE_SPIPE_STREAM_H
 
 #include "ace/SPIPE.h"
@@ -138,4 +139,5 @@ private:
 #include "ace/SPIPE_Stream.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SPIPE_STREAM_H */
diff --git a/ace/SString.h b/ace/SString.h
index 87ca44b7125..f15fc632d71 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SSTRING_H
+#include "ace/pre.h"
 #define ACE_SSTRING_H
 
 #include "ace/ACE.h"
@@ -646,4 +647,5 @@ private:
 #include "ace/SString.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SSTRING_H */
diff --git a/ace/SV_Message.h b/ace/SV_Message.h
index 77b9a2c5c71..384c42e7359 100644
--- a/ace/SV_Message.h
+++ b/ace/SV_Message.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SV_MESSAGE_H
+#include "ace/pre.h"
 #define ACE_SV_MESSAGE_H
 
 #include "ace/ACE.h"
@@ -51,4 +52,5 @@ protected:
 #include "ace/SV_Message.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SV_MESSAGE_H */
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index 6a49abcf4d4..e1287096bc9 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SV_MESSAGE_QUEUE_H
+#include "ace/pre.h"
 #define ACE_SV_MESSAGE_QUEUE_H
 
 #include "ace/ACE.h"
@@ -91,4 +92,5 @@ protected:
 #include "ace/SV_Message_Queue.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SV_MESSAGE_QUEUE_H */
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index b9e36484f0a..0ed51c05258 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SV_SEMAPHORE_COMPLEX_H
+#include "ace/pre.h"
 #define ACE_SV_SEMAPHORE_COMPLEX_H
 
 #include "ace/SV_Semaphore_Simple.h"
@@ -152,4 +153,5 @@ private:
 #include "ace/SV_Semaphore_Complex.i"
 #endif
 
+#include "ace/post.h"
 #endif /* ACE_SV_SEMAPHORE_COMPLEX_H */
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 7b354f453ac..7618a9444fc 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SV_SEMAPHORE_SIMPLE_H
+#include "ace/pre.h"
 #define ACE_SV_SEMAPHORE_SIMPLE_H
 
 #include "ace/ACE.h"
@@ -148,4 +149,5 @@ protected:
 #include "ace/SV_Semaphore_Simple.i"
 #endif
 
+#include "ace/post.h"
 #endif /* _SV_SEMAPHORE_SIMPLE_H */
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index 4ebd960f1c0..6cc1df87039 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_SV_SHARED_MEMORY_H
+#include "ace/pre.h"
 #define ACE_SV_SHARED_MEMORY_H
 
 #include "ace/ACE.h"
@@ -108,4 +109,5 @@ protected:
 #include "ace/SV_Shared_Memory.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SV_SHARED_MEMORY_H */
diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h
index 24ade4a5773..5b7ad55b88f 100644
--- a/ace/Sched_Params.h
+++ b/ace/Sched_Params.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef ACE_SCHED_PARAMS_H
+#include "ace/pre.h"
 #define ACE_SCHED_PARAMS_H
 
 #include "ace/OS.h"
@@ -215,4 +216,5 @@ private:
 #include "ace/Sched_Params.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SCHED_PARAMS_H */
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 0b70607237c..445ed3fc181 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SELECT_REACTOR_H
+#include "ace/pre.h"
 #define ACE_SELECT_REACTOR_H
 
 #include "ace/Select_Reactor_T.h"
@@ -68,4 +69,5 @@ private:
 #include "ace/Select_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SELECT_REACTOR_H */
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index 721c9045ebc..5fd5d204280 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SELECT_REACTOR_BASE_H
+#include "ace/pre.h"
 #define ACE_SELECT_REACTOR_BASE_H
 
 #include "ace/Signal.h"
@@ -439,4 +440,5 @@ private:
 #include "ace/Select_Reactor_Base.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SELECT_REACTOR_BASE_H */
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index f7f186c884a..33d4825cbba 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SELECT_REACTOR_T_H
+#include "ace/pre.h"
 #define ACE_SELECT_REACTOR_T_H
 
 #include "ace/Select_Reactor_Base.h"
@@ -666,4 +667,5 @@ private:
 #pragma implementation ("Select_Reactor_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_SELECT_REACTOR_T_H */
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 0310589637e..7b15888efcc 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_SERVICE_CONFIG_H
 
 #include "ace/Service_Object.h"
@@ -447,4 +448,5 @@ private:
 // longer)
 #include "ace/Reactor.h"
 #include "ace/Svc_Conf_Tokens.h"
+#include "ace/post.h"
 #endif /* ACE_SERVICE_CONFIG_H */
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index be40a485987..f19bb1e342d 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_MANAGER_H
+#include "ace/pre.h"
 #define ACE_SERVICE_MANAGER_H
 
 #include "ace/SOCK_Stream.h"
@@ -103,4 +104,5 @@ private:
 #include "ace/Service_Manager.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* _SERVICE_MANAGER_H */
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index 4a54586ec68..d92c5496bdf 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_OBJECT_H
+#include "ace/pre.h"
 #define ACE_SERVICE_OBJECT_H
 
 #include "ace/Shared_Object.h"
@@ -163,4 +164,5 @@ private:
 #include "ace/Service_Object.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SERVICE_OBJECT_H */
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index 8618fce097d..4cc58a038fc 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_REPOSITORY_H
+#include "ace/pre.h"
 #define ACE_SERVICE_REPOSITORY_H
 
 #include "ace/Service_Types.h"
@@ -194,4 +195,5 @@ private:
 #include "ace/Service_Repository.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* _SERVICE_REPOSITORY_H */
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index 459419091bf..1335dd9892e 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SERVICE_TYPE_H
+#include "ace/pre.h"
 #define ACE_SERVICE_TYPE_H
 
 #include "ace/Service_Object.h"
@@ -184,4 +185,5 @@ private:
 #include "ace/Service_Types.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* _SERVICE_TYPE_H */
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index c62e5fbd07e..b7d81a89f11 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_MEMORY_H
+#include "ace/pre.h"
 #define ACE_SHARED_MEMORY_H
 
 #include "ace/ACE.h"
@@ -46,4 +47,5 @@ public:
   virtual int get_segment_size (void) const = 0;
   virtual ACE_HANDLE get_id (void) const = 0;
 };
+#include "ace/post.h"
 #endif /* ACE_SHARED_MEMORY_H */
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index 57e41db8a9f..7367b87aea3 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_MALLOC_MM_H
+#include "ace/pre.h"
 #define ACE_SHARED_MALLOC_MM_H
 
 #include "ace/Shared_Memory.h"
@@ -112,4 +113,5 @@ private:
 #include "ace/Shared_Memory_MM.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SHARED_MALLOC_MM_H */
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index 104175f158c..1c74b241bae 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_MALLOC_SV_H
+#include "ace/pre.h"
 #define ACE_SHARED_MALLOC_SV_H
 
 #include "ace/Shared_Memory.h"
@@ -93,4 +94,5 @@ private:
 #include "ace/Shared_Memory_SV.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SHARED_MALLOC_SV_H */
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index a73a83e8e63..5e88e65bb13 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_SHARED_OBJECT_H
+#include "ace/pre.h"
 #define ACE_SHARED_OBJECT_H
 
 #include "ace/ACE.h"
@@ -48,4 +49,5 @@ public:
 #include "ace/Shared_Object.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SHARED_OBJECT_H */
diff --git a/ace/Signal.h b/ace/Signal.h
index 12eac3a542f..d4b9aaea018 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SIGNAL_HANDLER_H
+#include "ace/pre.h"
 #define ACE_SIGNAL_HANDLER_H
 
 #if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H)
@@ -453,4 +454,5 @@ private:
 #include "ace/Signal.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SIGNAL_HANDLER_H */
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 651e41b73db..88b3a9aad93 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef ACE_SINGLETON_H
+#include "ace/pre.h"
 #define ACE_SINGLETON_H
 
 #include "ace/Synch.h"
@@ -243,4 +244,5 @@ protected:
 #pragma implementation ("Singleton.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_SINGLETON_H */
diff --git a/ace/Stats.h b/ace/Stats.h
index 4a2ca420abb..1732e4dcc0f 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_STATS_H
+#include "ace/pre.h"
 #define ACE_STATS_H
 
 #include "ace/ACE.h"
@@ -241,4 +242,5 @@ private:
 # include "ace/Stats.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ! ACE_STATS_H */
diff --git a/ace/Strategies.h b/ace/Strategies.h
index 91ff0e9a5b8..8edec9bfa25 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_STRATEGIES_H
+#include "ace/pre.h"
 #define ACE_STRATEGIES_H
 
 #include "ace/Event_Handler.h"
@@ -190,4 +191,5 @@ protected:
 #include "ace/Strategies.i"
 #endif /* __ACE_INLINE __ */
 
+#include "ace/post.h"
 #endif /* ACE_STRATEGIES_H */
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index dfa9cd95391..f8f064c8410 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_STRATEGIES_T_H
+#include "ace/pre.h"
 #define ACE_STRATEGIES_T_H
 
 #include "ace/Strategies.h"
@@ -909,4 +910,5 @@ protected:
 #pragma implementation ("Strategies_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_STRATEGIES_T_H */
diff --git a/ace/Stream.h b/ace/Stream.h
index a7c2df28139..8ffc95e4ef6 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_STREAM_H
+#include "ace/pre.h"
 #define ACE_STREAM_H
 
 #include "ace/ACE.h"
@@ -208,4 +209,5 @@ private:
 #pragma implementation ("Stream.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_STREAM_H */
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index 733f8efd614..5bde8ae0329 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #ifndef ACE_STREAM_MODULES
+#include "ace/pre.h"
 #define ACE_STREAM_MODULES
 
 template <ACE_SYNCH_DECL>
@@ -137,4 +138,5 @@ public:
 #pragma implementation ("Stream_Modules.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_STREAM_MODULES */
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 315e5f36063..9fc125de749 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SVC_CONF_H
+#include "ace/pre.h"
 #define ACE_SVC_CONF_H
 
 // Globally visible macros, type decls, and extern var decls for
@@ -107,4 +108,5 @@ typedef union
   char *ident_;
 } ACE_YYSTYPE;
 extern ACE_YYSTYPE ace_yylval;
+#include "ace/post.h"
 #endif /* ACE_SVC_CONF_H */
diff --git a/ace/Svc_Conf_Tokens.h b/ace/Svc_Conf_Tokens.h
index 760a00c9e17..259109ee07e 100644
--- a/ace/Svc_Conf_Tokens.h
+++ b/ace/Svc_Conf_Tokens.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef SVC_CONF_TOKENS_H
+#include "ace/pre.h"
 #define SVC_CONF_TOKENS_H
 
 #define ACE_DYNAMIC 257
@@ -24,4 +25,5 @@
 #define ACE_STAR 275
 #define ACE_COLON 276
 
+#include "ace/post.h"
 #endif //SVC_CONF_TOKENS_H
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index bf843a45e2f..d5e8fbfb95c 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SVC_HANDLER_H
+#include "ace/pre.h"
 #define ACE_SVC_HANDLER_H
 
 // Forward decls.
@@ -280,4 +281,5 @@ protected:
 #pragma implementation ("Svc_Handler.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_SVC_HANDLER_H */
diff --git a/ace/Synch.h b/ace/Synch.h
index 5616ae26c42..5208412ed8d 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef ACE_SYNCH_H
+#include "ace/pre.h"
 #define ACE_SYNCH_H
 
 #include "ace/ACE.h"
@@ -1696,4 +1697,5 @@ public:
   void dump (void) const {}
 };
 
+#include "ace/post.h"
 #endif /* ACE_SYNCH_H */
diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h
index 94fb15a9c74..bf7a529fd67 100644
--- a/ace/Synch_Options.h
+++ b/ace/Synch_Options.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SYNCH_OPTIONS_H
+#include "ace/pre.h"
 #define ACE_SYNCH_OPTIONS_H
 
 #include "ace/ACE.h"
@@ -144,4 +145,5 @@ private:
 #include "ace/Synch_Options.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SYNCH_OPTIONS_H */
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 1cb502ea48f..8bafe6f1d3c 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SYNCH_T_H
+#include "ace/pre.h"
 #define ACE_SYNCH_T_H
 
 #include "ace/Event_Handler.h"
@@ -963,4 +964,5 @@ public:
 #pragma implementation ("Synch_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_SYNCH_T_H */
diff --git a/ace/System_Time.h b/ace/System_Time.h
index 7dfdd9e1e02..8ec32980f27 100644
--- a/ace/System_Time.h
+++ b/ace/System_Time.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_SYSTEM_TIME_H
+#include "ace/pre.h"
 #define ACE_SYSTEM_TIME_H
 
 #include "ace/OS.h"
@@ -79,4 +80,5 @@ private:
   // Pointer to delta time kept in shared memory.
 };
 
+#include "ace/post.h"
 #endif /* ACE_SYSTEM_TIME_H */
diff --git a/ace/TLI.h b/ace/TLI.h
index c81a82371ea..132dd8a47e7 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TLI_H
+#include "ace/pre.h"
 #define ACE_TLI_H
 
 #include "ace/IPC_SAP.h"
@@ -100,4 +101,5 @@ private:
 #include "ace/TLI.i"
 
 #endif /* ACE_HAS_TLI */
+#include "ace/post.h"
 #endif /* ACE_TLI_H */
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 20ce2575daa..08d05e805ea 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TLI_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_TLI_ACCEPTOR_H
 
 #include "ace/TLI.h"
@@ -115,4 +116,5 @@ private:
 #include "ace/TLI_Acceptor.i"
 
 #endif /* ACE_HAS_TLI */
+#include "ace/post.h"
 #endif /* ACE_TLI_ACCEPTOR_H */
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 7b4d913f6d7..2ebc8ed3c8e 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TLI_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_TLI_CONNECTOR_H
 
 #include "ace/TLI_Stream.h"
@@ -112,4 +113,5 @@ public:
 #include "ace/TLI_Connector.i"
 
 #endif /* ACE_HAS_TLI */
+#include "ace/post.h"
 #endif /* ACE_TLI_CONNECTOR_H */
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index 54c808e96ac..2d48dd71d77 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TLI_STREAM_H
+#include "ace/pre.h"
 #define ACE_TLI_STREAM_H
 
 #include "ace/TLI.h"
@@ -98,4 +99,5 @@ private:
 #include "ace/TLI_Stream.i"
 
 #endif /* ACE_HAS_TLI */
+#include "ace/post.h"
 #endif /* ACE_TLI_STREAM_H */
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index b6c7950c32e..e5b0dcce11b 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -30,6 +30,7 @@
 // ============================================================================
 
 #ifndef ACE_TP_REACTOR_H
+#include "ace/pre.h"
 #define ACE_TP_REACTOR_H
 
 #include "ace/Select_Reactor.h"
@@ -201,4 +202,5 @@ private:
 #include "ace/TP_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_TP_REACTOR_H */
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index 404ffaa9b12..b66cd26e644 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_TTY_IO_H
+#include "ace/pre.h"
 #define ACE_TTY_IO_H
 
 #include "ace/OS.h"
@@ -70,4 +71,5 @@ public:
 #endif /* ACE_NEEDS_DEV_IO_CONVERSION */
 };
 
+#include "ace/post.h"
 #endif /* ACE_TTY_IO_H */
diff --git a/ace/Task.h b/ace/Task.h
index aee510d9901..9e0fd7470ea 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TASK_H
+#include "ace/pre.h"
 #define ACE_TASK_H
 
 #include "ace/Service_Object.h"
@@ -240,4 +241,5 @@ private:
 // Include the ACE_Task templates classes at this point.
 #include "ace/Task_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_TASK_H */
diff --git a/ace/Task_T.h b/ace/Task_T.h
index 673c75da2ac..ffbdb7fe49b 100644
--- a/ace/Task_T.h
+++ b/ace/Task_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TASK_T_H
+#include "ace/pre.h"
 #define ACE_TASK_T_H
 
 #include "ace/Message_Queue.h"
@@ -162,4 +163,5 @@ private:
 #pragma implementation ("Task_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TASK_T_H */
diff --git a/ace/Thread.h b/ace/Thread.h
index a4d5dba6a29..ab99ea293af 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_THREAD_H
+#include "ace/pre.h"
 #define ACE_THREAD_H
 
 #include "ace/ACE.h"
@@ -223,4 +224,5 @@ private:
 #if defined (__ACE_INLINE__)
 #include "ace/Thread.i"
 #endif /* __ACE_INLINE__ */
+#include "ace/post.h"
 #endif /* ACE_THREAD_H */
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index e4a14876f17..5db1095a063 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_THREAD_MANAGER_H
+#include "ace/pre.h"
 #define ACE_THREAD_MANAGER_H
 
 #include "ace/Thread.h"
@@ -906,4 +907,5 @@ typedef ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX> ACE_THREAD_MANAGER_SI
 #include "ace/Thread_Manager.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_THREAD_MANAGER_H */
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index 90e3f3b3e10..81973bf9430 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #ifndef ACE_TIME_REQUEST_REPLY_H
+#include "ace/pre.h"
 #define ACE_TIME_REQUEST_REPLY_H
 
 #include "ace/Time_Value.h"
@@ -120,4 +121,5 @@ private:
 };
 
 
+#include "ace/post.h"
 #endif /* ACE_TIME_REQUEST_REPLY_H */
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 5f085c020c0..4f1913ed47d 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIME_VALUE_H
+#include "ace/pre.h"
 #define ACE_TIME_VALUE_H
 
 // This file is no longer used and is only here due to backwards
@@ -26,4 +27,5 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/post.h"
 #endif /* ACE_TIME_VALUE */
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index b5728a32ece..9c916e7c34d 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -42,6 +42,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMEPROBE_H
+#include "ace/pre.h"
 #define ACE_TIMEPROBE_H
 
 #include "ace/OS.h"
@@ -177,4 +178,5 @@ ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE);
 #  define ACE_FUNCTION_TIMEPROBE(X)
 
 #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */
+#include "ace/post.h"
 #endif /* ACE_TIMEPROBE_H */
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index 1e97bb1cd45..9a6cbd41376 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #ifndef ACE_TIMEPROBE_T_H
+#include "ace/pre.h"
 #define ACE_TIMEPROBE_T_H
 
 #include "ace/OS.h"
@@ -170,4 +171,5 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* ACE_COMPILE_TIMEPROBES */
+#include "ace/post.h"
 #endif /* ACE_TIMEPROBE_T_H */
diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h
index 6d9b73740ca..c511414e39d 100644
--- a/ace/Timer_Hash.h
+++ b/ace/Timer_Hash.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HASH_H
+#include "ace/pre.h"
 #define ACE_TIMER_HASH_H
 
 #include "ace/Timer_Hash_T.h"
@@ -69,4 +70,5 @@ typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
                                   ACE_Hash_Timer_Heap>
         ACE_Timer_Hash_Heap_Iterator;
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_HASH_H */
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 8c5580ea9fa..763d4312d56 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HASH_T_H
+#include "ace/pre.h"
 #define ACE_TIMER_HASH_T_H
 
 #include "ace/Timer_Queue_T.h"
@@ -259,4 +260,5 @@ private:
 #pragma implementation ("Timer_Hash_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_HASH_T_H */
diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index 2e37725a6cb..0ad4ceb403c 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HEAP_H
+#include "ace/pre.h"
 #define ACE_TIMER_HEAP_H
 
 #include "ace/Timer_Heap_T.h"
@@ -36,4 +37,5 @@ typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
                                   ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Heap_Iterator;
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_HEAP_H */
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index b025d41dc5d..b21f71dcb5c 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_HEAP_T_H
+#include "ace/pre.h"
 #define ACE_TIMER_HEAP_T_H
 
 #include "ace/Timer_Queue_T.h"
@@ -280,4 +281,5 @@ private:
 #pragma implementation ("Timer_Heap_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_HEAP_T_H */
diff --git a/ace/Timer_List.h b/ace/Timer_List.h
index 570b1a8834c..7cee4ab95ca 100644
--- a/ace/Timer_List.h
+++ b/ace/Timer_List.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_LIST_H
+#include "ace/pre.h"
 #define ACE_TIMER_LIST_H
 
 #include "ace/Timer_List_T.h"
@@ -36,4 +37,5 @@ typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *,
                                   ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_List_Iterator;
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_LIST_H */
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index df633675668..5b1dfe79a72 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_LIST_T_H
+#include "ace/pre.h"
 #define ACE_TIMER_LIST_T_H
 
 #include "ace/Timer_Queue_T.h"
@@ -200,4 +201,5 @@ private:
 #pragma implementation ("Timer_List_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_LIST_T_H */
diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h
index e7ee550300d..177c9f79c4b 100644
--- a/ace/Timer_Queue.h
+++ b/ace/Timer_Queue.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_QUEUE_H
+#include "ace/pre.h"
 #define ACE_TIMER_QUEUE_H
 
 #include "ace/Synch.h"
@@ -41,4 +42,5 @@ typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *,
                                    ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Queue_Iterator;
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_QUEUE_H */
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index 24ce3257d5d..4e3906b05a4 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_QUEUE_T_H
+#include "ace/pre.h"
 #define ACE_TIMER_QUEUE_T_H
 
 #include "ace/Free_List.h"
@@ -388,4 +389,5 @@ public:
 #pragma implementation ("Timer_Queue_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_QUEUE_T_H */
diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h
index dc5bae5829e..be18550a8ce 100644
--- a/ace/Timer_Wheel.h
+++ b/ace/Timer_Wheel.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_WHEEL_H
+#include "ace/pre.h"
 #define ACE_TIMER_WHEEL_H
 
 #include "ace/Timer_Wheel_T.h"
@@ -37,4 +38,5 @@ typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *,
                                    ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Wheel_Iterator;
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_WHEEL_H */
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index 6de5208bc43..d2a68e0cee3 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TIMER_WHEEL_T_H
+#include "ace/pre.h"
 #define ACE_TIMER_WHEEL_T_H
 
 #include "ace/Timer_Queue_T.h"
@@ -224,4 +225,5 @@ private:
 #pragma implementation ("Timer_Wheel_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TIMER_WHEEL_T_H */
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index 9606315cae5..82e88b4172c 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef ACE_TKREACTOR_H
+#include "ace/pre.h"
 #define ACE_TKREACTOR_H
 
 #include "ace/Select_Reactor.h"
@@ -122,4 +123,5 @@ private:
 };
 
 #endif /* ACE_HAS_TK */
+#include "ace/post.h"
 #endif /* ACE_TK_REACTOR_H */
diff --git a/ace/Token.h b/ace/Token.h
index f88d53fee7b..32d7d9838d2 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_H
+#include "ace/pre.h"
 #define ACE_TOKEN_H
 
 #include "ace/Synch.h"
@@ -286,4 +287,5 @@ public:
   int release (void) { ACE_NOTSUP_RETURN (-1); }
 };
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /* ACE_TOKEN_H */
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index e85b45e76c4..22c638ff6f5 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -25,6 +25,7 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_COLLECTION_H
+#include "ace/pre.h"
 #define ACE_TOKEN_COLLECTION_H
 
 #include "ace/Map_Manager.h"
@@ -215,4 +216,5 @@ protected:
 #include "ace/Token_Collection.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_TOKEN_COLLECTION_H */
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index 1ad9aacf5e4..5b3dad386b9 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_INVARIANTS_H
+#include "ace/pre.h"
 #define ACE_TOKEN_INVARIANTS_H
 
 #include "ace/Synch.h"
@@ -220,4 +221,5 @@ protected:
 #include "ace/Token_Invariants.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_TOKEN_INVARIANTS_H */
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index 31a49a39453..49393c01ce3 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_MANAGER_H
+#include "ace/pre.h"
 #define ACE_TOKEN_MANAGER_H
 
 #include "ace/Synch.h"
@@ -122,4 +123,5 @@ private:
 #include "ace/Token_Manager.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_TOKEN_MANAGER_H */
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index 28501c63678..5ab739dfe6c 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #ifndef ACE_TOKEN_REQUEST_REPLY_H
+#include "ace/pre.h"
 #define ACE_TOKEN_REQUEST_REPLY_H
 
 #include "ace/Local_Tokens.h"
@@ -230,4 +231,5 @@ private:
 #include "ace/Token_Request_Reply.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_TOKEN_REQUEST_REPLY_H */
diff --git a/ace/Trace.h b/ace/Trace.h
index 93f225c88e7..a836a42d7b4 100644
--- a/ace/Trace.h
+++ b/ace/Trace.h
@@ -16,6 +16,7 @@
 
 
 #ifndef ACE_TRACE_H
+#include "ace/pre.h"
 #define ACE_TRACE_H
 
 #include "ace/OS.h"
@@ -81,4 +82,5 @@ private:
   };
 };
 
+#include "ace/post.h"
 #endif /* ACE_TRACE_H */
diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h
index 5929b7e7a11..f5b86ed3a61 100644
--- a/ace/Typed_SV_Message.h
+++ b/ace/Typed_SV_Message.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TYPED_SV_MESSAGE_H
+#include "ace/pre.h"
 #define ACE_TYPED_SV_MESSAGE_H
 
 #include "ace/ACE.h"
@@ -89,4 +90,5 @@ private:
 #pragma implementation ("Typed_SV_Message.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TYPED_SV_MESSAGE_H */
diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h
index cd791c1f119..b00df1ea3ce 100644
--- a/ace/Typed_SV_Message_Queue.h
+++ b/ace/Typed_SV_Message_Queue.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_TYPED_MESSAGE_QUEUE_H
+#include "ace/pre.h"
 #define ACE_TYPED_MESSAGE_QUEUE_H
 
 #include "ace/SV_Message_Queue.h"
@@ -80,4 +81,5 @@ private:
 #pragma implementation ("Typed_SV_Message_Queue.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_TYPED_MESSAGE_QUEUE_H */
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index 12c7967ddfc..26137ef7316 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_UNIX_ADDR_H
+#include "ace/pre.h"
 #define ACE_UNIX_ADDR_H
 
 #include "ace/Addr.h"
@@ -92,4 +93,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+#include "ace/post.h"
 #endif /* ACE_UNIX_ADDR_H */
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index c14fedca21d..f82222524e0 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_ACCEPTOR_H
+#include "ace/pre.h"
 #define ACE_UPIPE_ACCEPTOR_H
 
 #include "ace/UPIPE_Stream.h"
@@ -86,4 +87,5 @@ private:
 #endif
 
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /* ACE_UPIPE_ACCEPTOR_H */
diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h
index 82c118480a7..8b8de4b9d81 100644
--- a/ace/UPIPE_Addr.h
+++ b/ace/UPIPE_Addr.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_ADDR_H
+#include "ace/pre.h"
 #define ACE_UPIPE_ADDR_H
 
 #include "ace/SPIPE_Addr.h"
@@ -41,4 +42,5 @@ public:
   // = Same interface as <ACE_SPIPE_Addr>.
 };
 #endif /* 0 */
+#include "ace/post.h"
 #endif /* ACE_UPIPE_ADDR_H */
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index cae79c148ac..763b8870fb8 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_CONNECTOR_H
+#include "ace/pre.h"
 #define ACE_UPIPE_CONNECTOR_H
 
 #include "ace/UPIPE_Stream.h"
@@ -103,4 +104,5 @@ public:
 #endif
 
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /* ACE_UPIPE_CONNECTOR_H */
diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h
index 61618371e46..341b3b476ff 100644
--- a/ace/UPIPE_Stream.h
+++ b/ace/UPIPE_Stream.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_UPIPE_STREAM_H
+#include "ace/pre.h"
 #define ACE_UPIPE_STREAM_H
 
 #include "ace/Stream.h"
@@ -131,4 +132,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
+#include "ace/post.h"
 #endif /*ACE_UPIPE_STREAM_H */
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 0e720ab9f5e..88d6f0ae9b8 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_WFMO_REACTOR_H
+#include "ace/pre.h"
 #define ACE_WFMO_REACTOR_H
 
 #include "ace/Signal.h"
@@ -1164,4 +1165,5 @@ int WSAEnumNetworkEvents (SOCKET s,
 #if defined (__ACE_INLINE__)
 #include "ace/WFMO_Reactor.i"
 #endif /* __ACE_INLINE__ */
+#include "ace/post.h"
 #endif /* ACE_WFMO_REACTOR_H */
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index 18e1eb5d3d4..659cfb5eb82 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -28,6 +28,7 @@
 // ============================================================================
 
 #ifndef ACE_WIN32_ASYNCH_IO_H
+#include "ace/pre.h"
 #define ACE_WIN32_ASYNCH_IO_H
 
 #include "ace/OS.h"
@@ -1209,4 +1210,5 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
+#include "ace/post.h"
 #endif /* ACE_WIN32_ASYNCH_IO_H */
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
index ef1f03c8352..31aaee9308e 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_WIN32_PROACTOR_H
+#include "ace/pre.h"
 #define ACE_WIN32_PROACTOR_H
 
 #include "ace/OS.h"
@@ -263,4 +264,5 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_WIN32 */
+#include "ace/post.h"
 #endif /* ACE_PROACTOR_H */
diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h
index a70e3d76543..4c6d3502c57 100644
--- a/ace/XTI_ATM_Mcast.h
+++ b/ace/XTI_ATM_Mcast.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_XTI_ATM_MCAST_H
+#include "ace/pre.h"
 #define ACE_XTI_ATM_MCAST_H
 
 #include "ace/TLI_Connector.h"
@@ -118,4 +119,5 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_XTI_ATM */
+#include "ace/post.h"
 #endif /* ACE_XTI_ATM_MCAST_H */
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index cac08cd0f70..cd8eda4e440 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef ACE_XTREACTOR_H
+#include "ace/pre.h"
 #define ACE_XTREACTOR_H
 
 #include "ace/Select_Reactor.h"
@@ -128,4 +129,5 @@ private:
 };
 #endif /* ACE_HAS_XT */
 
+#include "ace/post.h"
 #endif /* ACE_XTREACTOR_H */
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 6c5ce048a95..68308c40c1c 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_WINCE_H
+#include "ace/pre.h"
 #define ACE_CONFIG_WINCE_H
 
 #if !defined (ACE_HAS_WINCE)
@@ -201,4 +202,5 @@ inline int isprint (const char c)
   return (c < 0x20 || c > 0x7e ? 0 : 1);
 }
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_WINCE_H */
diff --git a/ace/config-aix-3.2.5.h b/ace/config-aix-3.2.5.h
index 49438015dda..7e90c04b453 100644
--- a/ace/config-aix-3.2.5.h
+++ b/ace/config-aix-3.2.5.h
@@ -5,6 +5,7 @@
 // with xlC.  Thanks to Bob Olson <olson@mcs.anl.gov> for this.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 /*#define ACE_HAS_PTHREADS*/
@@ -43,4 +44,5 @@
 // Platform supports STREAMS.
 /*#define ACE_HAS_STREAMS*/
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 0c8ae73d1c6..e7489e8fb76 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -6,6 +6,7 @@
 // g++/egcs.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if defined (__xlC__) || (__IBMCPP__)
@@ -265,4 +266,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 03b0f0c01f0..e11f3d575bb 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -8,6 +8,7 @@
 // It uses the Chorus POSIX threads interface.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define CHORUS 3.1b
@@ -135,4 +136,5 @@
 // Needed to wait for "processes" to exit.
 #include <am/await.h>
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-cray.h b/ace/config-cray.h
index 08287610452..1ffc9f33352 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_CRAY_H
+#include "ace/pre.h"
 #define ACE_CONFIG_CRAY_H
 
 /*
@@ -237,4 +238,5 @@
 
 /* #define ACE_HAS_SYS_ERRLIST */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_CRAY_H */
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
index 206e44be441..3a06ed7f261 100644
--- a/ace/config-cxx-common.h
+++ b/ace/config-cxx-common.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef ACE_CXX_COMMON_H
+#include "ace/pre.h"
 #define ACE_CXX_COMMON_H
 
 #if !defined (ACE_CONFIG_INCLUDE_CXX_COMMON)
@@ -77,4 +78,5 @@
 # error ace/config-cxx-common.h can only be used with Compaq CXX!
 #endif /* ! __DECCXX */
 
+#include "ace/post.h"
 #endif /* ACE_CXX_COMMON_H */
diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h
index c3dea95a0d5..5e3d2d41fc2 100644
--- a/ace/config-cygwin32-common.h
+++ b/ace/config-cygwin32-common.h
@@ -8,6 +8,7 @@
 // and configures based on those.
 
 #ifndef ACE_CYGWIN32_COMMON_H
+#include "ace/pre.h"
 #define ACE_CYGWIN32_COMMON_H
 
 #define CYGWIN32
@@ -170,4 +171,5 @@
 
 #define ACE_LACKS_MKFIFO
 
+#include "ace/post.h"
 #endif /* ACE_LINUX_COMMON_H */
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index 77df5480be4..d036d664cdc 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -5,10 +5,12 @@
 // platforms using GNU C++.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-cygwin32-common.h"
 
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index 35a6b0b68a4..4d65ec2b111 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -5,6 +5,7 @@
 // 4.11 platforms using the EPC compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_DGUX
@@ -190,4 +191,5 @@
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_IDTYPE_T
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 740777122b3..c347bf9be27 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -5,6 +5,7 @@
 // 4.x platforms using the Green Hills Multi C++ compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_DGUX
@@ -209,4 +210,5 @@
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index fab6307420a..7e5d2ba6eae 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -7,6 +7,7 @@
 // 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 <osreldate.h>
@@ -187,4 +188,5 @@ extern "C" { char * cuserid (char *s); }
 #define TCGETS TIOCGETA
 #define TCSETS TIOCSETA
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index a948c2a3635..60c2a5c5e8b 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -7,6 +7,7 @@
 // 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 <osreldate.h>
@@ -192,4 +193,5 @@ ange */
 #define TCGETS TIOCGETA
 #define TCSETS TIOCSETA
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_FREEBSD_H */
diff --git a/ace/config-fsu-pthread.h b/ace/config-fsu-pthread.h
index 62400b91f57..f0507540b13 100644
--- a/ace/config-fsu-pthread.h
+++ b/ace/config-fsu-pthread.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_FSU_PTHREAD_H
+#include "ace/pre.h"
 #define ACE_CONFIG_FSU_PTHREAD_H
 
 #define ACE_LACKS_CONST_TIMESPEC_PTR
@@ -54,4 +55,5 @@ struct sched_param
   int prio;
 };
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_FSU_PTHREAD_H */
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index fb7204f77fa..5da6df51ece 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -6,6 +6,7 @@
 // to all g++ platforms, including egcs.
 
 #ifndef ACE_GNUG_COMMON_H
+#include "ace/pre.h"
 #define ACE_GNUG_COMMON_H
 
 #if __GNUC__ > 2  ||  ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)  || \
@@ -95,4 +96,5 @@
 #define ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
+#include "ace/post.h"
 #endif /* ACE_GNUG_COMMON_H */
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
index 9b843ae78d6..cd042e64595 100644
--- a/ace/config-ghs-common.h
+++ b/ace/config-ghs-common.h
@@ -6,6 +6,7 @@
 // to all Green Hills platforms.
 
 #ifndef ACE_GHS_COMMON_H
+#include "ace/pre.h"
 #define ACE_GHS_COMMON_H
 
 #if !defined (ACE_CONFIG_INCLUDE_GHS_COMMON)
@@ -40,4 +41,5 @@
 # error ace/config-ghs-common.h can only be used with Green Hills compilers!
 #endif /* ! ghs */
 
+#include "ace/post.h"
 #endif /* ACE_GHS_COMMON_H */
diff --git a/ace/config-hpux-10.x-g++.h b/ace/config-hpux-10.x-g++.h
index 06105880292..662f2500aeb 100644
--- a/ace/config-hpux-10.x-g++.h
+++ b/ace/config-hpux-10.x-g++.h
@@ -5,6 +5,7 @@
 // platforms running HP/UX 10.x using G++.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
@@ -23,4 +24,5 @@
 
 #include "ace/config-hpux-10.x.h"
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 8a90994f16f..70297439e13 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -7,6 +7,7 @@
 // HP-UX file (config-hpux-10.x.h) for the platform information.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // There are 2 compiler-specific sections, plus a 3rd for common to both.
@@ -119,4 +120,5 @@
 
 #include "ace/config-hpux-10.x.h"	/* OS information */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 9cca11c9278..5608d86d317 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -17,6 +17,7 @@
 #define HPUX_10
 
 #ifndef _HPUX_SOURCE
+#include "ace/pre.h"
 #define _HPUX_SOURCE
 #endif
 
@@ -247,4 +248,5 @@ extern int h_errno;     /* This isn't declared in a header file on HP-UX */
 // To build with tracing enabled, make sure ACE_NTRACE is not defined
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
+#include "ace/post.h"
 #endif /* ACE_NTRACE */
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index cfe43a4d3b7..23ac7e5b803 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -5,6 +5,7 @@
 // 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
 
 #if defined (__GNUG__)
@@ -394,4 +395,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-hpux-9.x-orbix.h b/ace/config-hpux-9.x-orbix.h
index d2f5ee56993..e60d854e607 100644
--- a/ace/config-hpux-9.x-orbix.h
+++ b/ace/config-hpux-9.x-orbix.h
@@ -5,6 +5,7 @@
 // platforms running HP/UX 9.x.  Dave added Orbix stuff
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // Compiling for HPUX.
@@ -101,4 +102,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-hpux-9.x.h b/ace/config-hpux-9.x.h
index be52880bc9d..873e68682d1 100644
--- a/ace/config-hpux-9.x.h
+++ b/ace/config-hpux-9.x.h
@@ -5,6 +5,7 @@
 // for HP platforms running HP/UX 9.x.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // Compiling for HPUX.
@@ -100,4 +101,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index 3c9e36e8b0f..1c2fc55e23d 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -17,6 +17,7 @@
 #define HPUX_11
 
 #ifndef _HPUX_SOURCE
+#include "ace/pre.h"
 #define _HPUX_SOURCE
 #endif
 
@@ -252,4 +253,5 @@
 // To build with tracing enabled, make sure ACE_NTRACE is not defined
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
+#include "ace/post.h"
 #endif /* ACE_NTRACE */
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index 6b536810195..554652ede15 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -6,6 +6,7 @@
 // and libg++ v2.6.x.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // Platform supports STREAM pipes (note that this is disabled by
@@ -64,4 +65,5 @@
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index 373335cdf03..db27c89fc15 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -5,6 +5,7 @@
 // Indigo2EX running Irix 5.3 platform using the GNU C++ Compiler
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
@@ -115,4 +116,5 @@
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index 5cbf0ac5782..aedaf586c0e 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -6,6 +6,7 @@
 // the SGI C++ Compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define IRIX5
@@ -118,4 +119,5 @@
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index b86cf57cf74..7e4483c0bf6 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -5,6 +5,7 @@
 // Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
@@ -49,4 +50,5 @@
 //#define ACE_HAS_SYS_SIGLIST
 
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-kcc.h b/ace/config-irix6.x-kcc.h
index a622e6a2046..b2f28063028 100644
--- a/ace/config-irix6.x-kcc.h
+++ b/ace/config-irix6.x-kcc.h
@@ -5,6 +5,7 @@
 // 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/config-kcc-common.h"
@@ -54,4 +55,5 @@
 //#define ACE_HAS_SYS_SIGLIST
 
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index 6990d608a9d..6a960e61528 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -19,6 +19,7 @@
 // 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 this file to set the _MIPS_SIM*ABI* macros.
@@ -91,4 +92,5 @@
 # define ACE_CC_BETA_VERSION  (0)
 #endif /* _COMPILER_VERSION */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_IRIX6X_NTHR_H */
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index 3b510047f89..48eeb4453b7 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -5,6 +5,7 @@
 // installed.
 
 #ifndef ACE_CONFIG_IRIX6X_H
+#include "ace/pre.h"
 #define ACE_CONFIG_IRIX6X_H
 
 // Include basic (non-threaded) configuration
@@ -49,4 +50,5 @@
   #define ACE_MT_SAFE 1
 #endif /* ACE_MT_SAFE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_IRIX6X_H */
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index fc53f3847aa..215f8693b31 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -22,6 +22,7 @@
 //
 
 #ifndef ACE_KCC_COMMON_H
+#include "ace/pre.h"
 #define ACE_KCC_COMMON_H
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
@@ -70,4 +71,5 @@
 
 //#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
 
+#include "ace/post.h"
 #endif /* ACE_KCC_COMMON_H */
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 8cc964460f4..820ac9ffc84 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -8,6 +8,7 @@
 // and configures based on those.
 
 #ifndef ACE_LINUX_COMMON_H
+#include "ace/pre.h"
 #define ACE_LINUX_COMMON_H
 
 #define ACE_HAS_BYTESEX_H
@@ -234,4 +235,5 @@
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_LINUX_COMMON_H */
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index 57eca1a4662..da15ed8da7d 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -26,6 +26,7 @@
         however.) */
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
@@ -69,4 +70,5 @@
 
 #include /**/ <pthread.h>
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h
index 4581ecc1507..bf3a1c821d0 100644
--- a/ace/config-linux-pthread.h
+++ b/ace/config-linux-pthread.h
@@ -5,6 +5,7 @@
 // platforms using GNU C++ and the MIT threads package.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
@@ -28,4 +29,5 @@
 #define _MIT_POSIX_THREADS 1
 #include /**/ <pthread/mit/pthread.h>
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-linux.h b/ace/config-linux.h
index b73a53589e1..ffc20c77cff 100644
--- a/ace/config-linux.h
+++ b/ace/config-linux.h
@@ -5,6 +5,7 @@
 // platforms using GNU C++.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
@@ -12,4 +13,5 @@
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 09a58ad701d..9bc2c0f4304 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -11,6 +11,7 @@
 // processes
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -169,4 +170,5 @@ extern "C"
   int putenv (const char *);
 }
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index bdb1a64a02c..6e69f6b2202 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -5,6 +5,7 @@
 // 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS).
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -222,4 +223,5 @@ struct ip_mreq
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-minimal.h b/ace/config-minimal.h
index d3e262040fd..548beda70a5 100644
--- a/ace/config-minimal.h
+++ b/ace/config-minimal.h
@@ -5,6 +5,7 @@
 // ACE_OS adaptation layer.
 
 #ifndef ACE_CONFIG_MINIMAL_H
+#include "ace/pre.h"
 #define ACE_CONFIG_MINIMAL_H
 
 #define ACE_HAS_MINIMAL_ACE_OS
@@ -34,4 +35,5 @@
 #endif /* ACE_ERROR */
 #define ACE_ERROR(x)
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_MINIMAL_H */
diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h
index f3341669a74..73f8499c63d 100644
--- a/ace/config-mit-pthread.h
+++ b/ace/config-mit-pthread.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_MIT_PTHREAD_H
+#include "ace/pre.h"
 #define ACE_CONFIG_MIT_PTHREAD_H
 
 // Platform uses int for select() rather than fd_set.
@@ -48,4 +49,5 @@
 #define ACE_HAS_WRITE_TIMEDWAIT
 #define ACE_HAS_WRITEV_TIMEDWAIT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_MIT_PTHREAD_H */
diff --git a/ace/config-mklinux.h b/ace/config-mklinux.h
index ba3065aeccb..6e72ac73c0a 100644
--- a/ace/config-mklinux.h
+++ b/ace/config-mklinux.h
@@ -5,6 +5,7 @@
 // platforms using GNU C++.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
@@ -15,4 +16,5 @@
 #undef ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SIZET_SOCKET_LEN
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index cd1e03faf4c..b6ac80ac34a 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -4,6 +4,7 @@
 // Config file for MVS with OpenEdition
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // The following #defines are hacks to get around things
@@ -113,4 +114,5 @@
 
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index d179c727466..4e87c8e8f5d 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -7,6 +7,7 @@
 // platforms using GNU g++.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -174,4 +175,5 @@ ange */
 
 #define ACE_LACKS_GETHOSTENT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
index 92cfa2a8110..d1ce13c264a 100644
--- a/ace/config-osf1-3.2.h
+++ b/ace/config-osf1-3.2.h
@@ -5,6 +5,7 @@
 // platforms with the DEC 5.1 C++ compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_SETSCHED
@@ -183,4 +184,5 @@ extern "C" pid_t getpgid (pid_t);
 #define ACE_PAGE_SIZE 8192
 #define ACE_HAS_GETPAGESIZE
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index ae9eff79bdd..93b98a77691 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -15,6 +15,7 @@
 // by uname -a.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if !defined (__ACE_INLINE__)
@@ -179,4 +180,5 @@
 // TK, 05 Feb 97
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE (1024 * 1024)
 #define ACE_HAS_IDTYPE_T
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h
index cb5371bba75..573ab544caf 100644
--- a/ace/config-pharlap.h
+++ b/ace/config-pharlap.h
@@ -5,6 +5,7 @@
 // It has been tested with PharLap TNT Embedded ToolSuite version 9.1.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_HAS_PHARLAP
@@ -57,4 +58,5 @@
 # include /**/ <embtcpip.h>
 #endif /* ACE_HAS_PHARLAP_RT */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h
index 143911616af..18ab9875778 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -5,6 +5,7 @@
 // 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
 
 // #if ! defined (__ACE_INLINE__)
@@ -241,4 +242,5 @@
 
 #define ACE_PSOS_DIAB_MIPS
 #define ACE_MALLOC_ALIGN 8
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index 0cdffffe857..866af14f016 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -8,6 +8,7 @@
 
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // #if ! defined (__ACE_INLINE__)
@@ -272,4 +273,5 @@
 
 #define ACE_THREAD_MANAGER_LACKS_STATICS
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index bcf17c2a2cd..5893cb6417f 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -5,6 +5,7 @@
 // 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
 
 // #if ! defined (__ACE_INLINE__)
@@ -232,4 +233,5 @@
 #define ACE_PSOS_DIAB
 #endif /* ACE_PSOS_DIAB */
 #define ACE_LACKS_MKFIFO
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index 000f68d5cac..0a3af1b62f4 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -5,6 +5,7 @@
 // using the Diab Data D-C++ 4.1a compiler
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // #if ! defined (__ACE_INLINE__)
@@ -205,4 +206,5 @@
 #endif /* ACE_PSOS_TBD */
 #define ACE_LACKS_MKFIFO
 #define ACE_MALLOC_ALIGN 8
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index 4c85ea9f202..359b934ce30 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -35,6 +35,7 @@
 
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 ////////////////////////////////////////////////////////////////
@@ -241,4 +242,5 @@
 #define ACE_LACKS_MKFIFO
 
 #define ACE_MALLOC_ALIGN 8
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index 0b2200ddb6a..9d30744e642 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -4,6 +4,7 @@
 // 2.0 (Beta) with GNU C++ and the POSIX (pthread) threads package.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define _POSIX_C_SOURCE 199506
@@ -143,4 +144,5 @@
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index d48a42b1c7e..02d37d128e6 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -5,6 +5,7 @@
 // version 4.2 without threads.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if defined (__GNUG__)
@@ -111,4 +112,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 #define ACE_HAS_DIRENT
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h
index 17d8d49a1e5..1ca56814ec7 100644
--- a/ace/config-sco-5.0.0-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-fsu-pthread.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
@@ -10,4 +11,5 @@
 
 #define ACE_HAS_GNU_CSTRING_H
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index a658cec275f..972d48d1cb7 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -5,6 +5,7 @@
 // version 5.0 with MIT pthreads.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if !defined (__ACE_INLINE__)
@@ -173,4 +174,5 @@
 #define ACE_HAS_WRITEV_TIMEDWAIT
 #define ACE_HAS_DIRENT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-5.0.0-nothread.h b/ace/config-sco-5.0.0-nothread.h
index 8ca6e712291..8e48980625f 100644
--- a/ace/config-sco-5.0.0-nothread.h
+++ b/ace/config-sco-5.0.0-nothread.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
@@ -9,4 +10,5 @@
 
 #define ACE_HAS_GNU_CSTRING_H
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 4204e74b5bf..2cf88d7384f 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_SCO_5_0_0_H
+#include "ace/pre.h"
 #define ACE_CONFIG_SCO_5_0_0_H
 
 // Compiling for SCO.
@@ -105,4 +106,5 @@
 #define ACE_LACKS_READDIR_R
 #define ACE_HAS_GPERF
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_SCO_5_0_0_H */
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 09426046523..4cda64bc547 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -4,6 +4,7 @@
 // for SunOS4 platforms using the GNU g++ compiler
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -110,4 +111,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index f30c8cde26d..6b2d5df7c21 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -5,6 +5,7 @@
 // for SunOS4 platforms using the Lucid 3.2 compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
@@ -100,4 +101,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index c75952384b4..02011c77273 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -5,6 +5,7 @@
 // platforms using the SunC++ 4.x compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
@@ -104,4 +105,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
index b3baa967bd3..0df13a023d9 100644
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ b/ace/config-sunos4-sun4.x-orbix.h
@@ -5,6 +5,7 @@
 // for SunOS4 platforms using the SunC++ 4.x compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
@@ -103,4 +104,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index 07574ad4077..8c1e54e2115 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -5,6 +5,7 @@
 // for SunOS4 platforms using the SunC++ 4.x compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_SYSTIME_H
@@ -101,4 +102,5 @@
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 4044217f114..62f8178c9f6 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -5,6 +5,7 @@
 // platforms using the Centerline 2.x C++ compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
@@ -170,4 +171,5 @@
 #define ACE_HAS_IDTYPE_T
 #define ACE_HAS_DIRENT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index f81535cec68..3845659c06f 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -5,6 +5,7 @@
 // platforms using the GNU g++ compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -186,4 +187,5 @@
 #define ACE_HAS_GPERF
 #define ACE_HAS_DIRENT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index d5e13ad57e2..64b9352934c 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -6,6 +6,7 @@
 // MT-Orbix CORBA IDL compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -194,4 +195,5 @@
 #define ACE_HAS_GPERF
 #define ACE_HAS_DIRENT
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index 478310d0136..0fc3b7b1e39 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -5,6 +5,7 @@
 // platforms using the SunC++ 4.0.x compiler.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -199,4 +200,5 @@
 #    define ACE_NEW_THROWS_EXCEPTIONS
 #  endif /* ACE_HAS_EXCEPTIONS */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 1ba87124bfd..ccae637b26b 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -8,6 +8,7 @@
 //   * Green Hills 1.8.8 and later
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 // Compiler version-specific settings:
@@ -358,4 +359,5 @@
 #undef ACE_HAS_PROC_FS
 #undef ACE_HAS_PRUSAGE_T
 #endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.x-sunc++-4.x-orbix.h b/ace/config-sunos5.x-sunc++-4.x-orbix.h
index ca850489edf..84226b06533 100644
--- a/ace/config-sunos5.x-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.x-sunc++-4.x-orbix.h
@@ -6,6 +6,7 @@
 // Orbix 2.x CORBA IDL compiler.
 
 #ifndef ACE_CONFIG_ORBIX_H
+#include "ace/pre.h"
 #define ACE_CONFIG_ORBIX_H
 
 // Pick up correct platform definition file based on compiler's predefined
@@ -27,4 +28,5 @@
 #  define ACE_HAS_MT_ORBIX 1
 #endif /* ACE_HAS_MT_ORBIX */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_ORBIX_H */
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index b79469bdb7c..c24de85f3bd 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -16,6 +16,7 @@
 // Janne (Jan.Perman@osd.Ericsson.se)
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
@@ -451,4 +452,5 @@
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 2806261cd34..091136c6cf9 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -6,6 +6,7 @@
 // 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
 
 #if defined (DIGITAL_UNIX)
@@ -20,4 +21,5 @@
 #  include "ace/config-osf1-3.2.h"
 #endif /* ! DIGITAL_UNIX */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_TRU64_H */
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index c82743a22cf..888c934aea4 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -4,6 +4,7 @@
 // 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
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
@@ -108,4 +109,5 @@
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index 3802c6434aa..b44b53d25fe 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -5,6 +5,7 @@
 // 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
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
@@ -97,4 +98,5 @@
 
 #define ACE_HAS_IDTYPE_T
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-visualage.h b/ace/config-visualage.h
index 8ef53d4d6f1..6687a7ec3c4 100644
--- a/ace/config-visualage.h
+++ b/ace/config-visualage.h
@@ -5,6 +5,7 @@
 // configurations for IBM's VisualAge C++ compiler on Win32 and AIX.
 
 #ifndef CONFIG_VISUALAGE_H
+#include "ace/pre.h"
 #define CONFIG_VISUALAGE_H
 
 #ifdef __TOS_WIN__
@@ -15,4 +16,5 @@
    #include "PLATFORM NOT SPECIFIED"
 #endif /* __TOS_WIN__ */
 
+#include "ace/post.h"
 #endif //CONFIG_VISUALAGE_H
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 8cc2fb4ea29..748fd3ba0fe 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -7,6 +7,7 @@
 // 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
 
 #if ! defined (VXWORKS)
@@ -179,4 +180,5 @@
 #define ACE_USE_RCSID 0
 #endif /* #if !defined (ACE_USE_RCSID) */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 00fbceb0728..1951327a5f9 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -4,6 +4,7 @@
 // The following configuration file contains defines for Borland compilers.
 
 #ifndef ACE_WIN32_BORLAND_H
+#include "ace/pre.h"
 #define ACE_WIN32_BORLAND_H
 
 #if defined (__BORLANDC__)
@@ -73,4 +74,5 @@
 
 #endif /* defined(__BORLANDC__) */
 
+#include "ace/post.h"
 #endif /* ACE_WIN32_BORLAND_H */
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index fb6f96ac922..a2dd62a19f1 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -6,6 +6,7 @@
 // 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
 
 // Complain if WIN32 is not already defined.
@@ -481,4 +482,5 @@ typedef unsigned __int64 ACE_UINT64;
 # endif /* WINSOCK_VERSION */
 #endif /* ACE_HAS_WINSOCK2_GQOS */
 
+#include "ace/post.h"
 #endif /* ACE_WIN32_COMMON_H */
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 5e9298631b6..57dfc03555b 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -5,6 +5,7 @@
 // common to all Win32/MSVC/MFC combinations.
 
 #ifndef ACE_WIN32_MSVC_H
+#include "ace/pre.h"
 #define ACE_WIN32_MSVC_H
 
 #if defined (_MSC_VER)
@@ -207,4 +208,5 @@ inline void *operator new (unsigned int, void *p) { return p; }
 
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* ACE_WIN32_COMMON_H */
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index f0192655131..5fb83a8e19f 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -6,6 +6,7 @@
 // common to all VisualAge compilers.
 
 #ifndef ACE_WIN32_VISUALAGECPP_H
+#include "ace/pre.h"
 #define ACE_WIN32_VISUALAGECPP_H
 
 #if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
@@ -82,4 +83,5 @@
 
 #endif /* defined(__IBMCPP__) */
 
+#include "ace/post.h"
 #endif /* ACE_WIN32_VISUALAGECPP_H */
diff --git a/ace/config-win32.h b/ace/config-win32.h
index cf4947c51c1..8617cd69c38 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -6,6 +6,7 @@
 // variety of compilers.
 
 #ifndef ACE_CONFIG_H
+#include "ace/pre.h"
 #define ACE_CONFIG_H
 
 #if defined (ACE_HAS_WINCE) || defined (UNDER_CE)
@@ -22,4 +23,5 @@
 # error "Compiler does not seem to be supported"
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/inc_user_config.h b/ace/inc_user_config.h
index e2aee93274f..f6b6cd39b62 100644
--- a/ace/inc_user_config.h
+++ b/ace/inc_user_config.h
@@ -5,6 +5,7 @@
 // config.h directly.
 
 #ifndef ACE_INC_USER_CONFIG_H
+#include "ace/pre.h"
 #define ACE_INC_USER_CONFIG_H
 
 #include "ace/config.h"
@@ -48,4 +49,5 @@
 #  define ACE_RCSID(path, file, id) /* noop */
 #endif /* #if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) */
 
+#include "ace/post.h"
 #endif /* ACE_INC_USER_CONFIG_H */
diff --git a/ace/iosfwd.h b/ace/iosfwd.h
index eac2c9e4ba5..d6afd67c047 100644
--- a/ace/iosfwd.h
+++ b/ace/iosfwd.h
@@ -25,6 +25,7 @@
 // ============================================================================
 
 #ifndef ACE_IOSFWD_H
+#include "ace/pre.h"
 #define ACE_IOSFWD_H
 
 #include "ace/inc_user_config.h"
@@ -73,4 +74,5 @@
 
 # endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
 
+#include "ace/post.h"
 #endif /* ACE_IOSFWD_H */
diff --git a/ace/post.h b/ace/post.h
new file mode 100644
index 00000000000..419ea8af80b
--- /dev/null
+++ b/ace/post.h
@@ -0,0 +1,27 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    post.h
+//
+// = AUTHOR
+//    Christopher Kohlhoff <chris@kohlhoff.com>
+//
+// = DESCRIPTION
+//    This file restore the original alignment rules.
+//
+// ============================================================================
+
+// No header guard
+#if defined (_MSC_VER)
+# pragma pack (pop)
+#elif defined (__BORLANDC__)
+# pragma option pop
+# pragma nopushoptwarn
+# pragma nopackwarning
+#endif
diff --git a/ace/pre.h b/ace/pre.h
new file mode 100644
index 00000000000..0361b1a3c31
--- /dev/null
+++ b/ace/pre.h
@@ -0,0 +1,29 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    pre.h
+//
+// = AUTHOR
+//    Christopher Kohlhoff <chris@kohlhoff.com>
+//
+// = DESCRIPTION
+//    This file save the original alignment rules and changes the alignment
+//    boundary to ACE's default.
+//
+// ============================================================================
+
+// No header guard
+#if defined (_MSC_VER)
+# pragma warning (disable:4103)
+# pragma pack (push, 8)
+#elif defined (__BORLANDC__)
+# pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig
+# pragma nopushoptwarn
+# pragma nopackwarning
+#endif
diff --git a/ace/streams.h b/ace/streams.h
index aa07c61429c..3fcbbbab480 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -22,6 +22,7 @@
 // ============================================================================
 
 #ifndef ACE_STREAMS_H
+#include "ace/pre.h"
 #define ACE_STREAMS_H
 
 #include "ace/inc_user_config.h"
@@ -130,4 +131,5 @@
 
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
+#include "ace/post.h"
 #endif /* ACE_STREAMS_H */
diff --git a/ace/ws2tcpip.h b/ace/ws2tcpip.h
index ce1f1b8bfb8..0df97c7a992 100644
--- a/ace/ws2tcpip.h
+++ b/ace/ws2tcpip.h
@@ -16,6 +16,7 @@
 */
 
 #ifndef _WS2TCPIP_H_
+#include "ace/pre.h"
 #define _WS2TCPIP_H_
 
 /* Structure to keep interface specific information */
@@ -85,4 +86,5 @@ er */
 };
 
 
+#include "ace/post.h"
 #endif  /* _WS2TCPIP_H_ */
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 69e064e4c3d..734e742390c 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -61,21 +61,17 @@ STATIC_LFLAGS =
 
 !ifdef CODEGUARD
 CODEGUARD_CFLAGS = -vG
-!else
-# CFLAGS compatibility with a default application generated by
-# the BCB IDE, however these flags do not work with codeguard.
-CODEGUARD_CFLAGS = -b- -Ve -Vx
 !endif
 
 THREAD_CFLAGS = -D_MT -tWM
-WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia
+WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia -w-inl
 DEFINES_CFLAGS = -DWIN32;_NO_VCL
 QUIET_CFLAGS = -q
-ALIGN_CFLAGS = -a8
+MISC_CFLAGS = -a8 -b
 
 COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
 	$(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \
-	$(ALIGN_CFLAGS) $(CODEGUARD_CFLAGS)
+	$(MISC_CFLAGS) $(CODEGUARD_CFLAGS)
 
 COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn