205 files changed, 1251 insertions, 135 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV.dsp b/TAO/orbsvcs/orbsvcs/AV.dsp
index 4802f1c7055..e5006af4ed1 100644
--- a/TAO/orbsvcs/orbsvcs/AV.dsp
+++ b/TAO/orbsvcs/orbsvcs/AV.dsp
@@ -295,7 +295,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_AV_Export            -Wb,export_include=AV/AV_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h   -Wb,export_macro=TAO_AV_Export            -Wb,export_include=AV/AV_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -334,7 +334,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_AV_Export                                                   -Wb,export_include=AV/AV_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_AV_Export                                                   -Wb,export_include=AV/AV_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -380,7 +380,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_AV_Export            -Wb,export_include=AV/AV_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h   -Wb,export_macro=TAO_AV_Export            -Wb,export_include=AV/AV_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -419,7 +419,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_AV_Export                                                   -Wb,export_include=AV/AV_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_AV_Export                                                   -Wb,export_include=AV/AV_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -465,7 +465,7 @@ InputPath=.\sfp.idl
 InputName=sfp
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_AV_Export            -Wb,export_include=AV/AV_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h   -Wb,export_macro=TAO_AV_Export            -Wb,export_include=AV/AV_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -504,7 +504,7 @@ InputPath=.\sfp.idl
 InputName=sfp
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_AV_Export                                                   -Wb,export_include=AV/AV_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_AV_Export                                                   -Wb,export_include=AV/AV_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index a0ac29a7b97..5225f043866 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef AVSTREAMS_I_H
+#include "ace/pre.h"
 #define AVSTREAMS_I_H
 
 #include "ace/OS.h"
@@ -1561,4 +1562,5 @@ protected:
 
 #include "Flows_T.h"
 
+#include "ace/post.h"
 #endif /* AVSTREAMS_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 5773961bea3..b80bed676c8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_CORE_H
+#include "ace/pre.h"
 #define TAO_AV_CORE_H
 
 #include "tao/TAO.h"
@@ -182,4 +183,5 @@ protected:
   CORBA::Boolean stop_run_;
 };
 
+#include "ace/post.h"
 #endif /* TAO_AV_CORE_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_export.h b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
index a15b935707a..5b27b4f61b5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_export.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
@@ -5,6 +5,7 @@
 // ${ACE_ROOT}/GenExportH.BAT
 // ------------------------------
 #ifndef TAO_AV_EXPORT_H
+#include "ace/pre.h"
 #define TAO_AV_EXPORT_H
 
 #include "ace/OS.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 39ccd2ce81a..bc4f0497796 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_ENDPOINT_STRATEGY_H
+#include "ace/pre.h"
 #define TAO_AV_ENDPOINT_STRATEGY_H
 
 #include "AVStreams_i.h"
@@ -166,4 +167,5 @@ protected:
 // Include the templates here.
 #include "Endpoint_Strategy_T.h"
 
+#include "ace/post.h"
 #endif /* TAO_AV_ENDPOINT_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 848f8d70456..d500407f542 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -19,6 +19,7 @@
 
 
 #ifndef TAO_AV_ENDPOINT_STRATEGY_T_H
+#include "ace/pre.h"
 #define TAO_AV_ENDPOINT_STRATEGY_T_H
 
 #include "Endpoint_Strategy.h"
@@ -242,4 +243,5 @@ public:
 #pragma implementation ("Endpoint_Strategy_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_AV_ENDPOINT_STRATEGY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index c889ed813c7..c8363273c1a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_FLOWSPEC_ENTRY_H
+#include "ace/pre.h"
 #define TAO_AV_FLOWSPEC_ENTRY_H
 
 #include "orbsvcs/AV/AV_export.h"
@@ -279,4 +280,5 @@ public:
 #include "FlowSpec_Entry.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_AV_FLOWSPEC_ENTRY_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index 9547b0d5fd1..dd3df0c769e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_FLOWS_T_H
+#include "ace/pre.h"
 #define TAO_AV_FLOWS_T_H
 
 #include "AVStreams_i.h"
@@ -123,4 +124,5 @@ protected:
 #pragma implementation ("Flows_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_AV_FLOWS_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h
index 530163eaa49..a23c2a2f5e0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_MCAST_H
+#include "ace/pre.h"
 #define TAO_AV_MCAST_H
 
 #include "FlowSpec_Entry.h"
@@ -107,4 +108,5 @@ protected:
 #include "MCast.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_AV_MCAST_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Nil.h b/TAO/orbsvcs/orbsvcs/AV/Nil.h
index f7ea004df50..e362c0a99bb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Nil.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Nil.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_NIL_H
+#include "ace/pre.h"
 #define TAO_AV_NIL_H
 
 #include "Policy.h"
@@ -42,4 +43,5 @@
 //   // end the stream.
 // };
 
+#include "ace/post.h"
 #endif /* TAO_AV_NIL_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 03a227ef822..1f89d187fab 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_POLICY_H
+#include "ace/pre.h"
 #define TAO_AV_POLICY_H
 
 #include "ace/Addr.h"
@@ -155,4 +156,5 @@ protected:
 #if defined(__ACE_INLINE__)
 #include "Policy.i"
 #endif /* __ACE_INLINE__ */
+#include "ace/post.h"
 #endif /* TAO_AV_POLICY_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
index dfbee754aaf..6ae0c744fc7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_PROTOCOL_FACTORY_T_H
+#include "ace/pre.h"
 #define TAO_AV_PROTOCOL_FACTORY_T_H
 
 #include "ace/Service_Object.h"
@@ -97,4 +98,5 @@ public:
   virtual const char *control_flow_factory (void);
 };
 
+#include "ace/post.h"
 #endif /* TAO_AV_PROTOCOL_FACTORY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 1ee7aa8b03f..0122427cfaa 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -49,6 +49,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_RTCP_H
+#include "ace/pre.h"
 #define TAO_AV_RTCP_H
 
 #include "ace/OS.h"
@@ -296,4 +297,5 @@ protected:
 ACE_STATIC_SVC_DECLARE (TAO_AV_RTCP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_AV_RTCP_Flow_Factory)
 
+#include "ace/post.h"
 #endif /* TAO_AV_RTCP_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index cafc3ea09e2..33b25549773 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -51,6 +51,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_RTP_H
+#include "ace/pre.h"
 #define TAO_AV_RTP_H
 
 #include "Protocol_Factory.h"
@@ -296,4 +297,5 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_AV_RTP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_AV_RTP_Flow_Factory)
 
+#include "ace/post.h"
 #endif /* TAO_AV_RTP_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index e31cb742b4c..0c5948d92cb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_TCP_H
+#include "ace/pre.h"
 #define TAO_AV_TCP_H
 
 #include "ace/OS.h"
@@ -233,4 +234,5 @@ ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_AV_TCP_Flow_Factory)
 ACE_STATIC_SVC_DECLARE (TAO_AV_TCP_Factory)
 ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_AV_TCP_Factory)
 
+#include "ace/post.h"
 #endif /* TAO_AV_TCP_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 8baaaca983e..f5282eb8eb9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_TRANSPORT_H
+#include "ace/pre.h"
 #define TAO_AV_TRANSPORT_H
 
 #include "ace/Acceptor.h"
@@ -223,4 +224,5 @@ protected:
 #include "Transport.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_AV_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index 4444e0e3032..b736ca9d128 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_UDP_H
+#include "ace/pre.h"
 #define TAO_AV_UDP_H
 
 #include "ace/OS.h"
@@ -216,4 +217,5 @@ ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_AV_UDP_Factory)
 #include "UDP.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_AV_UDP_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/media-timer.h b/TAO/orbsvcs/orbsvcs/AV/media-timer.h
index acae756ca31..1eaedd0fad5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media-timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media-timer.h
@@ -36,6 +36,7 @@
  */
 
 #ifndef TAO_AV_MEDIA_TIMER_H
+#include "ace/pre.h"
 #define TAO_AV_MEDIA_TIMER_H
 
 #include "ace/OS.h"
@@ -56,4 +57,5 @@ class MediaTimer
   ACE_UINT32 offset_;   /* random offset */
 };
 
+#include "ace/post.h"
 #endif /* TAO_AV_MEDIA_TIMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
index 48a1e4c97d6..5b61c34d605 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -35,6 +35,7 @@
  * @(#) $Header$
  */
 #ifndef TAO_AV_NTP_TIME_H
+#include "ace/pre.h"
 #define TAO_AV_NTP_TIME_H
 
 #include "ace/OS.h"
@@ -93,4 +94,5 @@ ACE_INLINE timeval unixtime()
   ACE_Time_Value tv = ACE_OS::gettimeofday();
         return ((timeval) tv);
 }
+#include "ace/post.h"
 #endif /* TAO_AV_NTP_TIME_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index 7c7c2a3dedd..413072c2e33 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_AV_SFP_H
+#include "ace/pre.h"
 #define TAO_AV_SFP_H
 
 #include "orbsvcs/AV/AV_export.h"
@@ -264,4 +265,5 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_AV_SFP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_AV_SFP_Flow_Factory)
 
+#include "ace/post.h"
 #endif /* TAO_SFP_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/source.h b/TAO/orbsvcs/orbsvcs/AV/source.h
index b745fe6a359..6578daff37a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/source.h
+++ b/TAO/orbsvcs/orbsvcs/AV/source.h
@@ -37,6 +37,7 @@
  */
 
 #ifndef TAO_AV_SOURCE_H
+#include "ace/pre.h"
 #define TAO_AV_SOURCE_H
 
 #define RTCP_SDES_MAX 7
@@ -229,4 +230,5 @@ protected:
 #include "source.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_AV_Source_H */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
index d48b70b25b8..45c0e128839 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
@@ -15,9 +15,11 @@
 // ============================================================================
 
 #ifndef ACE_CHANNEL_CLIENTS_H
+#include "ace/pre.h"
 #define ACE_CHANNEL_CLIENTS_H
 
 #include "orbsvcs/Channel_Clients_T.h"
 
+#include "ace/post.h"
 #endif /* ACE_CHANNEL_CLIENTS_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 966e9dcd9c8..a8f087a706f 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -22,6 +22,7 @@
 // ============================================================================
 
 #ifndef ACE_CHANNEL_CLIENTS_T_H
+#include "ace/pre.h"
 #define ACE_CHANNEL_CLIENTS_T_H
 
 #include "orbsvcs/RtecEventCommS.h"
@@ -96,4 +97,5 @@ private:
 #pragma implementation ("Channel_Clients_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* ACE_CHANNEL_CLIENTS_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 129022f97ae..1efd18d5dc3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef _CC_LOCK_H
+#include "ace/pre.h"
 #define _CC_LOCK_H
 
 #include "ace/Synch.h"
