ChangeLogTag: Mon May 23 10:24:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

81 files changed, 452 insertions, 226 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index ac5540f7da4..85ef35fe098 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -16,7 +16,7 @@
 #define TAO_ECG_ADAPTERS_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -34,7 +34,7 @@ class ACE_SOCK_Dgram;
  *        by multicast and udp handlers in EC gateways, so the
  *        handlers can be notified of shutdown (usually by Event Receivers).
  */
-class TAO_RTEvent_Export TAO_ECG_Handler_Shutdown
+class TAO_RTEvent_Serv_Export TAO_ECG_Handler_Shutdown
 {
 public:
 
@@ -52,7 +52,7 @@ public:
  *        available on the dgram for reading, and to query them about
  *        event type to mcast group mappings.
  */
-class TAO_RTEvent_Export TAO_ECG_Dgram_Handler
+class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index 97f2cf073c3..743b0907022 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -12,7 +12,7 @@
 #define TAO_ECG_ADDRESS_SERVER_BASE_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "EC_Lifetime_Utils.h"
 #include "ace/Auto_Ptr.h"
@@ -26,7 +26,7 @@
  * Adds init () virtual method so that all AddrServer implementations can be
  * initialized in the same fasion.
  */
-class TAO_RTEvent_Export TAO_ECG_Address_Server_Base :
+class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base :
   public virtual POA_RtecUDPAdmin::AddrServer,
   public virtual PortableServer::RefCountServantBase
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index abdebd55529..e63c40c571f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -139,7 +139,7 @@ private:
  * Once all the fragments have been received the message is sent
  * up to the calling classes, and the memory reclaimed.
  */
-class TAO_RTEvent_Export TAO_ECG_CDR_Message_Receiver
+class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Receiver
 {
 public:
   /// Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 80c73e8db91..9b4d1e55c42 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -70,7 +70,7 @@
  * // Ensures the header ends at an 8-byte boundary.
  * }; // size (in CDR stream) = 32
  */
-class TAO_RTEvent_Export TAO_ECG_CDR_Message_Sender
+class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Sender
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index f8441511cf4..956d89a1310 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "ace/Hash_Map_Manager_T.h"
@@ -44,7 +44,7 @@
  * "*@230.100.0.2:2300 45@230.100.123.43:2300"
  *
  */
-class TAO_RTEvent_Export TAO_ECG_Complex_Address_Server :
+class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server :
   public virtual POA_RtecUDPAdmin::AddrServer,
   public virtual PortableServer::RefCountServantBase
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index 62829a96c20..ccb9430a14a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -20,7 +20,7 @@
 
 #include "tao/Basic_Types.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_Gateway_IIOP;
 class TAO_EC_ProxyPushSupplier;
@@ -40,7 +40,7 @@ namespace CORBA
  * This strategy handles misbehaving or failing event channels that are consumer
  * of a gateway.
  */
-class TAO_RTEvent_Export TAO_ECG_ConsumerEC_Control
+class TAO_RTEvent_Serv_Export TAO_ECG_ConsumerEC_Control
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 25f55f68033..ed8dd5c3707 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -28,7 +28,7 @@
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "ECG_Adapters.h"
 #include "EC_Lifetime_Utils.h"
 #include "EC_Lifetime_Utils_T.h"
@@ -46,7 +46,7 @@
  * which reads the data, transforms it into event and pushes to the
  * Event Channel.
  */
-class TAO_RTEvent_Export TAO_ECG_Mcast_EH :
+class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_EH :
   public ACE_Event_Handler,
   public TAO_ECG_Handler_Shutdown
 {
@@ -208,7 +208,7 @@ private:
    * observer connection to the Event Channel, automatically
    * disconnecting from ec in its destructor, if necessary.
    */
-  class TAO_RTEvent_Export Observer_Disconnect_Command
+  class TAO_RTEvent_Serv_Export Observer_Disconnect_Command
   {
   public:
     Observer_Disconnect_Command (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index e445fc01128..f29ba5a50e8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -18,7 +18,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ECG_Defaults.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "ECG_UDP_Receiver.h"
 #include "ECG_UDP_Out_Endpoint.h"
 #include "ace/Service_Object.h"
@@ -120,7 +120,7 @@ class ACE_Event_Handler;
  * Default configuration values (for either use case) can be found in
  * ECG_Defaults.h
  */
-class TAO_RTEvent_Export TAO_ECG_Mcast_Gateway
+class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_Gateway
   : public ACE_Service_Object
 {
 public:
@@ -179,7 +179,7 @@ public:
    * hard without exceptions and ACE+TAO are somewhat shy of
    * exceptions at this point.)
    */
-  struct TAO_RTEvent_Export Attributes
+  struct TAO_RTEvent_Serv_Export Attributes
   {
     Attributes (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index f09e0da850e..6c745ac5655 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -37,7 +37,7 @@ class TAO_EC_Gateway_IIOP;
  * periodically wakeup and verify the state of the consumers
  * registered with the Event Channel.
  */
-class TAO_RTEvent_Export TAO_ECG_Reactive_ConsumerEC_Control_Adapter
+class TAO_RTEvent_Serv_Export TAO_ECG_Reactive_ConsumerEC_Control_Adapter
   : public ACE_Event_Handler
 {
 public:
@@ -61,7 +61,7 @@ private:
  * Defines the interface for the consumer event channel control strategy.
  * This strategy handles misbehaving or failing consumer event channels.
  */
-class TAO_RTEvent_Export TAO_ECG_Reactive_ConsumerEC_Control
+class TAO_RTEvent_Serv_Export TAO_ECG_Reactive_ConsumerEC_Control
   : public TAO_ECG_ConsumerEC_Control
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index efad4e64e31..1b9733b2989 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -36,7 +36,7 @@ class TAO_EC_Gateway_IIOP;
  * periodically wakeup and verify the state of the consumers
  * registered with the Event Channel.
  */
-class TAO_RTEvent_Export TAO_ECG_Reconnect_ConsumerEC_Control_Adapter
+class TAO_RTEvent_Serv_Export TAO_ECG_Reconnect_ConsumerEC_Control_Adapter
   : public ACE_Event_Handler
 {
 public:
@@ -65,7 +65,7 @@ private:
  * a restart of the consumer ec must be handled correctly, then the consumer
  * ec must use a persistent IOR.
  */
-class TAO_RTEvent_Export TAO_ECG_Reconnect_ConsumerEC_Control
+class TAO_RTEvent_Serv_Export TAO_ECG_Reconnect_ConsumerEC_Control
   : public TAO_ECG_ConsumerEC_Control
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 502b3a555d9..bfa6600398d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -24,7 +24,7 @@
  * This simple server always returns multicast address it was
  * initialized with, regardless of the header.
  */
-class TAO_RTEvent_Export TAO_ECG_Simple_Address_Server :
+class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server :
   public virtual POA_RtecUDPAdmin::AddrServer,
   public virtual PortableServer::RefCountServantBase
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index e2922882f3b..e1b4bdfd13c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -17,7 +17,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "ECG_Adapters.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
@@ -32,7 +32,7 @@
  *
  *        NOT THREAD-SAFE.
  */
-class TAO_RTEvent_Export TAO_ECG_Simple_Mcast_EH
+class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Mcast_EH
   : public ACE_Event_Handler
   , public TAO_ECG_Handler_Shutdown
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
index 515df78bebe..c5fbe539767 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "ECG_Adapters.h"
 #include "ace/SOCK_Dgram.h"
 
@@ -38,7 +38,7 @@ class TAO_ECG_UDP_Receiver;
  *
  * NOT THREAD-SAFE.
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_EH :
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_EH :
   public ACE_Event_Handler
 , public TAO_ECG_Handler_Shutdown
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
index e36f6ebdae2..1dd40b093d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +38,7 @@ class ACE_INET_Addr;
  * datagram SAP; for instance we need to keep track of the request
  * id.
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_Out_Endpoint
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Out_Endpoint
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h
index 7c19354fb8b..6cbbad89ff0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h
@@ -56,7 +56,7 @@
  * }; // size (in CDR stream) = 32<BR>
  *
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_Protocol
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Protocol
 {
 public:
   enum {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 68090d4b7aa..15ee75ab745 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -44,7 +44,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "ECG_Adapters.h"
 #include "EC_Lifetime_Utils.h"
@@ -64,7 +64,7 @@ class ACE_Reactor;
  * supplier connection to the Event Channel, automatically disconnecting from
  * @a proxy in its destructor, if necessary.
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_Receiver_Disconnect_Command
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver_Disconnect_Command
 {
 public:
   TAO_ECG_UDP_Receiver_Disconnect_Command (void);
@@ -94,7 +94,7 @@ private:
  * This class connects as a supplier to an EventChannel, and supplies
  * to it all events it receives via UDP or Multicast.
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_Receiver
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver
   : public virtual PortableServer::RefCountServantBase
   , public virtual POA_RtecEventComm::PushSupplier
   , public virtual TAO_EC_Deactivated_Object
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 00b1a6181b2..6c0d3caa02b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -44,7 +44,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
 #include "EC_Lifetime_Utils.h"
@@ -64,7 +64,7 @@ class TAO_ECG_UDP_Out_Endpoint;
  * consumer connection to the Event Channel, automatically disconnecting from
  * @a proxy in its destructor, if necessary.
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_Sender_Disconnect_Command
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender_Disconnect_Command
 {
 public:
   TAO_ECG_UDP_Sender_Disconnect_Command (void);
@@ -94,7 +94,7 @@ private:
  * and forwards the events it receives from that EC using UDP.
  *
  */
-class TAO_RTEvent_Export TAO_ECG_UDP_Sender :
+class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender :
   public virtual PortableServer::RefCountServantBase,
   public virtual POA_RtecEventComm::PushConsumer,
   public TAO_EC_Deactivated_Object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index cdf21b9d9fe..96d3d536d54 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -33,7 +33,7 @@
  * <H2>Memory Management</H2>
  * It assumes ownership of the children.
  */
-class TAO_RTEvent_Export TAO_EC_And_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_And_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor. It assumes ownership of both the array and the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index 8ba827cf306..9a886ff0c04 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -36,7 +36,7 @@
  * This object creates a single instance of the Supplier
  *
  */
-class TAO_RTEvent_Export TAO_EC_Basic_Factory : public TAO_EC_Factory
+class TAO_RTEvent_Serv_Export TAO_EC_Basic_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 1ca88a403cb..98288fd5a2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -19,7 +19,7 @@
 
 #include "EC_Filter_Builder.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,7 +37,7 @@ class TAO_EC_Event_Channel_Base;
  * (source/type based filtering + disjunctions, conjunctions, logical ands,
  * negations, and bitmasks) are constructed using this class.
  */
-class TAO_RTEvent_Export TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Builder
 {
 public:
   /// constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index f999bb1d34f..6403738045f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EC_Filter.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,7 +40,7 @@
  * <H2>Memory Management</H2>
  * It assumes ownership of the child.
  */
-class TAO_RTEvent_Export TAO_EC_Bitmask_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Bitmask_Filter : public TAO_EC_Filter
 {
 public:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
index c4628e80cb6..90ae3a9b1ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
@@ -8,7 +8,7 @@
 #ifndef EC_CHANNEL_DESTROYER__H_
 #define EC_CHANNEL_DESTROYER__H_
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "EC_Event_Channel_Base.h"
 #include "ace/Auto_Functor.h"
 
@@ -17,7 +17,7 @@
  *
  * @brief Implements a functor for the TAO_EC_Channel_Destroyer class.
  */
-struct TAO_RTEvent_Export TAO_EC_Channel_Destroyer_Functor
+struct TAO_RTEvent_Serv_Export TAO_EC_Channel_Destroyer_Functor
 {
   typedef  TAO_EC_Event_Channel_Base * argument;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index f1f3a95f60f..80493b3838d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EC_Filter.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +35,7 @@
  * <H2>Memory Management</H2>
  * It assumes ownership of the children.
  */
-class TAO_RTEvent_Export TAO_EC_Conjunction_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Conjunction_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor. It assumes ownership of both the array and the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index df1d376da28..e6d2ee2f90f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -25,7 +25,7 @@
 
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushConsumer;
@@ -45,7 +45,7 @@ class TAO_EC_ProxyPushConsumer;
  * <H2>Locking</H2>
  * No provisions for locking, access must be serialized externally.
  */
-class TAO_RTEvent_Export TAO_EC_ConsumerAdmin
+class TAO_RTEvent_Serv_Export TAO_EC_ConsumerAdmin
   : public POA_RtecEventChannelAdmin::ConsumerAdmin
   , public TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer>
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 2ea9b266e35..4ad494b96fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -18,7 +18,7 @@
 #include /**/ "ace/pre.h"
 #include "ace/CORBA_macros.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -41,7 +41,7 @@ namespace CORBA
  * Defines the interface for the consumer control strategy.
  * This strategy handles misbehaving or failing consumers.
  */
-class TAO_RTEvent_Export TAO_EC_ConsumerControl
+class TAO_RTEvent_Serv_Export TAO_EC_ConsumerControl
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 03c7369655f..8dbc951d1b1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -948,7 +948,7 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory,
                        &ACE_SVC_NAME (TAO_EC_Default_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO_RTEvent, TAO_EC_Default_Factory)
+ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Default_Factory)
 
 // ****************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 722417dad38..a5f3e0f5113 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -40,7 +40,7 @@
  * Since the class can be dynamically loaded the strategies can be
  * set in the service configurator file.
  */
-class TAO_RTEvent_Export TAO_EC_Default_Factory : public TAO_EC_Factory
+class TAO_RTEvent_Serv_Export TAO_EC_Default_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
@@ -185,7 +185,7 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory)
-ACE_FACTORY_DECLARE (TAO_RTEvent, TAO_EC_Default_Factory)
+ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Default_Factory)
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 58cd1d5d2e4..7b0f7648cef 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -33,7 +33,7 @@ class TAO_EC_Supplier_Filter;
  * @brief implements RtecEventChannelAdmin::ProxyPushConsumer interface.
  *
  */
-class TAO_RTEvent_Export TAO_EC_Default_ProxyPushConsumer :
+class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushConsumer :
   public POA_RtecEventChannelAdmin::ProxyPushConsumer,
   public TAO_EC_ProxyPushConsumer
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index 20685888574..2284340aad3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -28,7 +28,7 @@
  * @brief Implement the ReliableEventChannelAdmin::ProxyPushSupplier
  *         interface
  */
-class TAO_RTEvent_Export TAO_EC_Default_ProxyPushSupplier :
+class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier :
   public POA_RtecEventChannelAdmin::ProxyPushSupplier,
   public TAO_EC_ProxyPushSupplier
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index 18f756efe73..c8886235d9a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -33,7 +33,7 @@
  * <H2>Memory Management</H2>
  * It assumes ownership of the children.
  */
-class TAO_RTEvent_Export TAO_EC_Disjunction_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Disjunction_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor. It assumes ownership of both the array and the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index d61d5039829..8d125229aa1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -19,7 +19,7 @@
 
 #include "orbsvcs/RtecEventCommC.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,7 +40,7 @@ class TAO_EC_ProxyPushSupplier;
  * for each queue or can simply push the event to the consumer in
  * FIFO order.
  */
-class TAO_RTEvent_Export TAO_EC_Dispatching
+class TAO_RTEvent_Serv_Export TAO_EC_Dispatching
 {
 public:
   /// Destructor...
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 113c5a7b1ad..5fdaec09763 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -25,12 +25,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventCommC.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "ace/Task.h"
 #include "ace/Message_Block.h"
 #include "ace/Lock_Adapter_T.h"
 
-class TAO_RTEvent_Export TAO_EC_Queue : public ACE_Message_Queue<ACE_SYNCH>
+class TAO_RTEvent_Serv_Export TAO_EC_Queue : public ACE_Message_Queue<ACE_SYNCH>
 {
 public:
   TAO_EC_Queue (size_t high_water_mark = ACE_Message_Queue_Base::DEFAULT_HWM,
@@ -50,7 +50,7 @@ protected:
  * dispatching.
  *
  */
-class TAO_RTEvent_Export TAO_EC_Dispatching_Task : public ACE_Task<ACE_SYNCH>
+class TAO_RTEvent_Serv_Export TAO_EC_Dispatching_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
   /// Constructor
@@ -77,7 +77,7 @@ private:
 
 // ****************************************************************
 
-class TAO_RTEvent_Export TAO_EC_Dispatch_Command : public ACE_Message_Block
+class TAO_RTEvent_Serv_Export TAO_EC_Dispatch_Command : public ACE_Message_Block
 {
 public:
   /// Constructor, it will allocate its own data block
@@ -96,7 +96,7 @@ public:
 
 // ****************************************************************
 
-class TAO_RTEvent_Export TAO_EC_Shutdown_Task_Command : public TAO_EC_Dispatch_Command
+class TAO_RTEvent_Serv_Export TAO_EC_Shutdown_Task_Command : public TAO_EC_Dispatch_Command
 {
 public:
   /// Constructor
@@ -108,7 +108,7 @@ public:
 
 // ****************************************************************
 
-class TAO_RTEvent_Export TAO_EC_Push_Command : public TAO_EC_Dispatch_Command
+class TAO_RTEvent_Serv_Export TAO_EC_Push_Command : public TAO_EC_Dispatch_Command
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 20ac3add3ba..04b1ce0cfb9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -37,7 +37,7 @@
  * ConsumerAdmin and Dispatching) and to provide a simpler
  * interface to the EC_Factory.
  */
-class TAO_RTEvent_Export TAO_EC_Event_Channel :
+class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel :
   public TAO_EC_Event_Channel_Base
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 44d548e8693..9fabba95d48 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -47,7 +47,7 @@ template<class> class TAO_ESF_Worker;
  * an easy mechanism to extend the attributes without requiring
  * changes in the EC constructor.
  */
-class TAO_RTEvent_Export TAO_EC_Event_Channel_Attributes
+class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Attributes
 {
 public:
   /**
@@ -104,7 +104,7 @@ private:
  * ConsumerAdmin and Dispatching) and to provide a simpler
  * interface to the EC_Factory.
  */
-class TAO_RTEvent_Export TAO_EC_Event_Channel_Base
+class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Base
   : public POA_RtecEventChannelAdmin::EventChannel
   , public PortableServer::RefCountServantBase
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index c042c8f4150..71c1a0ebfa3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -59,7 +59,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier> TAO_EC_ProxyPushSuppl
  * Some implementations may require a different instance for the
  * EC_Factory for each instance of Event_Channel.
  */
-class TAO_RTEvent_Export TAO_EC_Factory : public ACE_Service_Object
+class TAO_RTEvent_Serv_Export TAO_EC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index ac2f8c4988c..63ec4618f78 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -19,7 +19,7 @@
 
 #include "orbsvcs/RtecEventCommC.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,7 +46,7 @@ class TAO_EC_QOS_Info;
  * <H2>Memory Management</H2>
  * It does *not* assume ownership of its parent.
  */
-class TAO_RTEvent_Export TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Filter
 {
 public:
   /// constructor...
@@ -173,7 +173,7 @@ private:
  * c) Event Channels that don't do filtering (such as CosEC
  * backends)
  */
-class TAO_RTEvent_Export TAO_EC_Null_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 33c8c9cfb7a..92a5a6353a8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -19,7 +19,7 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +38,7 @@ class TAO_EC_ProxyPushSupplier;
  * TAO_EC_Filter_Builder follows the "Builder Pattern" (Gamma et
  * al.)
  */
-class TAO_RTEvent_Export TAO_EC_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Filter_Builder
 {
 public:
   /// destructor...
@@ -62,7 +62,7 @@ public:
  *
  * Simply creates a Null_Filter in every case.
  */
-class TAO_RTEvent_Export TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_Builder
 {
 public:
   /// constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index ff55b4ca46f..c5a4253e0ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -38,7 +38,7 @@
  * strategies for EC distribution.
  *
  */
-class TAO_RTEvent_Export TAO_EC_Gateway 
+class TAO_RTEvent_Serv_Export TAO_EC_Gateway
   : public POA_RtecEventChannelAdmin::Observer
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index bf7b9436db5..178b73e93f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "EC_Gateway.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
@@ -60,7 +60,7 @@ class TAO_EC_Gateway_IIOP_Factory;
  * investigate if closer collaboration with its collocated EC could
  * be used to remove that copy.
  */
-class TAO_RTEvent_Export TAO_EC_Gateway_IIOP : public TAO_EC_Gateway
+class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP : public TAO_EC_Gateway
 {
 public:
   TAO_EC_Gateway_IIOP (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index 6359f3b26ee..48671fe8343 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -18,8 +18,8 @@
 #include "EC_Gateway_IIOP_Factory.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           EC_Gateway_IIOP_Factory, 
+ACE_RCSID (Event,
+           EC_Gateway_IIOP_Factory,
            "$Id$")
 
 int
@@ -205,7 +205,7 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Gateway_IIOP_Factory,
                        &ACE_SVC_NAME (TAO_EC_Gateway_IIOP_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO_RTEvent, TAO_EC_Gateway_IIOP_Factory)
+ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 7acd83a534f..e7d6d05d82d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -22,7 +22,7 @@
 #include "ace/Service_Object.h"
 #include "ace/SString.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 class TAO_ECG_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
@@ -34,7 +34,7 @@ class TAO_EC_Gateway_IIOP;
  *
  * Default configuration values can be found in ECG_Defaults.h
  */
-class TAO_RTEvent_Export TAO_EC_Gateway_IIOP_Factory
+class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP_Factory
   : public ACE_Service_Object
 {
 public:
@@ -97,7 +97,7 @@ protected:
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_Gateway_IIOP_Factory)
-ACE_FACTORY_DECLARE (TAO_RTEvent, TAO_EC_Gateway_IIOP_Factory)
+ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory)
 
 #if defined (__ACE_INLINE__)
 #include "EC_Gateway_IIOP_Factory.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index f2e75112740..7e6510b065c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -27,7 +27,7 @@
  *
  * @brief A scheduling strategy that preserves event groups.
  */
-class TAO_RTEvent_Export TAO_EC_Group_Scheduling : public TAO_EC_Scheduling_Strategy
+class TAO_RTEvent_Serv_Export TAO_EC_Group_Scheduling : public TAO_EC_Scheduling_Strategy
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index f9c0006b629..9c180506dd6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -17,7 +17,7 @@
 #define TAO_EC_LIFETIME_UTILS_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
@@ -35,7 +35,7 @@
  * Can be told to deactivate a servant explicitly or can do so
  * automagically, in its destructor.
  */
-class TAO_RTEvent_Export TAO_EC_Object_Deactivator
+class TAO_RTEvent_Serv_Export TAO_EC_Object_Deactivator
 {
 public:
   /// Default constructor.  Deactivation info can be supplied later
@@ -115,7 +115,7 @@ private:
  * NOTE: deactivation does NOT happen automatically, and must be
  * explicitly initiated as described above.
  */
-class TAO_RTEvent_Export TAO_EC_Deactivated_Object
+class TAO_RTEvent_Serv_Export TAO_EC_Deactivated_Object
 {
 public:
 
@@ -142,7 +142,7 @@ protected:
  * Holds a reference to an ORB, and calls destroy() on it in the
  * destructor.
  */
-class TAO_RTEvent_Export TAO_EC_ORB_Holder
+class TAO_RTEvent_Serv_Export TAO_EC_ORB_Holder
 {
 public:
   /// Constructor. No-op.
@@ -178,7 +178,7 @@ private:
  * Holds a reference to an Event Channel, and calls destroy() on it in the
  * destructor.
  */
-class TAO_RTEvent_Export TAO_EC_Event_Channel_Holder
+class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Holder
 {
 public:
   /// Constructor. No-op.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 989bb21caf8..4be04076480 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -33,7 +33,7 @@
  * threads.  It's main purpose is to decouple the suppliers from
  * the client execution time, specially in the collocated case.
  */
-class TAO_RTEvent_Export TAO_EC_MT_Dispatching : public TAO_EC_Dispatching
+class TAO_RTEvent_Serv_Export TAO_EC_MT_Dispatching : public TAO_EC_Dispatching
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 14a8392d558..09027897e7f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -34,7 +34,7 @@
  * and that:
  * (event.header.source & source_mask) == source_value
  */
-class TAO_RTEvent_Export TAO_EC_Masked_Type_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Masked_Type_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index dc6619fcd94..3dadaa50f5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EC_Filter.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,7 +34,7 @@
  * <H2>Memory Management</H2>
  * It assumes ownership of its child.
  */
-class TAO_RTEvent_Export TAO_EC_Negation_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Negation_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor. It assumes ownership of the child.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index 4214c4ddc83..9a93caef484 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -33,7 +33,7 @@
  * A fixed POA is used for servant activation.
  * This object creates a single instance of the Supplier
  */
-class TAO_RTEvent_Export TAO_EC_Null_Factory : public TAO_EC_Factory
+class TAO_RTEvent_Serv_Export TAO_EC_Null_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 0373ac32119..26d8cbd0cbe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -29,7 +29,7 @@
  * @brief A scheduling strategy that separates event groups and
  * delivers one event at a time.
  */
-class TAO_RTEvent_Export TAO_EC_Null_Scheduling 
+class TAO_RTEvent_Serv_Export TAO_EC_Null_Scheduling
   : public TAO_EC_Scheduling_Strategy
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 5bca0bf2172..ca86257c99c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -32,7 +32,7 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 class ACE_Lock;
 class TAO_EC_Event_Channel_Base;
@@ -51,7 +51,7 @@ class TAO_EC_ProxyPushSupplier;
  * This behavior of the EC is strategized to avoid overhead when no gateways
  * are needed.
  */
-class TAO_RTEvent_Export TAO_EC_ObserverStrategy
+class TAO_RTEvent_Serv_Export TAO_EC_ObserverStrategy
 {
 public:
   /// Destructor
@@ -100,7 +100,7 @@ public:
  * This class keeps no information and simply ignores the messages
  * from the EC.
  */
-class TAO_RTEvent_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_ObserverStrategy
+class TAO_RTEvent_Serv_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_ObserverStrategy
 {
 public:
   /// Constructor
@@ -148,7 +148,7 @@ public:
  * It assumes ownership of the @a lock, but not of the
  * Event_Channel.
  */
-class TAO_RTEvent_Export TAO_EC_Basic_ObserverStrategy :
+class TAO_RTEvent_Serv_Export TAO_EC_Basic_ObserverStrategy :
   public TAO_EC_ObserverStrategy
 {
 public:
@@ -278,7 +278,7 @@ protected:
  * It assumes ownership of the <lock>, but not of the
  * Event_Channel.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_ObserverStrategy :
+class TAO_RTEvent_Serv_Export TAO_EC_Reactive_ObserverStrategy :
   public TAO_EC_Basic_ObserverStrategy
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 3855b23c2b8..ea5f674daf6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -18,7 +18,7 @@
 
 #include "EC_Supplier_Filter.h"
 #include "EC_Supplier_Filter_Builder.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -39,7 +39,7 @@ class TAO_EC_Event_Channel_Base;
  * This minimizes the amount of consumers touched by the EC when
  * dispatching an event.
  */
-class TAO_RTEvent_Export TAO_EC_Per_Supplier_Filter : public TAO_EC_Supplier_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Per_Supplier_Filter : public TAO_EC_Supplier_Filter
 {
 public:
   /// Constructor
@@ -93,7 +93,7 @@ private:
  * @brief Create Per_Supplier_Filter objects
  *
  */
-class TAO_RTEvent_Export TAO_EC_Per_Supplier_Filter_Builder : public TAO_EC_Supplier_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Per_Supplier_Filter_Builder : public TAO_EC_Supplier_Filter_Builder
 {
 public:
   /// constructor....
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index fed6236a446..5a3cfafd7ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -34,7 +34,7 @@ class TAO_EC_Event_Channel_Base;
  * (source/type based filtering + disjunctions and conjunctions)
  * are constructed using this class.
  */
-class TAO_RTEvent_Export TAO_EC_Prefix_Filter_Builder : public TAO_EC_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Prefix_Filter_Builder : public TAO_EC_Filter_Builder
 {
 public:
   /// constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 75718ee9895..b61ee0885c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
@@ -51,7 +51,7 @@ class TAO_EC_Supplier_Filter;
  * No provisions for locking, access must be serialized
  * externally.
  */
-class TAO_RTEvent_Export TAO_EC_ProxyPushConsumer
+class TAO_RTEvent_Serv_Export TAO_EC_ProxyPushConsumer
 {
 public:
   typedef RtecEventChannelAdmin::ProxyPushConsumer Interface;
@@ -190,7 +190,7 @@ private:
  * the reference count on the proxy and its filter, eliminating
  * the need to hold mutexes during long operations.
  */
-class TAO_RTEvent_Export TAO_EC_ProxyPushConsumer_Guard
+class TAO_RTEvent_Serv_Export TAO_EC_ProxyPushConsumer_Guard
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 552383c96d9..769dc42ef80 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -51,7 +51,7 @@ class TAO_EC_ProxyPushConsumer;
  * could short-circuit the filter() ---> push() cycle when the EC
  * is properly configured, we need to explore this...
  */
-class TAO_RTEvent_Export TAO_EC_ProxyPushSupplier : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_ProxyPushSupplier : public TAO_EC_Filter
 {
 public:
   typedef RtecEventChannelAdmin::ProxyPushSupplier Interface;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index dce214ba29d..da6b6a2972e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -8,7 +8,7 @@
 #ifndef EC_PROXY_DISCONNECTOR__H_
 #define EC_PROXY_DISCONNECTOR__H_
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecEventCommC.h"
 #include "ace/Auto_Functor.h"
 
@@ -17,7 +17,7 @@
  *
  * @brief Implements a functor for the TAO_EC_Supplier_Proxy_Disconnector class.
  */
-struct TAO_RTEvent_Export TAO_EC_Supplier_Proxy_Disconnect_Functor
+struct TAO_RTEvent_Serv_Export TAO_EC_Supplier_Proxy_Disconnect_Functor
 {
   typedef  RtecEventComm::PushSupplier_ptr argument;
 
@@ -45,7 +45,7 @@ typedef ACE_Utils::Auto_Functor<
  *
  * @brief Implements a functor for the TAO_EC_Consumer_Proxy_Disconnector class.
  */
-struct TAO_RTEvent_Export TAO_EC_Consumer_Proxy_Disconnect_Functor
+struct TAO_RTEvent_Serv_Export TAO_EC_Consumer_Proxy_Disconnect_Functor
 {
   typedef  RtecEventComm::PushConsumer_ptr argument;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 0fbc4fe9290..966ebb90667 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -19,7 +19,7 @@
 
 #include "orbsvcs/RtecBaseC.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +35,7 @@
  * class encapsulates that information.
  * This first implementation is just a place-holder.
  */
-class TAO_RTEvent_Export TAO_EC_QOS_Info
+class TAO_RTEvent_Serv_Export TAO_EC_QOS_Info
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 8ec08a78287..1a3728d790f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -43,7 +43,7 @@ class TAO_EC_Reactive_ConsumerControl;
  * periodically wakeup and verify the state of the consumers
  * registered with the Event Channel.
  */
-class TAO_RTEvent_Export TAO_EC_ConsumerControl_Adapter : public ACE_Event_Handler
+class TAO_RTEvent_Serv_Export TAO_EC_ConsumerControl_Adapter : public ACE_Event_Handler
 {
 public:
   /// Constructor
@@ -66,7 +66,7 @@ private:
  * Defines the interface for the consumer control strategy.
  * This strategy handles misbehaving or failing consumers.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_ConsumerControl : public TAO_EC_ConsumerControl
+class TAO_RTEvent_Serv_Export TAO_EC_Reactive_ConsumerControl : public TAO_EC_ConsumerControl
 {
 public:
   /// Constructor.  It does not assume ownership of the @a event_channel
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 0900596c2c4..d5c3f56873d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -19,7 +19,7 @@
 
 #include "EC_Dispatching.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,7 +33,7 @@
  * The events are dispatched in FIFO ordering, using the invoking
  * thread to push the event to the consumer.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_Dispatching : public TAO_EC_Dispatching
+class TAO_RTEvent_Serv_Export TAO_EC_Reactive_Dispatching : public TAO_EC_Dispatching
 {
 public:
   /// The scheduler is used to find the range of priorities and similar
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index d04d411302f..cf0fdbc0a88 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -53,7 +53,7 @@ class TAO_EC_Reactive_SupplierControl;
  * COS Event services.
  *
  */
-class TAO_RTEvent_Export TAO_EC_SupplierControl_Adapter : public ACE_Event_Handler
+class TAO_RTEvent_Serv_Export TAO_EC_SupplierControl_Adapter : public ACE_Event_Handler
 {
 public:
   /// Constructor
@@ -76,7 +76,7 @@ private:
  * Defines the interface for the supplier control strategy.
  * This strategy handles misbehaving or failing suppliers.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_SupplierControl : public TAO_EC_SupplierControl
+class TAO_RTEvent_Serv_Export TAO_EC_Reactive_SupplierControl : public TAO_EC_SupplierControl
 {
 public:
   /// Constructor.  It does not assume ownership of the @a event_channel
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index 299dffc482c..454596f6ef7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -32,7 +32,7 @@
  * Implements the Timeout_Generator using an ACE_Reactor. Usually
  * the same reactor that is used by the ORB where the EC runs.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_Timeout_Generator
+class TAO_RTEvent_Serv_Export TAO_EC_Reactive_Timeout_Generator
   : public TAO_EC_Timeout_Generator
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 6f493dbffc9..adc320a3167 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecBaseC.h"
 #include "orbsvcs/RtecEventCommC.h"
@@ -42,7 +42,7 @@ class TAO_EC_QOS_Info;
  * event pushed by a supplier.
  * The base
  */
-class TAO_RTEvent_Export TAO_EC_Scheduling_Strategy
+class TAO_RTEvent_Serv_Export TAO_EC_Scheduling_Strategy
 {
 public:
   /// Destructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 827614bc4c5..4b55624fcd7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -25,7 +25,7 @@
 
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -39,7 +39,7 @@ class TAO_EC_ProxyPushSupplier;
  * <H2>Memory Management</H2>
  * It does not assume ownership of the TAO_EC_Event_Channel_Base object
  */
-class TAO_RTEvent_Export TAO_EC_SupplierAdmin
+class TAO_RTEvent_Serv_Export TAO_EC_SupplierAdmin
   : public POA_RtecEventChannelAdmin::SupplierAdmin
   , public TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer,TAO_EC_ProxyPushSupplier>
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 0af5a03aeec..364a782928f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_ProxyPushConsumer;
 
@@ -40,7 +40,7 @@ namespace CORBA
  * Defines the interface for the supplier control strategy.
  * This strategy handles misbehaving or failing suppliers.
  */
-class TAO_RTEvent_Export TAO_EC_SupplierControl
+class TAO_RTEvent_Serv_Export TAO_EC_SupplierControl
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index b4318075078..081348d3a3a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -20,7 +20,7 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -62,7 +62,7 @@ class TAO_EC_QOS_Info;
  * implementations of this class; as usual the EC_Factory will
  * create the right instance.
  */
-class TAO_RTEvent_Export TAO_EC_Supplier_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter
 {
 public:
   /// Destructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index a22c516f9e6..627c07825c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -19,7 +19,7 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +36,7 @@ class TAO_EC_ProxyPushConsumer;
  * The creation of the right filter for each supplier controlled
  * by a Supplier_Filter_Builder.
  */
-class TAO_RTEvent_Export TAO_EC_Supplier_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter_Builder
 {
 public:
   /// Destructor...
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 269111b9936..8e1bf7b45ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -36,7 +36,7 @@ class TAO_EC_ProxyPushSupplier;
  * This filter only accept events with a predefined type/source,
  * both the source and the type can be wildcards.
  */
-class TAO_RTEvent_Export TAO_EC_Timeout_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 12361bce97c..52eb6031054 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "EC_Timeout_Filter.h"
 
@@ -41,7 +41,7 @@ class TAO_EC_QOS_Info;
  * This class is the abstract base class to abstract this
  * strategies.
  */
-class TAO_RTEvent_Export TAO_EC_Timeout_Generator
+class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Generator
 {
 public:
   /// destructor
@@ -75,7 +75,7 @@ public:
  * dispatch events, but we want to receive them in EC_Filters,
  * this class is and adaptor for that purpose.
  */
-class TAO_RTEvent_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler
+class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler
 {
 public:
   /// Default construction.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index db4fe238220..054905e1a49 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -20,7 +20,7 @@
 #include "EC_Supplier_Filter.h"
 #include "EC_Supplier_Filter_Builder.h"
 
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -41,7 +41,7 @@ class TAO_EC_ProxyPushSupplier_Set;
  * ConsumerAdmin to find all the consumers and pushes the event to
  * all of them.
  */
-class TAO_RTEvent_Export TAO_EC_Trivial_Supplier_Filter : public TAO_EC_Supplier_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Trivial_Supplier_Filter : public TAO_EC_Supplier_Filter
 {
 public:
   /// Constructor
@@ -82,7 +82,7 @@ private:
  * used by all the suppliers (i.e. ProxyConsumers) of an event
  * channel.
  */
-class TAO_RTEvent_Export TAO_EC_Trivial_Supplier_Filter_Builder : public TAO_EC_Supplier_Filter_Builder
+class TAO_RTEvent_Serv_Export TAO_EC_Trivial_Supplier_Filter_Builder : public TAO_EC_Supplier_Filter_Builder
 {
 public:
   /// constructor....
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index cded3117683..ca52d200834 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EC_Filter.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
  * This filter only accept events with a predefined type/source,
  * both the source and the type can be wildcards.
  */
-class TAO_RTEvent_Export TAO_EC_Type_Filter : public TAO_EC_Filter
+class TAO_RTEvent_Serv_Export TAO_EC_Type_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 5cccfec538c..0ce13cc24ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
-#include /**/ "event_export.h"
+#include /**/ "event_serv_export.h"
 
 /**
  * @class TAO_EC_Simple_AddrServer
@@ -32,7 +32,7 @@
  * type component to the ipaddr and uses a fixed port,
  * provided at initialization time.
  */
-class TAO_RTEvent_Export TAO_EC_Simple_AddrServer : public POA_RtecUDPAdmin::AddrServer
+class TAO_RTEvent_Serv_Export TAO_EC_Simple_AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h b/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
new file mode 100644
index 00000000000..a6f6ba465be
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_RTEVENT_SERV_EXPORT_H
+#define TAO_RTEVENT_SERV_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_RTEVENT_SERV_HAS_DLL)
+#    define TAO_RTEVENT_SERV_HAS_DLL 0
+#  endif /* ! TAO_RTEVENT_SERV_HAS_DLL */
+#else
+#  if !defined (TAO_RTEVENT_SERV_HAS_DLL)
+#    define TAO_RTEVENT_SERV_HAS_DLL 1
+#  endif /* ! TAO_RTEVENT_SERV_HAS_DLL */
+#endif
+
+#if defined (TAO_RTEVENT_SERV_HAS_DLL) && (TAO_RTEVENT_SERV_HAS_DLL == 1)
+#  if defined (TAO_RTEVENT_SERV_BUILD_DLL)
+#    define TAO_RTEvent_Serv_Export ACE_Proper_Export_Flag
+#    define TAO_RTEVENT_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_RTEVENT_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_RTEVENT_BUILD_DLL */
+#    define TAO_RTEvent_Serv_Export ACE_Proper_Import_Flag
+#    define TAO_RTEVENT_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_RTEVENT_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_RTEVENT_SERV_BUILD_DLL */
+#else /* TAO_RTEVENT_SERV_HAS_DLL == 1 */
+#  define TAO_RTEvent_Serv_Export
+#  define TAO_RTEVENT_SERV_SINGLETON_DECLARATION(T)
+#  define TAO_RTEVENT_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_RTEVENT_SERV_HAS_DLL == 1 */
+
+#endif /* TAO_RTEVENT_SERV_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h b/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
new file mode 100644
index 00000000000..70c88d4289e
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_RTEVENT_SKEL_EXPORT_H
+#define TAO_RTEVENT_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_RTEVENT_SKEL_HAS_DLL)
+#    define TAO_RTEVENT_SKEL_HAS_DLL 0
+#  endif /* ! TAO_RTEVENT_SKEL_HAS_DLL */
+#else
+#  if !defined (TAO_RTEVENT_SKEL_HAS_DLL)
+#    define TAO_RTEVENT_SKEL_HAS_DLL 1
+#  endif /* ! TAO_RTEVENT_SKEL_HAS_DLL */
+#endif
+
+#if defined (TAO_RTEVENT_SKEL_HAS_DLL) && (TAO_RTEVENT_SKEL_HAS_DLL == 1)
+#  if defined (TAO_RTEVENT_SKEL_BUILD_DLL)
+#    define TAO_RTEvent_Skel_Export ACE_Proper_Export_Flag
+#    define TAO_RTEVENT_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_RTEVENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_RTEVENT_SKEL_BUILD_DLL */
+#    define TAO_RTEvent_Skel_Export ACE_Proper_Import_Flag
+#    define TAO_RTEVENT_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_RTEVENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_RTEVENT_SKEL_BUILD_DLL */
+#else /* TAO_RTEVENT_SKEL_HAS_DLL == 1 */
+#  define TAO_RTEvent_Skel_Export
+#  define TAO_RTEVENT_SKEL_SINGLETON_DECLARATION(T)
+#  define TAO_RTEVENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_RTEVENT_SKEL_HAS_DLL == 1 */
+
+#endif /* TAO_RTEVENT_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index a8450a60219..f1068579605 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_corba {
+project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba {
   sharedname   = TAO_FtRtEvent
 
   idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
@@ -59,7 +59,7 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
   }
 }
 
-project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, utils, corba_messaging {
+project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, rtevent_serv, utils, corba_messaging {
   sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
   tagchecks    = FTRT_EventChannel
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index 2f8deea2b5c..92ffc461d20 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCORBAEvent) : orbsvcslib, core, rtevent, rtportableserver {
+project(RTCORBAEvent) : orbsvcslib, core, rtevent_serv, rtportableserver {
   sharedname   = TAO_RTCORBAEvent
   dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL
   tagchecks   += RTCORBAEvent
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index ac7f6e2615e..df6a5b85649 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
+project(RTEvent) : orbsvcslib, core, svc_utils {
   sharedname   = TAO_RTEvent
-  idlflags    += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h
+  idlflags    += -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
   dynamicflags = TAO_RTEVENT_BUILD_DLL
   tagchecks   += RTEvent
-  // Add this include path for precompiled headers
 
   IDL_Files {
     RtecDefaultEventData.idl
@@ -19,87 +18,38 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
   // in their own directory.
   Source_Files(ORBSVCS_COMPONENTS) {
     RTEvent {
+      Event_Utilities.cpp
       RtecDefaultEventDataC.cpp
-      RtecDefaultEventDataS.cpp
       RtecEventCommC.cpp
-      RtecEventCommS.cpp
       RtecEventChannelAdminC.cpp
-      RtecEventChannelAdminS.cpp
       RtecUDPAdminC.cpp
-      RtecUDPAdminS.cpp
-      Event_Utilities.cpp
-      Event/ECG_Adapters.cpp
-      Event/ECG_Address_Server_Base.cpp
-      Event/ECG_CDR_Message_Receiver.cpp
-      Event/ECG_CDR_Message_Sender.cpp
-      Event/ECG_Complex_Address_Server.cpp
-      Event/ECG_Mcast_EH.cpp
-      Event/ECG_Mcast_Gateway.cpp
-      Event/ECG_Simple_Address_Server.cpp
-      Event/ECG_Simple_Mcast_EH.cpp
-      Event/ECG_UDP_EH.cpp
-      Event/ECG_UDP_Out_Endpoint.cpp
-      Event/ECG_UDP_Receiver.cpp
-      Event/ECG_UDP_Sender.cpp
-      Event/ECG_ConsumerEC_Control.cpp
-      Event/ECG_Reactive_ConsumerEC_Control.cpp
-      Event/ECG_Reconnect_ConsumerEC_Control.cpp
-      Event/EC_And_Filter.cpp
-      Event/EC_Basic_Factory.cpp
-      Event/EC_Basic_Filter_Builder.cpp
-      Event/EC_Bitmask_Filter.cpp
-      Event/EC_Channel_Destroyer.cpp
-      Event/EC_Conjunction_Filter.cpp
-      Event/EC_ConsumerAdmin.cpp
-      Event/EC_ConsumerControl.cpp
-      Event/EC_Default_Factory.cpp
-      Event/EC_Default_ProxyConsumer.cpp
-      Event/EC_Default_ProxySupplier.cpp
-      Event/EC_Disjunction_Filter.cpp
-      Event/EC_Dispatching.cpp
-      Event/EC_Dispatching_Task.cpp
-      Event/EC_Event_Channel.cpp
-      Event/EC_Event_Channel_Base.cpp
-      Event/EC_Factory.cpp
-      Event/EC_Filter.cpp
-      Event/EC_Filter_Builder.cpp
-      Event/EC_Gateway.cpp
-      Event/EC_Gateway_IIOP.cpp
-      Event/EC_Gateway_IIOP_Factory.cpp
-      Event/EC_Group_Scheduling.cpp
-      Event/EC_Lifetime_Utils.cpp
-      Event/EC_Masked_Type_Filter.cpp
-      Event/EC_MT_Dispatching.cpp
-      Event/EC_Negation_Filter.cpp
-      Event/EC_Null_Factory.cpp
-      Event/EC_Null_Scheduling.cpp
-      Event/EC_ObserverStrategy.cpp
-      Event/EC_Per_Supplier_Filter.cpp
-      Event/EC_Prefix_Filter_Builder.cpp
-      Event/EC_ProxyConsumer.cpp
-      Event/EC_ProxySupplier.cpp
-      Event/EC_Proxy_Disconnector.cpp
-      Event/EC_QOS_Info.cpp
-      Event/EC_Reactive_ConsumerControl.cpp
-      Event/EC_Reactive_Dispatching.cpp
-      Event/EC_Reactive_SupplierControl.cpp
-      Event/EC_Reactive_Timeout_Generator.cpp
-      Event/EC_Scheduling_Strategy.cpp
-      Event/EC_SupplierAdmin.cpp
-      Event/EC_SupplierControl.cpp
-      Event/EC_Supplier_Filter.cpp
-      Event/EC_Supplier_Filter_Builder.cpp
-      Event/EC_Timeout_Filter.cpp
-      Event/EC_Timeout_Generator.cpp
-      Event/EC_Trivial_Supplier_Filter.cpp
-      Event/EC_Type_Filter.cpp
-      Event/EC_UDP_Admin.cpp
     }
   }
 
+  Header_Files (ORBSVCS_COMPONENTS) {
+    RTEvent {
+      Event_Utilities.h
+      RtecDefaultEventDataC.h
+      RtecEventCommC.h
+      RtecEventChannelAdminC.h
+      RtecUDPAdminC.h
+    }
+  }
+
+  Inline_Files (ORBSVCS_COMPONENTS) {
+    RTEvent {
+      Event_Utilities.i
+      RtecDefaultEventDataC.inl
+      RtecEventCommC.inl
+      RtecEventChannelAdminC.inl
+      RtecUDPAdminC.inl
+    }
+  }
+
+  Resource_Files{
+    RTEvent.rc
+  }
+
   Template_Files {
-    Event/EC_Busy_Lock.cpp
-    Event/EC_Lifetime_Utils_T.cpp
-    Channel_Clients_T.cpp
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index a8dd5d1ba22..88a06a5c1d1 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent, rtsched, dslogadmin_serv {
+project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv {
   sharedname   = TAO_RTEventLogAdmin
   idlflags    += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
new file mode 100644
index 00000000000..b3c4879b0dd
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -0,0 +1,92 @@
+// -*- MPC -*-
+// $Id$
+
+project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
+  sharedname   = TAO_RTEvent_Serv
+  dynamicflags = TAO_RTEVENT_SERV_BUILD_DLL
+  tagchecks   += RTEvent
+
+  IDL_Files {
+  }
+
+  Source_Files(ORBSVCS_COMPONENTS) {
+    RTEvent {
+      Event/ECG_Adapters.cpp
+      Event/ECG_Address_Server_Base.cpp
+      Event/ECG_CDR_Message_Receiver.cpp
+      Event/ECG_CDR_Message_Sender.cpp
+      Event/ECG_Complex_Address_Server.cpp
+      Event/ECG_Mcast_EH.cpp
+      Event/ECG_Mcast_Gateway.cpp
+      Event/ECG_Simple_Address_Server.cpp
+      Event/ECG_Simple_Mcast_EH.cpp
+      Event/ECG_UDP_EH.cpp
+      Event/ECG_UDP_Out_Endpoint.cpp
+      Event/ECG_UDP_Receiver.cpp
+      Event/ECG_UDP_Sender.cpp
+      Event/ECG_ConsumerEC_Control.cpp
+      Event/ECG_Reactive_ConsumerEC_Control.cpp
+      Event/ECG_Reconnect_ConsumerEC_Control.cpp
+      Event/EC_And_Filter.cpp
+      Event/EC_Basic_Factory.cpp
+      Event/EC_Basic_Filter_Builder.cpp
+      Event/EC_Bitmask_Filter.cpp
+      Event/EC_Channel_Destroyer.cpp
+      Event/EC_Conjunction_Filter.cpp
+      Event/EC_ConsumerAdmin.cpp
+      Event/EC_ConsumerControl.cpp
+      Event/EC_Default_Factory.cpp
+      Event/EC_Default_ProxyConsumer.cpp
+      Event/EC_Default_ProxySupplier.cpp
+      Event/EC_Disjunction_Filter.cpp
+      Event/EC_Dispatching.cpp
+      Event/EC_Dispatching_Task.cpp
+      Event/EC_Event_Channel.cpp
+      Event/EC_Event_Channel_Base.cpp
+      Event/EC_Factory.cpp
+      Event/EC_Filter.cpp
+      Event/EC_Filter_Builder.cpp
+      Event/EC_Gateway.cpp
+      Event/EC_Gateway_IIOP.cpp
+      Event/EC_Gateway_IIOP_Factory.cpp
+      Event/EC_Group_Scheduling.cpp
+      Event/EC_Lifetime_Utils.cpp
+      Event/EC_Masked_Type_Filter.cpp
+      Event/EC_MT_Dispatching.cpp
+      Event/EC_Negation_Filter.cpp
+      Event/EC_Null_Factory.cpp
+      Event/EC_Null_Scheduling.cpp
+      Event/EC_ObserverStrategy.cpp
+      Event/EC_Per_Supplier_Filter.cpp
+      Event/EC_Prefix_Filter_Builder.cpp
+      Event/EC_ProxyConsumer.cpp
+      Event/EC_ProxySupplier.cpp
+      Event/EC_Proxy_Disconnector.cpp
+      Event/EC_QOS_Info.cpp
+      Event/EC_Reactive_ConsumerControl.cpp
+      Event/EC_Reactive_Dispatching.cpp
+      Event/EC_Reactive_SupplierControl.cpp
+      Event/EC_Reactive_Timeout_Generator.cpp
+      Event/EC_Scheduling_Strategy.cpp
+      Event/EC_SupplierAdmin.cpp
+      Event/EC_SupplierControl.cpp
+      Event/EC_Supplier_Filter.cpp
+      Event/EC_Supplier_Filter_Builder.cpp
+      Event/EC_Timeout_Filter.cpp
+      Event/EC_Timeout_Generator.cpp
+      Event/EC_Trivial_Supplier_Filter.cpp
+      Event/EC_Type_Filter.cpp
+      Event/EC_UDP_Admin.cpp
+    }
+  }
+
+  Template_Files {
+    Event/EC_Busy_Lock.cpp
+    Event/EC_Lifetime_Utils_T.cpp
+    Channel_Clients_T.cpp
+  }
+
+  Resource_Files{
+    RTEvent_Serv.rc
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc
new file mode 100644
index 00000000000..db8c3e96a2c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "RTEvent_Serv\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_RTEvent_ServDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_RTEvent_Serv.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
new file mode 100644
index 00000000000..41596e93849
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -0,0 +1,44 @@
+// -*- MPC -*-
+// $Id$
+
+project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
+  sharedname   = TAO_RTEvent_Skel
+  dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files(ORBSVCS_COMPONENTS) {
+    RTEvent {
+      RtecDefaultEventDataS.cpp
+      RtecEventCommS.cpp
+      RtecEventChannelAdminS.cpp
+      RtecUDPAdminS.cpp
+    }
+  }
+
+  Header_Files(ORBSVCS_COMPONENTS) {
+    RTEvent {
+      RtecDefaultEventDataS.h
+      RtecEventCommS.h
+      RtecEventChannelAdminS.h
+      RtecUDPAdminS.h
+    }
+  }
+
+  Inline_Files(ORBSVCS_COMPONENTS) {
+    RTEvent {
+      RtecDefaultEventDataS.inl
+      RtecEventCommS.inl
+      RtecEventChannelAdminS.inl
+      RtecUDPAdminS.inl
+    }
+  }
+
+  Template_Files {
+  }
+
+  Resource_Files{
+    RTEvent_Skel.rc
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc
new file mode 100644
index 00000000000..89f1ed77e4f
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "RTEvent_Skel\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_RTEvent_SkelDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_RTEvent_Skel.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 65cc129d41c..e56df1c1027 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, kokyu {
+project(RTKokyuEvent) : orbsvcslib, core, rtevent_serv, rtsched, kokyu {
   sharedname   = TAO_RTKokyuEvent
   dynamicflags = TAO_RTKOKYUEVENT_BUILD_DLL
   tagchecks   += RTKokyuEvent
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index d9573d62649..e23e9e8e73f 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched {
+project(RTSchedEvent) : orbsvcslib, core, rtevent_serv, rtsched {
   sharedname   = TAO_RTSchedEvent
   dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL
   tagchecks   += RTSchedEvent