@@ -137,4 +138,5 @@ private:
   CosConcurrencyControl::lock_mode current_;
 };
 
+#include "ace/post.h"
 #endif /* !defined (_CC_LOCK_H) */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 24d0357f9d5..0da46fcf7a2 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -33,6 +33,7 @@
 // ============================================================================
 
 #ifndef _CC_LOCKSET_H
+#include "ace/pre.h"
 #define _CC_LOCKSET_H
 
 #include "ace/Synch.h"
@@ -177,4 +178,5 @@ private:
   // Queue to hold the requested locks not yet granted.
 };
 
+#include "ace/post.h"
 #endif /* _CC_LOCKSET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index c2f9cf9e470..5370cb6815e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef _CC_LOCKSETFACTORY_H
+#include "ace/pre.h"
 #define _CC_LOCKSETFACTORY_H
 
 // #include "tao/corba.h"
@@ -57,4 +58,5 @@ private:
   // Lock to serialize the access to the factory.
 };
 
+#include "ace/post.h"
 #endif /* _CC_LOCKSETFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index e067efcc60e..0e1736ef621 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #ifndef _CONCURRENCY_SERVER_H
+#include "ace/pre.h"
 #define _CONCURRENCY_SERVER_H
 
 #include "tao/corba.h"
@@ -61,4 +62,5 @@ private:
   // This is the lock set factory activated under the POA.
 };
 
+#include "ace/post.h"
 #endif /* _CONCURRENCY_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 6885dad99e7..66666036ae4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_CONSUMERADMIN_H
+#include "ace/pre.h"
 #define TAO_CEC_CONSUMERADMIN_H
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -172,4 +173,5 @@ private:
 #include "CEC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index d9e4026b33d..b9df96b729b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_CONSUMERCONTROL_H
+#include "ace/pre.h"
 #define TAO_CEC_CONSUMERCONTROL_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -83,4 +84,5 @@ public:
 #include "CEC_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index 07443e08a13..aded27100ad 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_DEFAULT_FACTORY_H
+#include "ace/pre.h"
 #define TAO_CEC_DEFAULT_FACTORY_H
 
 #include "CEC_Factory.h"
@@ -161,4 +162,5 @@ private:
 ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory)
 ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_CEC_Default_Factory)
 
+#include "ace/post.h"
 #endif /* TAO_CEC_DEFAULT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
index e0fa940d1e1..47f76cf2fa3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_DEFAULTS_H
+#include "ace/pre.h"
 #define TAO_CEC_DEFAULTS_H
 
 #ifndef TAO_CEC_ENABLE_DEBUG_MESSAGES
@@ -123,4 +124,5 @@
 # define TAO_CEC_DEFAULT_SUPPLIER_CONTROL_PERIOD 5000000 /* usecs */
 #endif /* TAO_CEC_DEFAULT_SUPPLIER_CONTROL_PERIOD */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_DEFAULTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 3eca01e82f6..786dc5af739 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_DISPATCHING_H
+#include "ace/pre.h"
 #define TAO_CEC_DISPATCHING_H
 
 #include "orbsvcs/CosEventCommC.h"
@@ -92,4 +93,5 @@ public:
 #include "CEC_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 8f1c8deec54..ff15de57e33 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_DISPATCHING_TASK_H
+#include "ace/pre.h"
 #define TAO_CEC_DISPATCHING_TASK_H
 
 #include "ace/Task.h"
@@ -113,4 +114,5 @@ private:
 #include "CEC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_DISPATCHING_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index b3fa05c1d70..d1954b33b03 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_EVENTCHANNEL_H
+#include "ace/pre.h"
 #define TAO_CEC_EVENTCHANNEL_H
 
 #include "CEC_Factory.h"
@@ -290,4 +291,5 @@ private:
 #include "CEC_EventChannel.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 55741e38f98..41268dd9bb4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_FACTORY_H
+#include "ace/pre.h"
 #define TAO_CEC_FACTORY_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -163,4 +164,5 @@ public:
 #include "CEC_Factory.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 5dff6f22a25..cb5b3394ade 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_MT_DISPATCHING_H
+#include "ace/pre.h"
 #define TAO_CEC_MT_DISPATCHING_H
 
 #include "CEC_Dispatching.h"
@@ -87,4 +88,5 @@ private:
 #include "CEC_MT_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index d6a7d45b8e6..3fd2be40501 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_PROXYPULLCONSUMER_H
+#include "ace/pre.h"
 #define TAO_CEC_PROXYPULLCONSUMER_H
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -128,4 +129,5 @@ private:
 #include "CEC_ProxyPullConsumer.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_PROXYPULLCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 7ff01a48ec6..24756efcada 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_PROXYPULLSUPPLIER_H
+#include "ace/pre.h"
 #define TAO_CEC_PROXYPULLSUPPLIER_H
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -141,4 +142,5 @@ private:
 #include "CEC_ProxyPullSupplier.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_PROXYPULLSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 2a12b5a4110..4fe2ea252f5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_PROXYPUSHCONSUMER_H
+#include "ace/pre.h"
 #define TAO_CEC_PROXYPUSHCONSUMER_H
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -126,4 +127,5 @@ private:
 #include "CEC_ProxyPushConsumer.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index f3e4e7c51d6..cbf95739f84 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_PROXYPUSHSUPPLIER_H
+#include "ace/pre.h"
 #define TAO_CEC_PROXYPUSHSUPPLIER_H
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -138,4 +139,5 @@ private:
 #include "CEC_ProxyPushSupplier.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index b00a4cd2cf6..852a5f9886e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_PULLING_STRATEGY_H
+#include "ace/pre.h"
 #define TAO_CEC_PULLING_STRATEGY_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -65,4 +66,5 @@ public:
 #include "CEC_Pulling_Strategy.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_PULLING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 58322f6e8c2..7f57a4a5bac 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_REACTIVE_CONSUMERCONTROL_H
+#include "ace/pre.h"
 #define TAO_CEC_REACTIVE_CONSUMERCONTROL_H
 
 #include "CEC_ConsumerControl.h"
@@ -156,4 +157,5 @@ private:
 #include "CEC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 0be120a82fb..77cc7c4bad2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_REACTIVE_PULLING_STRATEGY_H
+#include "ace/pre.h"
 #define TAO_CEC_REACTIVE_PULLING_STRATEGY_H
 
 #include "CEC_Pulling_Strategy.h"
@@ -129,4 +130,5 @@ private:
 #include "CEC_Reactive_Pulling_Strategy.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_REACTIVE_PULLING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index c3412f790ba..a942c97ef5c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_REACTIVE_SUPPLIERCONTROL_H
+#include "ace/pre.h"
 #define TAO_CEC_REACTIVE_SUPPLIERCONTROL_H
 
 #include "CEC_SupplierControl.h"
@@ -156,4 +157,5 @@ private:
 #include "CEC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index b9469c63e14..9de5f9d33ee 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_SUPPLIERADMIN_H
+#include "ace/pre.h"
 #define TAO_CEC_SUPPLIERADMIN_H
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -146,4 +147,5 @@ public:
 #include "CEC_SupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index a20b5ba3b27..f78479049c5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_CEC_SUPPLIERCONTROL_H
+#include "ace/pre.h"
 #define TAO_CEC_SUPPLIERCONTROL_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -82,4 +83,5 @@ public:
 #include "CEC_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_CEC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
index ef4a9dd490e..7e566c9aa9d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef CONSUMERADMIN_I_H
+#include "ace/pre.h"
 #define CONSUMERADMIN_I_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -76,4 +77,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* CONSUMERADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
index 28474fb8643..c901b9005f3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef EVENTCHANNEL_I_H
+#include "ace/pre.h"
 #define EVENTCHANNEL_I_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -99,4 +100,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* EVENTCHANNEL_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
index df0c9fd47f2..110d0f3b74e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
@@ -19,6 +19,7 @@
 // ================================================================
 
 #ifndef _PROXYPUSHCONSUMER_I_H
+#include "ace/pre.h"
 #define _PROXYPUSHCONSUMER_I_H
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -93,4 +94,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* _PROXYPUSHCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
index e1a2ca8f5dc..a10f72eda83 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
@@ -19,6 +19,7 @@
 // ================================================================
 
 #ifndef _PROXYPUSHSUPPLIER_H
+#include "ace/pre.h"
 #define _PROXYPUSHSUPPLIER_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -82,4 +83,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* _PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
index d5471e569aa..ae5b66761ee 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef SUPPLIER_ADMIN_I_H
+#include "ace/pre.h"
 #define SUPPLIER_ADMIN_I_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -78,4 +79,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* SUPPLIER_ADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
index 057f10e8b45..f57e3350607 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_COSEVENT_UTILITIES_H
+#include "ace/pre.h"
 #define TAO_COSEVENT_UTILITIES_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -164,4 +165,5 @@ class TAO_ORBSVCS_Export CosEC_ServantBase :
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_COSEVENT_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h
index 6e81c989e15..936399f0d13 100644
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.h
+++ b/TAO/orbsvcs/orbsvcs/Event/BCU.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_BCU_H
+#include "ace/pre.h"
 #define ACE_BCU_H
 
 #include "ace/OS.h"
@@ -38,4 +39,5 @@ TAO_ORBSVCS_Export u_long ACE_BCU (u_long n);
 TAO_ORBSVCS_Export u_long ACE_BCU (u_long number, u_long n);
 // Check if <number> is prime (via ACE::is_prime ()) <n> times.
 
+#include "ace/post.h"
 #endif /* ACE_BCU_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h b/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
index c952675fac6..94fe5793787 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef DEBUG_MACROS_H
+#include "ace/pre.h"
 #define DEBUG_MACROS_H
 
 #if defined (ACE_ES_NOLOGGING)
@@ -14,4 +15,5 @@
 #define ACE_ES_DEBUG_ST(X) X
 #endif /* ACE_ES_NOLOGGING */
 
+#include "ace/post.h"
 #endif // DEBUG_MACROS_H
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 9818562b9a0..840555e69a2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #ifndef ACE_DISPATCHING_MODULES_H
+#include "ace/pre.h"
 #define ACE_DISPATCHING_MODULES_H
 
 #include "tao/Timeprobe.h"
@@ -502,6 +503,7 @@ public:
 #include "Dispatching_Modules.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_DISPATCHING_MODULES_H */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index b7df5a76c87..be8024af6bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_AND_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_AND_FILTER_H
 
 #include "EC_Filter.h"
@@ -96,4 +97,5 @@ private:
 #include "EC_And_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_AND_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index 50eaa576ff0..94fc57ac2ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_BASIC_FACTORY_H
+#include "ace/pre.h"
 #define TAO_EC_BASIC_FACTORY_H
 
 #include "EC_Factory.h"
@@ -122,4 +123,5 @@ public:
 #include "EC_Basic_Factory.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_BASIC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 8b245bd0ce0..0bd9e9bf06d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_BASIC_FILTER_BUILDER_H
+#include "ace/pre.h"
 #define TAO_EC_BASIC_FILTER_BUILDER_H
 
 #include "EC_Filter_Builder.h"
@@ -76,4 +77,5 @@ private:
 #include "EC_Basic_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_BASIC_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index 6c39e4e9179..81f4982aa63 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_BITMASK_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_BITMASK_FILTER_H
 
 #include "EC_Filter.h"
@@ -109,4 +110,5 @@ private:
 #include "EC_Bitmask_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_BITMASK_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index 1f36fdb6fc3..caafe0b4c0b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_BUSY_LOCK_H
+#include "ace/pre.h"
 #define TAO_EC_BUSY_LOCK_H
 
 #include "ace/OS.h"
@@ -66,4 +67,5 @@ private:
 #pragma implementation ("EC_Busy_Lock.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_EC_BUSY_LOCK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
index 7afeee9660f..66623273ac2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_COMMAND_H
+#include "ace/pre.h"
 #define TAO_EC_COMMAND_H
 
 #include "ace/Functor.h"
@@ -203,4 +204,5 @@ private:
 #pragma implementation ("EC_Command.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_EC_COMMAND_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
index 77dbcf4f1c1..6847a1719e5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONCRETE_PROXY_SET_H
+#include "ace/pre.h"
 #define TAO_EC_CONCRETE_PROXY_SET_H
 
 #include "tao/corba.h"
@@ -113,4 +114,5 @@ private:
 #pragma implementation ("EC_Concrete_Proxy_Set.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_EC_CONCRETE_PROXY_SET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index 7b5c41a3d1d..410d8e24c84 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONJUNCTION_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_CONJUNCTION_FILTER_H
 
 #include "EC_Filter.h"
@@ -112,4 +113,5 @@ private:
 #include "EC_Conjunction_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_CONJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index a5de7a2ce0a..51215962bae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -22,6 +22,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONSUMERADMIN_H
+#include "ace/pre.h"
 #define TAO_EC_CONSUMERADMIN_H
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -194,4 +195,5 @@ public:
 #include "EC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index e9113150ee0..7b577f00b88 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONSUMERCONTROL_H
+#include "ace/pre.h"
 #define TAO_EC_CONSUMERCONTROL_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -76,4 +77,5 @@ public:
 #include "EC_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 0e9ae6a5a82..557f82b59f3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_DEFAULT_FACTORY_H
+#include "ace/pre.h"
 #define TAO_EC_DEFAULT_FACTORY_H
 
 #include "EC_Factory.h"
@@ -165,4 +166,5 @@ private:
 ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory)
 ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_EC_Default_Factory)
 
+#include "ace/post.h"
 #endif /* TAO_EC_DEFAULT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h b/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
index 7e12c4bda7f..a6274efc562 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
@@ -27,6 +27,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_DEFAULTS_H
+#include "ace/pre.h"
 #define TAO_EC_DEFAULTS_H
 
 #ifndef TAO_EC_ENABLE_DEBUG_MESSAGES
@@ -143,4 +144,5 @@
 # define TAO_EC_DEFAULT_SUPPLIER_CONTROL_PERIOD 5000000 /* usecs */
 #endif /* TAO_EC_DEFAULT_SUPPLIER_CONTROL_PERIOD */
 
+#include "ace/post.h"
 #endif /* TAO_EC_DEFAULTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index 2bb90482cb3..d27a7c2c150 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_DISJUNCTION_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_DISJUNCTION_FILTER_H
 
 #include "EC_Filter.h"
@@ -95,4 +96,5 @@ private:
 #include "EC_Disjunction_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_DISJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index e2f6b102a0f..6abdcabb814 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_DISPATCHING_H
+#include "ace/pre.h"
 #define TAO_EC_DISPATCHING_H
 
 #include "orbsvcs/RtecEventCommC.h"
@@ -106,4 +107,5 @@ public:
 #include "EC_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index a07b4684622..87f5815cfd9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_DISPATCHING_TASK_H
+#include "ace/pre.h"
 #define TAO_EC_DISPATCHING_TASK_H
 
 #include "ace/Task.h"
@@ -120,4 +121,5 @@ private:
 #include "EC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_DISPATCHING_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 21a22caefaf..9a2925b38c3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -24,6 +24,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_EVENT_CHANNEL_H
+#include "ace/pre.h"
 #define TAO_EC_EVENT_CHANNEL_H
 
 #include "EC_Factory.h"
@@ -319,4 +320,5 @@ private:
 #include "EC_Event_Channel.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 8a999126614..5e4d81a6a74 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_FACTORY_H
+#include "ace/pre.h"
 #define TAO_EC_FACTORY_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -168,4 +169,5 @@ public:
 #include "EC_Factory.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index ccc1ccc2d51..46e877ed97f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_FILTER_H
 
 #include "orbsvcs/RtecEventCommC.h"
@@ -205,4 +206,5 @@ public:
 #include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index e0cfe6dddf4..ad524848e14 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_FILTER_BUILDER_H
+#include "ace/pre.h"
 #define TAO_EC_FILTER_BUILDER_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -88,4 +89,5 @@ public:
 #include "EC_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 984c047c313..428e74ba270 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -31,6 +31,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_GATEWAY_H
+#include "ace/pre.h"
 #define TAO_EC_GATEWAY_H
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -195,4 +196,5 @@ private:
   // We talk to the EC (as a consumer) using this proxy.
 };
 
+#include "ace/post.h"
 #endif /* ACE_EC_GATEWAY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index d05aa735f4b..c5755053987 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -51,6 +51,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_GATEWAY_UDP_H
+#include "ace/pre.h"
 #define TAO_EC_GATEWAY_UDP_H
 
 #include "ace/SOCK_CODgram.h"
@@ -662,4 +663,5 @@ private:
 #include "EC_Gateway_UDP.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_EVENT_CHANNEL_UDP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 426d0830998..10602604e62 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_MT_DISPATCHING_H
+#include "ace/pre.h"
 #define TAO_EC_MT_DISPATCHING_H
 
 #include "EC_Dispatching.h"
@@ -97,4 +98,5 @@ private:
 #include "EC_MT_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 5c954dc0e70..0cfdb71d3bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_MASKED_TYPE_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_MASKED_TYPE_FILTER_H
 
 #include "EC_Filter.h"
@@ -103,4 +104,5 @@ private:
 #include "EC_Masked_Type_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_MASKED_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index 83774a9af0b..0f56c431949 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_NEGATION_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_NEGATION_FILTER_H
 
 #include "EC_Filter.h"
@@ -90,4 +91,5 @@ private:
 #include "EC_Negation_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_NEGATION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index a38bffbd643..576effd318f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_NULL_FACTORY_H
+#include "ace/pre.h"
 #define TAO_EC_NULL_FACTORY_H
 
 #include "EC_Factory.h"
@@ -121,4 +122,5 @@ public:
 #include "EC_Null_Factory.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_NULL_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 56c5070acd5..80407055463 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_NULL_SCHEDULING_H
+#include "ace/pre.h"
 #define TAO_EC_NULL_SCHEDULING_H
 
 #include "EC_Scheduling_Strategy.h"
@@ -71,4 +72,5 @@ private:
 #include "EC_Null_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_NULL_SCHEDULING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index e369239ecd8..0d19a0a60c4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_OBSERVERSTRATEGY_H
+#include "ace/pre.h"
 #define TAO_EC_OBSERVERSTRATEGY_H
 
 #include "EC_Worker.h"
@@ -284,4 +285,5 @@ private:
 #include "EC_ObserverStrategy.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_OBSERVERSTRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 09cf807346c..79b1704de25 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PER_SUPPLIER_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_PER_SUPPLIER_FILTER_H
 
 #include "EC_Supplier_Filter.h"
@@ -115,4 +116,5 @@ private:
 #include "EC_Per_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PER_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 15af4dabed5..0d1035076c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PREFIX_FILTER_BUILDER_H
+#include "ace/pre.h"
 #define TAO_EC_PREFIX_FILTER_BUILDER_H
 
 #include "EC_Filter_Builder.h"
@@ -71,4 +72,5 @@ private:
 #include "EC_Prefix_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PREFIX_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 121e9bdc452..e448c212e10 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PRIORITY_DISPATCHING_H
+#include "ace/pre.h"
 #define TAO_EC_PRIORITY_DISPATCHING_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -88,4 +89,5 @@ private:
 #include "EC_Priority_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PRIORITY_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index f07673689b7..5896c53a2fc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PRIORITY_SCHEDULING_H
+#include "ace/pre.h"
 #define TAO_EC_PRIORITY_SCHEDULING_H
 
 #include "EC_Scheduling_Strategy.h"
@@ -81,4 +82,5 @@ private:
 #include "EC_Priority_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PRIORITY_SCHEDULING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index a065d064809..71fbdd84ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PROXYCONSUMER_H
+#include "ace/pre.h"
 #define TAO_EC_PROXYCONSUMER_H
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -173,4 +174,5 @@ private:
 #include "EC_ProxyConsumer.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PROXYCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 2f18c943811..b0a212c0213 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PROXYSUPPLIER_H
+#include "ace/pre.h"
 #define TAO_EC_PROXYSUPPLIER_H
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -205,4 +206,5 @@ private:
 #include "EC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PROXYSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
index 0a35e6874ac..6809311b516 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_PROXY_COLLECTION_H
+#include "ace/pre.h"
 #define TAO_EC_PROXY_COLLECTION_H
 
 #include "EC_Busy_Lock.h"
@@ -357,4 +358,5 @@ private:
 #pragma implementation ("EC_Proxy_Collection.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_EC_PROXY_COLLECTION_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index f91049a36f8..869adfb6dee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -22,6 +22,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_QOS_INFO_H
+#include "ace/pre.h"
 #define TAO_EC_QOS_INFO_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -62,4 +63,5 @@ public:
 #include "EC_QOS_Info.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 2f84c8e7945..09fa23981c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_REACTIVE_CONSUMERCONTROL_H
+#include "ace/pre.h"
 #define TAO_EC_REACTIVE_CONSUMERCONTROL_H
 
 #include "EC_ConsumerControl.h"
@@ -140,4 +141,5 @@ private:
 #include "EC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 9c8c82851c8..b45fca65abb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_REACTIVE_SUPPLIERCONTROL_H
+#include "ace/pre.h"
 #define TAO_EC_REACTIVE_SUPPLIERCONTROL_H
 
 #include "EC_SupplierControl.h"
@@ -140,4 +141,5 @@ private:
 #include "EC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index d53a054b6ac..4dc50bbe4f1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -24,6 +24,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H
+#include "ace/pre.h"
 #define TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H
 
 #include "EC_Timeout_Generator.h"
@@ -71,4 +72,5 @@ private:
 #include "EC_Reactive_Timeout_Generator.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index dc5b62604da..6b5b2416bec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SCHED_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_SCHED_FILTER_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -130,4 +131,5 @@ private:
 #include "EC_Sched_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SCHED_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 5ebb11cf86a..23bae453108 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SCHED_FILTER_BUILDER_H
+#include "ace/pre.h"
 #define TAO_EC_SCHED_FILTER_BUILDER_H
 
 #include "EC_Filter_Builder.h"
@@ -86,4 +87,5 @@ private:
 #include "EC_Sched_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SCHED_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 46615edcdc0..6dcc91b74d4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SCHEDULING_STRATEGY_H
+#include "ace/pre.h"
 #define TAO_EC_SCHEDULING_STRATEGY_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -75,4 +76,5 @@ public:
 #include "EC_Scheduling_Strategy.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SCHEDULING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 4c75482149c..d04f51cbb19 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIERADMIN_H
+#include "ace/pre.h"
 #define TAO_EC_SUPPLIERADMIN_H
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -186,4 +187,5 @@ public:
 #include "EC_SupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index d7a358e6200..0dec3cbc36b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIERCONTROL_H
+#include "ace/pre.h"
 #define TAO_EC_SUPPLIERCONTROL_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -70,4 +71,5 @@ public:
 #include "EC_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 11a8b91dac8..94c31a00c96 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -27,6 +27,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIER_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_SUPPLIER_FILTER_H
 
 #include "orbsvcs/RtecEventCommC.h"
@@ -143,4 +144,5 @@ private:
 #include "EC_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 645e03ff625..9ee2834afbd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIER_FILTER_BUILDER_H
+#include "ace/pre.h"
 #define TAO_EC_SUPPLIER_FILTER_BUILDER_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -65,4 +66,5 @@ public:
 #include "EC_Supplier_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index ee3048b4dc2..af6b0284c32 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_TIMEOUT_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_TIMEOUT_FILTER_H
 
 #include "EC_Filter.h"
@@ -119,4 +120,5 @@ private:
 #include "EC_Timeout_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_TIMEOUT_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 1810a51683a..af911307162 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -24,6 +24,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_TIMEOUT_GENERATOR_H
+#include "ace/pre.h"
 #define TAO_EC_TIMEOUT_GENERATOR_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -98,4 +99,5 @@ private:
 #include "EC_Timeout_Generator.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 4475740a447..6bf010f4a93 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_TRIVIAL_SUPPLIER_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_TRIVIAL_SUPPLIER_FILTER_H
 
 #include "EC_Supplier_Filter.h"
@@ -103,4 +104,5 @@ private:
 #include "EC_Trivial_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index c9d6b7d7b1a..27e78a51ce1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -23,6 +23,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_TYPE_FILTER_H
+#include "ace/pre.h"
 #define TAO_EC_TYPE_FILTER_H
 
 #include "EC_Filter.h"
@@ -80,4 +81,5 @@ private:
 #include "EC_Type_Filter.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 7eee5d32315..e319de4d7ef 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -32,6 +32,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_UDP_ADMIN_H
+#include "ace/pre.h"
 #define TAO_EC_UDP_ADMIN_H
 
 #include "orbsvcs/RtecUDPAdminS.h"
@@ -68,4 +69,5 @@ private:
   CORBA::UShort port_;
 };
 
+#include "ace/post.h"
 #endif /* TAO_EC_UDP_ADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
index 1107ef8ab06..5351c5765c4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_WORKER_H
+#include "ace/pre.h"
 #define TAO_EC_WORKER_H
 
 #include "tao/corba.h"
@@ -48,4 +49,5 @@ public:
 #pragma implementation ("EC_Worker.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_EC_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 0c1ee2df672..38df4e8fe1a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -28,6 +28,7 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_CHANNEL_H
+#include "ace/pre.h"
 #define ACE_EVENT_CHANNEL_H
 
 #include "ace/Containers.h"
@@ -1433,4 +1434,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* ACE_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index 66a281e7c22..e57ffb00607 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #ifndef TAO_EC_EVENT_MANIP_H
+#include "ace/pre.h"
 #define TAO_EC_EVENT_MANIP_H
 
 #include "orbsvcs/RtecEventCommC.h"
@@ -143,4 +144,5 @@ private:
 #include "Event_Manip.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_EVENT_MANIP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
index ced85087e93..0d8c3b8dfe2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
@@ -2,6 +2,7 @@
 // $Id$
 //
 #ifndef FAST_REACTOR_H
+#include "ace/pre.h"
 #define FAST_REACTOR_H
 
 #if defined (ACE_OLD_STYLE_REACTOR)
@@ -57,4 +58,5 @@ public:
   }
 };
 
+#include "ace/post.h"
 #endif /* FAST_REACTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
index c2c6f093f30..e9ea2e0150e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
+++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
@@ -11,6 +11,7 @@
 // ============================================================================
 
 #ifndef ACE_GPlot_File_H
+#include "ace/pre.h"
 #define ACE_GPlot_File_H
 
 #include "ace/Map_Manager.h"
@@ -99,4 +100,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 
+#include "ace/post.h"
 #endif /* ACE_GPlot_File_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 4ba8dbb44c9..474e55a6c8d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_ESTYPES_H
+#include "ace/pre.h"
 #define ACE_LOCAL_ESTYPES_H
 
 #include "tao/corba.h"
@@ -46,4 +47,5 @@ typedef RtecEventComm::Event RtecEventComm_Event;
 #include "Local_ESTypes.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_LOCAL_ESTYPES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
index b246930b37a..ceaf3f97c89 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_MEMORY_POOLS_H
+#include "ace/pre.h"
 #define ACE_MEMORY_POOLS_H
 
 #include "ace/Synch.h"
@@ -82,4 +83,5 @@ public:
 #include "Memory_Pools.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_MEMORY_POOLS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
index d7fa4abf2b4..5393c94165b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
@@ -25,6 +25,7 @@
 // ============================================================================
 
 #ifndef TAO_MODULE_FACTORY_H
+#include "ace/pre.h"
 #define TAO_MODULE_FACTORY_H
 
 #include "orbsvcs/orbsvcs_export.h"
@@ -168,4 +169,5 @@ public:
 
 };
 
+#include "ace/post.h"
 #endif /* ACE_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index 3dd4c16ab04..0e21a2f0ef0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef ACE_RT_TASK_H
+#include "ace/pre.h"
 #define ACE_RT_TASK_H
 
 #include "ace/Task.h"
@@ -181,4 +182,5 @@ protected:
 #include "RT_Task.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_RT_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index 03039b9dc58..e2f9f9c51e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -4,6 +4,7 @@
 //
 
 #ifndef TAO_EC_TIMER_MODULE_H
+#include "ace/pre.h"
 #define TAO_EC_TIMER_MODULE_H
 
 #include "ace/ACE.h"
@@ -202,4 +203,5 @@ private:
 #include "Timer_Module.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_EC_TIMER_MODULE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
index 21523d1b1da..756e99a03e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -6,6 +6,7 @@
 //
 
 #ifndef ACE_ES_CONSTANTS_H
+#include "ace/pre.h"
 #define ACE_ES_CONSTANTS_H
 
 #include "ace/Message_Block.h"
@@ -113,4 +114,5 @@ const int ACE_ES_EVENT_CONTAINER_MEMORY_POOL = 1024;
 const int ACE_ES_EVENT_MEMORY_POOL = 1024;
 const int ACE_ES_DISPATCH_REQUEST_MEMORY_POOL = 1024;
 
+#include "ace/post.h"
 #endif /* ACE_ES_CONSTANTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index 8d7930fc19a..4bb9b5b6f77 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_UTILITIES_H
+#include "ace/pre.h"
 #define ACE_EVENT_UTILITIES_H
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -257,4 +258,5 @@ private:
 #include "orbsvcs/Event_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_EVENT_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index f35c7b71b2f..5b692d2e6f8 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef TAO_IOR_MULTICAST_H
+#include "ace/pre.h"
 #define TAO_IOR_MULTICAST_H
 
 #include "tao/corba.h"
@@ -110,5 +111,6 @@ private:
 
 };
 
+#include "ace/post.h"
 #endif /* TAO_IOR_MULTICAST_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index 86735893812..d3612436efc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TLS_BASICLOGFACTORY_I_H
+#include "ace/pre.h"
 #define TLS_BASICLOGFACTORY_I_H
 
 #include "orbsvcs/DsLogAdminS.h"
@@ -86,4 +87,5 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TLS_BASICLOGFACTORY_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 4d4172bd939..8a2e6ca3977 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TLS_BASICLOG_I_H
+#include "ace/pre.h"
 #define TLS_BASICLOG_I_H
 
 #include "orbsvcs/DsLogAdminS.h"
@@ -76,4 +77,5 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TLS_BASICLOG_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 3060c481b08..eb91e2de811 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TLS_ITERATOR_H
+#include "ace/pre.h"
 #define TLS_ITERATOR_H
 
 #include "orbsvcs/DsLogAdminS.h"
@@ -84,4 +85,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TLS_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index d7848d34e81..c56727591ef 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TLS_LOGMGR_I_H
+#include "ace/pre.h"
 #define TLS_LOGMGR_I_H
 
 #include "orbsvcs/DsLogAdminS.h"
@@ -76,4 +77,5 @@ protected:
   DsLogAdmin::LogId max_id_;
   // The Max id assigned so far.
 };
+#include "ace/post.h"
 #endif /* TLS_LOGMGR_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 9b445564083..adab272fc25 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef LOG_RECORD_STORE_H
+#include "ace/pre.h"
 #define LOG_RECORD_STORE_H
 
 #include "orbsvcs/DsLogAdminS.h"
@@ -133,4 +134,5 @@ class LogRecordStore
   // The max size of the record list returned in a query.
 };
 
+#include "ace/post.h"
 #endif /*LOG_RECORD_STORE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index ef74e768156..4f073b57ba1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -15,6 +15,7 @@
 // ========================================================================
 
 #ifndef TAO_LOG_CONSTRAINT_INTERPRETER_H
+#include "ace/pre.h"
 #define TAO_LOG_CONSTRAINT_INTERPRETER_H
 
 #include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h"
@@ -50,4 +51,5 @@ public:
   // Returns true if the constraint is evaluated successfully by
   // the evaluator.
 };
+#include "ace/post.h"
 #endif /* TAO_LOG_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index 805a4d019eb..aecf2407416 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -14,6 +14,7 @@
 // ========================================================================
 
 #ifndef TAO_LOG_CONSTRAINT_VISITOR_H
+#include "ace/pre.h"
 #define TAO_LOG_CONSTRAINT_VISITOR_H
 
 #include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h"
@@ -34,4 +35,5 @@ class TAO_Log_Constraint_Evaluator : public TAO_Constraint_Evaluator
   // they dyanmic or static.
 };
 
+#include "ace/post.h"
 #endif /* TAO_LOG_CONSTRAINT_VISITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index f5dec13d6dc..49c7a37e0f4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #ifndef TLS_LOG_I_H
+#include "ace/pre.h"
 #define TLS_LOG_I_H
 
 #include "orbsvcs/Log/LogRecordStore.h"
@@ -387,4 +388,5 @@ protected:
   CORBA::ULong max_rec_list_len_;
   // Max count to return in queries.
 };
+#include "ace/post.h"
 #endif /* TLS_LOG_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index a5ec1e3f8a0..6f7cdfaae3d 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -28,7 +28,9 @@ include $(TAO_ROOT)/rules.tao.GNU
 override TAO_IDLFLAGS += \
         -I$(TAO_ROOT) -Ge 1 \
         -Wb,export_macro=TAO_ORBSVCS_Export \
-        -Wb,export_include=orbsvcs_export.h
+        -Wb,export_include=orbsvcs_export.h \
+        -Wb,pre_include=ace/pre.h \
+        -Wb,post_include=ace/post.h
 
 ifndef TAO_ORBSVCS
   #### Please see docs/configurations.html#orbsvcs for documentation of
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor
index 499678dcdd5..34be5d84256 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.bor
+++ b/TAO/orbsvcs/orbsvcs/Makefile.bor
@@ -7,7 +7,8 @@ NAME = orbsvcs
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
 	-I..\.. -Ge 1 -Wb,export_macro=TAO_ORBSVCS_Export \
-	-Wb,export_include=orbsvcs_export.h
+	-Wb,export_include=orbsvcs_export.h -Wb,pre_include=ace/pre.h \
+	-Wb,post_include=ace/post.h
 
 IDLFILES = \
 	$(IDLDIR)\CosEventChannelAdmin.idl \
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 177061c8e67..d8858b50dda 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef TAO_BINDINGS_ITERATOR_T_H
+#include "ace/pre.h"
 #define TAO_BINDINGS_ITERATOR_T_H
 
 #include "Hash_Naming_Context.h"
@@ -127,4 +128,5 @@ private:
 #pragma implementation ("Bindings_Iterator_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_BINDINGS_ITERATOR_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index 561e07b5273..7a06845b958 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_ENTRIES_H
+#include "ace/pre.h"
 #define TAO_ENTRIES_H
 
 #include "ace/Hash_Map_Manager.h"
@@ -129,4 +130,5 @@ public:
   const char * kind (void);
 };
 
+#include "ace/post.h"
 #endif /* TAO_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index a5ec9052c18..b155bbdf460 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef TAO_HASH_NAMING_CONTEXT_H
+#include "ace/pre.h"
 #define TAO_HASH_NAMING_CONTEXT_H
 
 #include "Naming_Context_Interface.h"
@@ -224,4 +225,5 @@ protected:
   // is the root Naming Context for the server, i.e., it is un<destroy>able.
 };
 
+#include "ace/post.h"
 #endif /* TAO_HASH_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 9be99d209ef..3f6bfbc8c4c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef TAO_NAMING_CONTEXT_INTERFACE_H
+#include "ace/pre.h"
 #define TAO_NAMING_CONTEXT_INTERFACE_H
 
 #include "orbsvcs/CosNamingS.h"
@@ -291,4 +292,5 @@ public:
 };
 
 
+#include "ace/post.h"
 #endif /* TAO_NAMING_CONTEXT_INTERFACE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index 1ddc1389ced..5eba0ecfc00 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef TAO_NAMING_UTILS_H
+#include "ace/pre.h"
 #define TAO_NAMING_UTILS_H
 
 #include "tao/corba.h"
@@ -169,4 +170,5 @@ protected:
   // Reference to the root Naming Context.
 };
 
+#include "ace/post.h"
 #endif /* TAO_NAMING_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index f3d03911b75..655efbcd984 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_PERSISTENT_CONTEXT_INDEX_H
+#include "ace/pre.h"
 #define TAO_PERSISTENT_CONTEXT_INDEX_H
 
 #include "Persistent_Entries.h"
@@ -147,4 +148,5 @@ private:
   // The reference to the root Naming Context.
 };
 
+#include "ace/post.h"
 #endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index 69cf5d1a450..8c421e83001 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_PERSISTENT_ENTRIES_H
+#include "ace/pre.h"
 #define TAO_PERSISTENT_ENTRIES_H
 
 #include "ace/Hash_Map_With_Allocator_T.h"
@@ -223,4 +224,5 @@ public:
   // Persistent Naming Context in the Persistent Context Index.
 };
 
+#include "ace/post.h"
 #endif /* TAO_PERSISTENT_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 1f1338d4ec9..57f87ff5e20 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef TAO_PERSISTENT_NAMING_CONTEXT_H
+#include "ace/pre.h"
 #define TAO_PERSISTENT_NAMING_CONTEXT_H
 
 #include "Hash_Naming_Context.h"
@@ -235,4 +236,5 @@ protected:
   // Also, we get the allocator needed to initialize us from this guy.
 };
 
+#include "ace/post.h"
 #endif /* TAO_PERSISTENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index b561ef6aa70..5cf82889f95 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef TAO_TRANSIENT_NAMING_CONTEXT_H
+#include "ace/pre.h"
 #define TAO_TRANSIENT_NAMING_CONTEXT_H
 
 #include "Hash_Naming_Context.h"
@@ -176,4 +177,5 @@ protected:
   // non-virtual methods.
 };
 
+#include "ace/post.h"
 #endif /* TAO_TRANSIENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index f544d2d57c0..3b78e98d382 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -17,6 +17,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_CONSTRAINT_INTERPRETER_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H
 
 #include "orbsvcs/Trader/Constraint_Nodes.h"
@@ -54,4 +55,5 @@ public:
   // Returns true if the constraint is evaluated successfully by
   // the evaluator.
 };
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index 6b2f63f0205..2ee10d1b491 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -17,6 +17,7 @@
 // ==========================================================================
 
 #ifndef NOTIFY_CONSTRAINT_VISITORS_H
+#include "ace/pre.h"
 #define NOTIFY_CONSTRAINT_VISITORS_H
 
 #include "ace/Hash_Map_Manager.h"
@@ -37,4 +38,5 @@ class TAO_ORBSVCS_Export TAO_Notify_Constraint_Evaluator : public TAO_Constraint
   // Used to lookup property name and values
 };
 
+#include "ace/post.h"
 #endif /* NOTIFY_CONSTRAINT_VISITORS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
index 0fb2b9d26de..860f4a366ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
@@ -15,6 +15,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_CONSUMERADMIN_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_CONSUMERADMIN_I_H
 
 #include "Notify_ID_Pool_T.h"
@@ -329,4 +330,5 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_CONSUMERADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 3cec9294d97..9c45bff3e99 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef NOTIFY_EVENTCHANNELFACTORY_I_H
+#include "ace/pre.h"
 #define NOTIFY_EVENTCHANNELFACTORY_I_H
 
 #include "Notify_ID_Pool_T.h"
@@ -118,4 +119,5 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* NOTIFY_EVENTCHANNELFACTORY_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
index 5524f3f6119..0d8da099f35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_EVENTCHANNEL_I_H_
+#include "ace/pre.h"
 #define TAO_NOTIFY_EVENTCHANNEL_I_H_
 
 #include "Notify_ID_Pool_T.h"
@@ -294,4 +295,5 @@ virtual void destroy (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_EVENTCHANNEL_I_H_ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
index 26e35fd978b..045fc21174f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_EVENT_MANAGER
+#include "ace/pre.h"
 #define TAO_NOTIFY_EVENT_MANAGER
 
 #include "Notify_Listeners.h"
@@ -134,4 +135,5 @@ class TAO_Notify_Event_Manager
   // from suppliers changes the <publication_list_>.
 };
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_EVENT_MANAGER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
index 3ee1b4d136e..54196297d27 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef NOTIFY_FILTERADMIN_H
+#include "ace/pre.h"
 #define NOTIFY_FILTERADMIN_H
 
 #include "Notify_ID_Pool_T.h"
@@ -96,4 +97,5 @@ private:
   // Id generator for proxy suppliers
 };
 
+#include "ace/post.h"
 #endif /* NOTIFY_FILTERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
index a83b2fdf6b4..e66e19beff5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
@@ -17,6 +17,7 @@
 // ==========================================================================
 
 #ifndef NOTIFY_FILTER_FACTORY_I_H
+#include "ace/pre.h"
 #define NOTIFY_FILTER_FACTORY_I_H
 
 #include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
@@ -72,4 +73,5 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* NOTIFY_FILTER_FACTORY_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
index b719ebcd0ad..dc3b92c115f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_FILTER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_FILTER_I_H
 
 #include "Notify_Constraint_Interpreter.h"
@@ -198,4 +199,5 @@ private:
   CONSTRAINT_EXPR_ENTRY;
 };
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_FILTER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
index 6731710c4e6..b1801d1e7a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_ID_POOL_T_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_ID_POOL_T_H
 
 #include "ace/OS.h"
@@ -101,4 +102,5 @@ class TAO_Notify_ID_Pool_Ex : public TAO_Notify_ID_Pool <ID_TYPE>
 #pragma implementation ("Notify_ID_Pool_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_ID_POOL_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
index a8f3faff5c9..533b55347fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_LISTENERS_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_LISTENERS_H
 
 #include "Notify_Types.h"
@@ -50,4 +51,5 @@ class TAO_Notify_Update_Listener
   // Callback method to supply updates.
 };
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_LISTENERS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
index a05bf11ab58..965df9d1b5a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_PROXYCONSUMER_T_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PROXYCONSUMER_T_H
 
 #include "Notify_Proxy_T.h"
@@ -102,4 +103,5 @@ virtual void offer_change (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PROXYPUSHCONSUMER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
index b1f8bb29c6c..078c88c113d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
@@ -17,6 +17,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_PROXYPUSHCONSUMER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PROXYPUSHCONSUMER_I_H
 
 #include "Notify_ProxyConsumer_T.h"
@@ -134,4 +135,5 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PROXYPUSHCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
index 5e36a52ded3..3dbb7b815d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
@@ -16,6 +16,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H
 
 #include "Notify_ProxySupplier_T.h"
@@ -125,4 +126,5 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
index 5d9508dd593..84fc70d98c7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
@@ -15,6 +15,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_PROXY_SUPPLIER_T_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PROXY_SUPPLIER_T_H
 
 #include "Notify_Proxy_T.h"
@@ -161,4 +162,5 @@ virtual void subscription_change (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PROXY_SUPPLIER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
index 0e6945d91c7..e190e5a5891 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
@@ -15,6 +15,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_PROXY_T_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PROXY_T_H
 
 #include "Notify_QoSAdmin_i.h"
@@ -188,4 +189,5 @@ virtual void remove_all_filters (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PROXY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h
index ab330199b4d..f1e19fbf8af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h
@@ -25,6 +25,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_PUSHCONSUMER_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PUSHCONSUMER_H
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
@@ -112,4 +113,5 @@ class TAO_Notify_PushConsumer : public POA_CosNotifyComm::PushConsumer, public P
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h
index 6d2fb6a9c9d..d98c11a565a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h
@@ -1,5 +1,6 @@
 // $Id$
 #ifndef TAO_NOTIFY_PUSHSUPPLIER_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_PUSHSUPPLIER_H
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
@@ -74,4 +75,5 @@ class TAO_Notify_PushSupplier : public POA_CosNotifyComm::PushSupplier, public P
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
index 7133e836b09..dd3ca66aec8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
@@ -16,6 +16,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_QOSADMIN_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_QOSADMIN_I_H
 
 #include "orbsvcs/CosNotificationS.h"
@@ -64,4 +65,5 @@ public:
     CosNotification::UnsupportedQoS
   ));
 };
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_QOSADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h
index bfe305031fc..f24292edc53 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h
@@ -15,6 +15,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_RESOURCE_MANAGER
+#include "ace/pre.h"
 #define TAO_NOTIFY_RESOURCE_MANAGER
 
 #include "Notify_ID_Pool_T.h"
@@ -154,4 +155,5 @@ class TAO_Notify_Resource_Manager
   // Id generator for poa's.
 };
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_RESOURCE_MANAGER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
index 1ced0c32c48..f2811c035b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
@@ -18,6 +18,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_SEQUENCEPROXYPUSHCONSUMER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_SEQUENCEPROXYPUSHCONSUMER_I_H
 
 #include "Notify_ProxyConsumer_T.h"
@@ -92,4 +93,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_SEQUENCEPROXYPUSHCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
index 5bb8338db61..e63eb424d33 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
@@ -16,6 +16,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_SEQUENCEPROXYPUSHSUPPLIER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_SEQUENCEPROXYPUSHSUPPLIER_I_H
 
 #include "Notify_ProxySupplier_T.h"
@@ -83,4 +84,5 @@ virtual void disconnect_sequence_push_supplier (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_SEQUENCEPROXYPUSHSUPPLIER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
index 65626d052f6..1c6a32ed811 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
@@ -18,6 +18,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H
 
 #include "Notify_ProxyConsumer_T.h"
@@ -92,4 +93,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
index 579442df7e8..20bb7d6f1c1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
@@ -16,6 +16,7 @@
 //
 // ==========================================================================
 #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H
 
 #include "Notify_ProxySupplier_T.h"
@@ -83,4 +84,5 @@ virtual void disconnect_structured_push_supplier (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h
index 7dbc97e9539..80783b51a72 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h
@@ -18,6 +18,7 @@
 // ==========================================================================
 
 #ifndef NOTIFY_STRUCTUREDPUSHCONSUMER_H
+#include "ace/pre.h"
 #define NOTIFY_STRUCTUREDPUSHCONSUMER_H
 
 #include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
@@ -105,4 +106,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* NOTIFY_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h
index b7db6b32474..855125f4f87 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h
@@ -17,6 +17,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
 
 #include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
@@ -100,4 +101,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
index a170be4ff07..fedff0ed543 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
@@ -17,6 +17,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_SUPPLIERADMIN_I_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_SUPPLIERADMIN_I_H
 
 #include "Notify_ID_Pool_T.h"
@@ -284,4 +285,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_SUPPLIERADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h
index d47b3b25e08..50d1ae942fd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h
@@ -16,6 +16,7 @@
 // ==========================================================================
 
 #ifndef TAO_NOTIFY_TYPES_H
+#include "ace/pre.h"
 #define TAO_NOTIFY_TYPES_H
 
 #include "orbsvcs/CosNotifyFilterC.h"
@@ -185,4 +186,5 @@ typedef ACE_Unbounded_Set<TAO_Notify_Event_Listener*> EVENT_LISTENER_LIST;
 typedef ACE_Unbounded_Set<TAO_Notify_Update_Listener*> UPDATE_LISTENER_LIST;
 // list of update listeners.
 
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_TYPES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 22971f2ef4a..f3c898da52c 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef COSPROPERTYSERVICE_I_H
+#include "ace/pre.h"
 #define COSPROPERTYSERVICE_I_H
 
 #include "ace/OS.h"
@@ -608,4 +609,5 @@ private:
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* COSPROPERTYSERVICE_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 853a0be5c40..a9b62525638 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_RUNTIME_SCHEDULER_H
+#include "ace/pre.h"
 #define ACE_RUNTIME_SCHEDULER_H
 
 #include "orbsvcs/Scheduler_Factory.h"
@@ -153,4 +154,5 @@ private:
 #include "orbsvcs/Runtime_Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_RUNTIME_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index b752f2193b4..89df225a070 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef ACE_CONFIG_SCHEDULER_H
+#include "ace/pre.h"
 #define ACE_CONFIG_SCHEDULER_H
 
 #include "ace/OS.h"
@@ -176,6 +177,7 @@ private:
 #include "Config_Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_CONFIG_SCHEDULER_H */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index 4ca64cdff9f..2b3269b2111 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef DYNSCHED_H
+#include "ace/pre.h"
 #define DYNSCHED_H
 
 #include "ace/ACE.h"
@@ -530,6 +531,7 @@ private:
 #include "DynSched.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* DYNSCHED_H */
 
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 472dc5f6cb1..3dd612da659 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_RECONFIG_SCHED_UTILS_H
+#include "ace/pre.h"
 #define TAO_RECONFIG_SCHED_UTILS_H
 
 #include "ace/inc_user_config.h"
@@ -285,4 +286,5 @@ public:
 
 #endif /* __GNUC__ */
 
+#include "ace/post.h"
 #endif /* TAO_RECONFIG_SCHED_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index e58d8a3b8ec..6121c2afac6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_RECONFIG_SCHED_UTILS_T_H
+#include "ace/pre.h"
 #define TAO_RECONFIG_SCHED_UTILS_T_H
 
 #include "ace/inc_user_config.h"
@@ -405,4 +406,5 @@ private:
 
 #endif /* __GNUC__ */
 
+#include "ace/post.h"
 #endif /* TAO_RECONFIG_SCHED_UTILS_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 0cd740578d2..1fe0fca0f53 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef TAO_RECONFIG_SCHEDULER_H
+#include "ace/pre.h"
 #define TAO_RECONFIG_SCHEDULER_H
 
 #include "ace/inc_user_config.h"
@@ -43,4 +44,5 @@
 
 #endif /* __GNUC__ */
 
+#include "ace/post.h"
 #endif /* TAO_RECONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index caf527cf57f..69db4254b0a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #ifndef TAO_RECONFIG_SCHEDULER_T_H
+#include "ace/pre.h"
 #define TAO_RECONFIG_SCHEDULER_T_H
 
 #include "ace/inc_user_config.h"
@@ -480,4 +481,5 @@ protected:
 
 #endif /* __GNUC__ */
 
+#include "ace/post.h"
 #endif /* TAO_RECONFIG_SCHEDULER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 01d372dd232..ba6b02916a6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef SCHEDENTRY_H
+#include "ace/pre.h"
 #define SCHEDENTRY_H
 
 #include "orbsvcs/RtecSchedulerC.h"
@@ -105,8 +106,8 @@ public:
   enum DFS_Status {NOT_VISITED, VISITED, FINISHED};
 
   // Status of merging dispatches.
-  enum Propagation_Status {SUCCEEDED, 
-                           TWO_WAY_DISJUNCTION, 
+  enum Propagation_Status {SUCCEEDED,
+                           TWO_WAY_DISJUNCTION,
                            TWO_WAY_CONJUNCTION,
                            INTERNAL_ERROR,
                            UNRECOGNIZED_INFO_TYPE};
@@ -635,6 +636,7 @@ private:
 #include "SchedEntry.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* SCHEDENTRY_H */
 
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index 31e916fe049..46c78a39f84 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #ifndef SCHEDULER_H
+#include "ace/pre.h"
 #define SCHEDULER_H
 
 #include "ace/ACE.h"
@@ -295,6 +296,7 @@ typedef ACE_Scheduler Scheduler;
 #include "Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* SCHEDULER_H */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index 181a4307093..b2456bfb6e5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef SCHEDULER_INTERNAL_H
+#include "ace/pre.h"
 #define SCHEDULER_INTERNAL_H
 
 #include "Scheduler.h"
@@ -54,7 +55,7 @@ public:
   // Obtains a Config_Info based on its priority.
 
   // = Computes the schedule.
-  virtual status_t 
+  virtual status_t
     schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> &anomaly_set);
 
   // = Access a thread priority.
@@ -131,6 +132,7 @@ private:
 #include "Scheduler_Generic.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* SCHEDULER_INTERNAL_H */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index d13d8c9e51e..d99a4581f32 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef STRATEGY_SCHEDULER_H
+#include "ace/pre.h"
 #define STRATEGY_SCHEDULER_H
 
 #include "DynSched.h"
@@ -123,9 +124,9 @@ public:
 
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry) = 0;
-    // = Compares two dispatch entries in strategy specific high to low 
-    //   priority ordering: returns -1 if the first Dispatch_Entry is greater 
-    //   in the order, 0 if they are equivalent, or 1 if the second 
+    // = Compares two dispatch entries in strategy specific high to low
+    //   priority ordering: returns -1 if the first Dispatch_Entry is greater
+    //   in the order, 0 if they are equivalent, or 1 if the second
     //   Dispatch_Entry is greater in the order.
 
   virtual void sort (Dispatch_Entry **dispatch_entries,
@@ -150,8 +151,8 @@ public:
 
   virtual int static_subpriority_comp (const Dispatch_Entry &first_entry,
                                        const Dispatch_Entry &second_entry);
-    // = Provides a lowest level ordering based first on importance 
-    // (descending), and then on the dependency topological sort finishing 
+    // = Provides a lowest level ordering based first on importance
+    // (descending), and then on the dependency topological sort finishing
     // time (ascending).
 
   virtual ACE_DynScheduler::Dispatching_Type
@@ -165,11 +166,11 @@ protected:
     // = Compares two dispatch entries using the specific priority, dynamic
     //   subpriority, and static subpriority method definitions provided by
     //   the derived strategy class to produce the strategy specific sort
-    //   ordering: returns -1 if the first Dispatch_Entry is greater in the 
+    //   ordering: returns -1 if the first Dispatch_Entry is greater in the
     //   order, 0 if they are equivalent, or 1 if the second Dispatch_Entry is
-    //   greater in the order.  This is an example of the Template Method 
-    //   pattern (and also of Pree's Unification Metapattern), in which 
-    //   derived classes provide  definitions of the methods on which the 
+    //   greater in the order.  This is an example of the Template Method
+    //   pattern (and also of Pree's Unification Metapattern), in which
+    //   derived classes provide  definitions of the methods on which the
     //   sort_comp Template Method relies.
 
   ACE_DynScheduler::Preemption_Priority minimum_critical_priority_;
@@ -199,13 +200,13 @@ public:
 
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Compares two dispatch entries by maximum criticality: returns -1 if 
-    //   the first Dispatch_Entry is greater in the order, 0 if they're 
+    // = Compares two dispatch entries by maximum criticality: returns -1 if
+    //   the first Dispatch_Entry is greater in the order, 0 if they're
     //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
 
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array 
+    // = Sorts the dispatch entry link pointer array
     //   in descending urgency order.
 
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
@@ -269,7 +270,7 @@ public:
 
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array in 
+    // = Sorts the dispatch entry link pointer array in
     //   descending RMS (rate) order.
 
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
@@ -325,7 +326,7 @@ public:
 
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Just returns 0, as all dispatch entries are of equivalent 
+    // = Just returns 0, as all dispatch entries are of equivalent
     //   static priority under MLF.
 
   virtual void sort (Dispatch_Entry **dispatch_entries,
@@ -385,12 +386,12 @@ public:
 
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Returns 0, as all dispatch entries are of equivalent 
+    // = Returns 0, as all dispatch entries are of equivalent
     //   priority under EDF.
 
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array 
+    // = Sorts the dispatch entry link pointer array
     //   in ascending deadline (period) order.
 
   virtual ACE_DynScheduler::Dispatching_Type
@@ -412,7 +413,7 @@ protected:
     (const Dispatch_Entry &first_entry,
      const Dispatch_Entry &second_entry);
     // = Orders two dispatch entries by ascending time to deadline: returns -1
-    //   if the first Dispatch_Entry is greater in the order, 0 if they're 
+    //   if the first Dispatch_Entry is greater in the order, 0 if they're
     //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
 
 private:
@@ -431,7 +432,7 @@ class TAO_ORBSVCS_Export ACE_Criticality_Scheduler_Strategy : public ACE_Schedul
   //    ACE_Criticality_Scheduler_Strategy
   //
   // = DESCRIPTION
-  //    Defines "schedule" method using a simple mapping directly from 
+  //    Defines "schedule" method using a simple mapping directly from
   //    operation criticality to static priority.
 {
 public:
@@ -453,7 +454,7 @@ public:
 
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sort the dispatch entry link pointer array in descending 
+    // = Sort the dispatch entry link pointer array in descending
     //   criticality order.
 
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
@@ -492,6 +493,7 @@ private:
 #include "Strategy_Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* STRATEGY_SCHEDULER_H */
 
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index b9f9f1e86ec..d768ad32761 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SCHEDULER_FACTORY_H
+#include "ace/pre.h"
 #define ACE_SCHEDULER_FACTORY_H
 
 #include "ace/OS.h"
@@ -198,6 +199,7 @@ private:
 #include "orbsvcs/Scheduler_Factory.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SCHEDULER_FACTORY_H */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index 87754b8a83e..619ba87015e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ACE_SCHEDULER_UTILITIES_H
+#include "ace/pre.h"
 #define ACE_SCHEDULER_UTILITIES_H
 
 #include "ace/OS.h"
@@ -64,4 +65,5 @@ public:
 #include "orbsvcs/Scheduler_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ACE_SCHEDULER_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index cca8ce959d4..224083a7a6b 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_TIO_H
+#include "ace/pre.h"
 #define TAO_TIO_H
 
 #include "tao/TAO.h"
@@ -80,4 +81,5 @@ private:
   // its fields filled in with the corresponding values from the TIO.
 };
 
+#include "ace/post.h"
 #endif /* TAO_TIO_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index a33455bde0e..1f9a371d7db 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_TIME_SERVICE_CLERK_H
+#include "ace/pre.h"
 #define TAO_TIME_SERVICE_CLERK_H
 
 #include "ace/Reactor.h"
@@ -132,4 +133,5 @@ private:
   // the event handler.
 };
 
+#include "ace/post.h"
 #endif /* TIME_SERVICE_CLERK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 6e43107959a..67aade1b8d1 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_TIME_SERVICE_SERVER_H
+#include "ace/pre.h"
 #define TAO_TIME_SERVICE_SERVER_H
 
 #include "orbsvcs/TimeServiceS.h"
@@ -76,4 +77,5 @@ public:
 
 };
 
+#include "ace/post.h"
 #endif /* TAO_TIME_SERVICE_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b141b453cd4..38963b88aa5 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_UTO_H
+#include "ace/pre.h"
 #define TAO_UTO_H
 
 #include "orbsvcs/TimeServiceS.h"
@@ -106,4 +107,5 @@ private:
   // for them.
 };
 
+#include "ace/post.h"
 #endif /* TAO_UTO_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 20f0ef93545..938d57b7427 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -22,6 +22,7 @@
 // ============================================================================
 
 #ifndef TIMER_HELPER_H
+#include "ace/pre.h"
 #define	TIMER_HELPER_H
 
 #include "ace/Event_Handler.h"
@@ -69,4 +70,5 @@ protected:
   // The set of server IORs.
 };
 
+#include "ace/post.h"
 #endif /* TIMER_HELPER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 89fe036aa66..f304ee1e602 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #ifndef ORBSVCS_TIME_UTILITIES_H
+#include "ace/pre.h"
 #define ORBSVCS_TIME_UTILITIES_H
 
 #include "orbsvcs/TimeBaseC.h"
@@ -70,4 +71,5 @@ public:
 #include "orbsvcs/Time_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* ORBSVCS_TIME_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index a534da85245..3d3c70f4d02 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -15,6 +15,7 @@
 // ========================================================================
 
 #ifndef TAO_CONSTRAINT_INTERPRETER_H
+#include "ace/pre.h"
 #define TAO_CONSTRAINT_INTERPRETER_H
 
 #include "Constraint_Nodes.h"
@@ -154,4 +155,5 @@ private:
   // The ordered list of offers.
 };
 
+#include "ace/post.h"
 #endif /* TAO_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index 5ee394180ab..7d02cb5a0dd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -15,6 +15,7 @@
 // =====================================================================
 
 #ifndef TAO_CONSTRAINT_NODES_H
+#include "ace/pre.h"
 #define TAO_CONSTRAINT_NODES_H
 
 #include "Constraint_Tokens.h"
@@ -327,4 +328,5 @@ class TAO_Literal_Constraint : public TAO_Constraint
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_CONSTRAINT_NODES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
index 8885af2cf40..6ef96c79d78 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef CONSTRAINT_TOKEN_H
+#include "ace/pre.h"
 #define CONSTRAINT_TOKEN_H
 
 # define TAO_GT 257
@@ -39,6 +40,7 @@
 # define TAO_RANDOM 290
 
 
+#include "ace/post.h"
 #endif //CONSTRAINT_TOKEN_H
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index d9837b172b8..c0abb6e2b77 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -15,6 +15,7 @@
 // ========================================================================
 
 #ifndef TAO_CONSTRAINT_VISITOR_H
+#include "ace/pre.h"
 #define TAO_CONSTRAINT_VISITOR_H
 
 #include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h"
@@ -426,4 +427,5 @@ public:
   // then uses the appropriate form of equals comparison.
 };
 
+#include "ace/post.h"
 #endif /* CONSTRAINT_VISITORS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index 188646481a3..fa3ca1ad2f3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -15,6 +15,7 @@
 // ========================================================================
 
 #ifndef TAO_TCL_INTERPRETER_H
+#include "ace/pre.h"
 #define TAO_TCL_INTERPRETER_H
 
 #include "Constraint_Nodes.h"
@@ -95,4 +96,5 @@ typedef union
 extern YYSTYPE yylval;
 extern YYSTYPE yyval;
 
+#include "ace/post.h"
 #endif /* TAO_TCL_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index c5da9db3519..136697b684f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef TAO_INTERPRETER_UTILS_H
+#include "ace/pre.h"
 #define TAO_INTERPRETER_UTILS_H
 
 #include "ace/Hash_Map_Manager.h"
@@ -63,4 +64,5 @@ public:
   // is <code>.
 };
 
+#include "ace/post.h"
 #endif /* TAO_INTERPRETER_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
index cf3ccab6337..dd7b47ed0f2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
@@ -1,6 +1,7 @@
 // $Id$
 
 #ifndef TAO_INTERPRETER_UTILS_T_H
+#include "ace/pre.h"
 #define TAO_INTERPRETER_UTILS_T_H
 
 #include "tao/corba.h"
@@ -12,4 +13,5 @@ CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand
 #include "Interpreter_Utils_T.cpp"
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
+#include "ace/post.h"
 #endif /* TAO_INTERPRETER_UTILS_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
index 4db78119f9b..b043bcf55dd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
@@ -16,6 +16,7 @@
 //
 // ==========================================================================
 #ifndef TAO_LOCKING_H
+#include "ace/pre.h"
 #define TAO_LOCKING_H
 
 #include "tao/corba.h"
@@ -44,4 +45,5 @@ ACE_Read_Guard<MUTEX> OBJ (LOCK); \
 if (OBJ.locked () == 0) \
   TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), RETURN);
 
+#include "ace/post.h"
 #endif /* TAO_LOCKING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 0924c25142f..a4fba3a9c17 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -15,6 +15,7 @@
 // ========================================================================
 
 #ifndef TAO_OFFER_DATABASE_H
+#include "ace/pre.h"
 #define TAO_OFFER_DATABASE_H
 
 #include "Trader.h"
@@ -196,4 +197,5 @@ class TAO_Service_Offer_Iterator
 #include "Offer_Database.cpp"
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
+#include "ace/post.h"
 #endif /* TAO_SERVICE_TYPE_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 84573a4001c..ac9eb77db9c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #ifndef TAO_OFFER_ITERATORS_H
+#include "ace/pre.h"
 #define TAO_OFFER_ITERATORS_H
 
 #include "Trader_Utils.h"
@@ -290,4 +291,5 @@ class TAO_Offer_Id_Iterator :
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_OFFER_ITERATOR */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 977412b7c29..6aa94f0de27 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -16,6 +16,7 @@
 // ========================================================================
 
 #ifndef TAO_REGISTER_OFFER_ITERATOR_H
+#include "ace/pre.h"
 #define TAO_REGISTER_OFFER_ITERATOR_H
 
 #include "Offer_Iterators.h"
@@ -87,4 +88,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_REGISTER_OFFER_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index c4e6139ad80..e150a234744 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -16,6 +16,7 @@
 // ========================================================================
 
 #ifndef TAO_SERVICE_TYPE_REPOSITORY_H
+#include "ace/pre.h"
 #define TAO_SERVICE_TYPE_REPOSITORY_H
 
 #include "Trader.h"
@@ -295,4 +296,5 @@ public:
   // repository.
 };
 
+#include "ace/post.h"
 #endif /* TAO_SERVICE_TYPE_REPOSITORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index a64924c3bca..82e6b621e21 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -27,6 +27,7 @@
 // ============================================================================
 
 #ifndef TAO_TRADER_BASE_H
+#include "ace/pre.h"
 #define TAO_TRADER_BASE_H
 
 #include "Interpreter_Utils.h"
@@ -485,4 +486,5 @@ int operator== (const CosTrading::Admin::OctetSeq& left,
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_TRADER_BASE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
index 7072c9c579f..aee93b310ba 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -14,6 +14,7 @@
 // ========================================================================
 
 #ifndef TAO_TRADER_CONSTRAINT_VISITOR_H
+#include "ace/pre.h"
 #define TAO_TRADER_CONSTRAINT_VISITOR_H
 
 #include "Constraint_Visitors.h"
@@ -53,4 +54,5 @@ class TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator
   // they dyanmic or static.
 };
 
+#include "ace/post.h"
 #endif /* TAO_TRADER_CONSTRAINT_VISITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index db919be9e96..2608eb947c1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -17,6 +17,7 @@
 // ========================================================================
 
 #ifndef TAO_TRADER_INTERFACES_H
+#include "ace/pre.h"
 #define TAO_TRADER_INTERFACES_H
 
 #include "Trader_Utils.h"
@@ -1011,4 +1012,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_TRADER_INTERFACES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index 3527f561b90..e03a353937c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -17,6 +17,7 @@
 // ========================================================================
 
 #ifndef TAO_TRADER_H
+#include "ace/pre.h"
 #define TAO_TRADER_H
 
 #include "Trader.h"
@@ -255,4 +256,5 @@ public:
 #include "Trader_T.cpp"
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
+#include "ace/post.h"
 #endif /* ACE_TRADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 7a0fa9e22d2..1efa88d70d4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -29,6 +29,7 @@
 // ========================================================================
 
 #ifndef TAO_TRADER_UTILS_H
+#include "ace/pre.h"
 #define TAO_TRADER_UTILS_H
 
 #include "Trader.h"
@@ -741,4 +742,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TAO_TRADER_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index f5477459d01..6aa667b83e6 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -5199,7 +5199,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5238,7 +5238,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5355,7 +5355,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5389,6 +5389,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosEventChannelAdmin.idl
+InputName=CosEventChannelAdmin
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -5406,7 +5440,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5445,7 +5479,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5562,7 +5596,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5596,6 +5630,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosEventComm.idl
+InputName=CosEventComm
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -5613,7 +5681,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5652,7 +5720,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5769,7 +5837,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5803,6 +5871,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosLifeCycle.idl
+InputName=CosLifeCycle
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -5820,7 +5922,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5859,7 +5961,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -5976,7 +6078,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6010,6 +6112,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosNaming.idl
+InputName=CosNaming
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -6027,7 +6163,7 @@ InputPath=.\CosNotification.idl
 InputName=CosNotification
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6066,7 +6202,7 @@ InputPath=.\CosNotification.idl
 InputName=CosNotification
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6180,7 +6316,7 @@ InputPath=.\CosNotification.idl
 InputName=CosNotification
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6213,6 +6349,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosNotification.idl
+InputName=CosNotification
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -6230,7 +6400,7 @@ InputPath=.\CosNotifyChannelAdmin.idl
 InputName=CosNotifyChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6269,7 +6439,7 @@ InputPath=.\CosNotifyChannelAdmin.idl
 InputName=CosNotifyChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6383,7 +6553,7 @@ InputPath=.\CosNotifyChannelAdmin.idl
 InputName=CosNotifyChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6416,6 +6586,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosNotifyChannelAdmin.idl
+InputName=CosNotifyChannelAdmin
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -6433,7 +6637,7 @@ InputPath=.\CosNotifyComm.idl
 InputName=CosNotifyComm
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6472,7 +6676,7 @@ InputPath=.\CosNotifyComm.idl
 InputName=CosNotifyComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6586,7 +6790,7 @@ InputPath=.\CosNotifyComm.idl
 InputName=CosNotifyComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6619,6 +6823,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosNotifyComm.idl
+InputName=CosNotifyComm
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -6636,7 +6874,7 @@ InputPath=.\CosNotifyFilter.idl
 InputName=CosNotifyFilter
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6675,7 +6913,7 @@ InputPath=.\CosNotifyFilter.idl
 InputName=CosNotifyFilter
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6789,7 +7027,7 @@ InputPath=.\CosNotifyFilter.idl
 InputName=CosNotifyFilter
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6822,6 +7060,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosNotifyFilter.idl
+InputName=CosNotifyFilter
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -6839,7 +7111,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6878,7 +7150,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -6995,7 +7267,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7029,6 +7301,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosPropertyService.idl
+InputName=CosPropertyService
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -7046,7 +7352,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7085,7 +7391,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7202,7 +7508,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7236,6 +7542,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosTrading.idl
+InputName=CosTrading
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -7253,7 +7593,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7292,7 +7632,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7409,7 +7749,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7443,6 +7783,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosTradingDynamic.idl
+InputName=CosTradingDynamic
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -7460,7 +7834,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7499,7 +7873,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7616,7 +7990,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7650,6 +8024,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\CosTradingRepos.idl
+InputName=CosTradingRepos
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -7667,7 +8075,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7706,7 +8114,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7752,7 +8160,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7785,6 +8193,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\DsLogAdmin.idl
+InputName=DsLogAdmin
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -7802,7 +8244,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7841,7 +8283,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7958,7 +8400,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -7992,6 +8434,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\LifeCycleService.idl
+InputName=LifeCycleService
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -8009,7 +8485,7 @@ InputPath=.\RtecDefaultEventData.idl
 InputName=RtecDefaultEventData
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8048,7 +8524,7 @@ InputPath=.\RtecDefaultEventData.idl
 InputName=RtecDefaultEventData
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8162,7 +8638,7 @@ InputPath=.\RtecDefaultEventData.idl
 InputName=RtecDefaultEventData
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8195,6 +8671,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecDefaultEventData.idl
+InputName=RtecDefaultEventData
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -8212,7 +8722,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8251,7 +8761,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8365,7 +8875,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8398,6 +8908,40 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"
 
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecEventChannelAdmin.idl
+InputName=RtecEventChannelAdmin
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -8415,7 +8959,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8454,7 +8998,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8571,7 +9115,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8605,6 +9149,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecEventComm.idl
+InputName=RtecEventComm
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -8622,7 +9200,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8661,7 +9239,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8778,7 +9356,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8812,6 +9390,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecScheduler.idl
+InputName=RtecScheduler
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -8829,7 +9441,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8868,7 +9480,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -8985,7 +9597,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9019,6 +9631,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\RtecUDPAdmin.idl
+InputName=RtecUDPAdmin
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -9036,7 +9682,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9075,7 +9721,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9192,7 +9838,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9226,6 +9872,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\TimeBase.idl
+InputName=TimeBase
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
@@ -9243,7 +9923,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao       -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9282,7 +9962,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h  -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9399,7 +10079,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h     -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -9433,6 +10113,40 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)
+InputPath=.\TimeService.idl
+InputName=TimeService
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao     -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h       -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
index fd8548f6f43..10855aee4c2 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
@@ -5,6 +5,7 @@
 // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 // ------------------------------
 #ifndef TAO_ORBSVCS_EXPORT_H
+#include "ace/pre.h"
 #define TAO_ORBSVCS_EXPORT_H
 
 #include "ace/OS.h"
@@ -31,5 +32,6 @@
 #  define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
 #endif     /* TAO_ORBSVCS_HAS_DLL */
 
+#include "ace/post.h"
 #endif     /* TAO_ORBSVCS_EXPORT_H */
            // End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 8f55c0b95c1..6b7c32b99e3 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -2145,7 +2145,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2184,7 +2184,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2230,7 +2230,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2269,7 +2269,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2315,7 +2315,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2354,7 +2354,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2400,7 +2400,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2439,7 +2439,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2483,7 +2483,7 @@ InputPath=.\CosNotification.idl
 InputName=CosNotification
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2520,7 +2520,7 @@ InputPath=.\CosNotification.idl
 InputName=CosNotification
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2564,7 +2564,7 @@ InputPath=.\CosNotifyChannelAdmin.idl
 InputName=CosNotifyChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2601,7 +2601,7 @@ InputPath=.\CosNotifyChannelAdmin.idl
 InputName=CosNotifyChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2645,7 +2645,7 @@ InputPath=.\CosNotifyComm.idl
 InputName=CosNotifyComm
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2682,7 +2682,7 @@ InputPath=.\CosNotifyComm.idl
 InputName=CosNotifyComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2726,7 +2726,7 @@ InputPath=.\CosNotifyFilter.idl
 InputName=CosNotifyFilter
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2763,7 +2763,7 @@ InputPath=.\CosNotifyFilter.idl
 InputName=CosNotifyFilter
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2809,7 +2809,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2848,7 +2848,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2894,7 +2894,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2933,7 +2933,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -2979,7 +2979,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3018,7 +3018,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3064,7 +3064,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3103,7 +3103,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3149,7 +3149,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3188,7 +3188,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3234,7 +3234,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3273,7 +3273,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3319,7 +3319,7 @@ InputPath=.\RtecDefaultEventData.idl
 InputName=RtecDefaultEventData
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3358,7 +3358,7 @@ InputPath=.\RtecDefaultEventData.idl
 InputName=RtecDefaultEventData
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3404,7 +3404,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3443,7 +3443,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3489,7 +3489,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3528,7 +3528,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3574,7 +3574,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3613,7 +3613,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3659,7 +3659,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3698,7 +3698,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3744,7 +3744,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3783,7 +3783,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3829,7 +3829,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService
 
 BuildCmds= \
-	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export                   -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao          -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h            -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -3868,7 +3868,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService
 
 BuildCmds= \
-	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao        -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
+	..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao      -Wb,pre_include=ace/pre.h   -Wb,post_include=ace/post.h    -Wb,export_macro=TAO_ORBSVCS_Export                                                          -Wb,export_include=orbsvcs_export.h $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)