ChangeLogTag: Mon Aug 16 16:45:06 2004 J.T. Conklin <jtc@acorntoolworks.com>

77 files changed, 140 insertions, 140 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 6c49661a2b5..0e781c19364 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "ace/Sched_Params.h"
-#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Time_Utilities.h"
 #include "Memory_Pools.h"
 
 #include "Dispatching_Modules.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 459feed2c99..03869de539b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -23,9 +23,9 @@
 
 #include "ace/Reactor_Notification_Strategy.h"
 #include "tao/Timeprobe.h"
-#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
-#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
-#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/Event/Event_Channel.h"
 
 // ************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index cc1ae3e6bd7..6a3a4298e83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
-#include "orbsvcs/orbsvcs/RtecUDPAdminC.h"
+#include "orbsvcs/RtecUDPAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index eb356e86e3c..533e6ba7391 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -13,7 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
-#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/RtecUDPAdminS.h"
 #include "EC_Lifetime_Utils.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index ee28910bbf3..f8441511cf4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -16,7 +16,7 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/RtecUDPAdminS.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/INET_Addr.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 80f6a1cd40f..5c52c8e7b3c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index f62de40073a..25f55f68033 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -26,7 +26,7 @@
 #include "ace/Array_Base.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #include /**/ "event_export.h"
 #include "ECG_Adapters.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index d76f722ade2..773e41b0041 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -9,7 +9,7 @@
 #include "ECG_Mcast_EH.h"
 #include "ECG_UDP_EH.h"
 
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Event_Utilities.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index b71c9fbe8bf..502b3a555d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -12,7 +12,7 @@
 #define TAO_ECG_SIMPLE_ADDRESS_SERVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/RtecUDPAdminS.h"
 #include "EC_Lifetime_Utils_T.h"
 #include "ace/INET_Addr.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 075682e983e..0fdccc40c53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/Event_Utilities.h"
 #include "ace/SString.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 8e142825d7a..68090d4b7aa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -37,13 +37,13 @@
 #define TAO_ECG_UDP_RECEIVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/RtecUDPAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 #include /**/ "event_export.h"
 
 #include "ECG_Adapters.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index d25efcb56ca..d111b4d8470 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -9,8 +9,8 @@
  *
  */
 
-#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/Event_Utilities.h"
 #include "tao/CDR.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index ee872d01530..00b1a6181b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -38,14 +38,14 @@
 #define TAO_ECG_UDP_SENDER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/RtecUDPAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "event_export.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #include "EC_Lifetime_Utils.h"
 #include "EC_Lifetime_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 6bfc17ea60f..7eb7b9fac4f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -15,8 +15,8 @@
 #include "EC_Reactive_SupplierControl.h"
 #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index 193b672ec46..b1b7b1ca222 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 #include "EC_Basic_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 1b846220c81..d27e7203e8a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -4,9 +4,9 @@
 #include "EC_ProxySupplier.h"
 #include "EC_ProxyConsumer.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_ConsumerAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 909dad88229..60b5edadb24 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 9d33bbecd68..61adaf515d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -19,13 +19,13 @@
 #include "EC_Reactive_ConsumerControl.h"
 #include "EC_Reactive_SupplierControl.h"
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/ESF/ESF_Delayed_Command.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index a14c68925e1..853b7e04a93 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index d028e06a00d..dfbe23bfd05 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index bae7d4eb094..54ea96405e4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 067e33340cf..113c5a7b1ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommC.h"
 #include /**/ "event_export.h"
 #include "ace/Task.h"
 #include "ace/Message_Block.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index dd0799e5752..44d548e8693 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -27,7 +27,7 @@
 
 #include "EC_Defaults.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 template<class> class TAO_ESF_Worker;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index 123a78382a0..ac2f8c4988c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index be40d293ce0..33c8c9cfb7a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index a97cd55b4ce..8ef8d8c7ef0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/Event/EC_Gateway.h"
 
 ACE_RCSID (Event, 
            EC_Gateway, 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index a8863961edb..ff55b4ca46f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -19,8 +19,8 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventCommS.h"
 
 /**
  * @class TAO_EC_Gateway
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index 6202e72db2c..91e25f95e96 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
-#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h"
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
-#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/Event/ECG_Defaults.h"
+#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Time_Utilities.h"
 
 #include "EC_Gateway_IIOP_Factory.h"
 #include "ECG_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 058fc1b4696..06f2d805dfa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -22,9 +22,9 @@
 #include /**/ "event_export.h"
 #include "EC_Gateway.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/orbsvcs/Channel_Clients.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/Channel_Clients.h"
 
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index 8e4347a7bc7..eb368de2dbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
-#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h"
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
-#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
+#include "orbsvcs/Event/ECG_Defaults.h"
+#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Time_Utilities.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 80835d4dde4..cb8453bdef8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Gateway_Sched.h"
-#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Time_Utilities.h"
 
 ACE_RCSID (Event, 
            EC_Gateway_sched, 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index c207596ae00..3ab5e935271 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -19,7 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EC_Gateway_IIOP.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index b1a36867648..2ad2a374996 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -5,8 +5,8 @@
 #include "EC_ProxySupplier.h"
 #include "EC_QOS_Info.h"
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "tao/ORB_Constants.h"
 
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index abd145b2b3f..ec54bc03226 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "rtkokyu_event_export.h"
 
 #include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index 0dc7d4e18a0..a40af3f6c2a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -5,7 +5,7 @@
 #include "EC_Kokyu_Scheduling.h"
 #include "EC_Kokyu_Filter_Builder.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 5c1cd2b04d7..55d64cdb2c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "rtkokyu_event_export.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index fd9ebe4715b..5fce1a7cab8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Kokyu_Filter.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 #include "EC_Kokyu_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index f07a37c374c..5eb6ef5dc35 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "rtkokyu_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index 39c2d42020b..8efb85c2d98 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -18,7 +18,7 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 841bd6656c7..e9df4b4298e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -14,8 +14,8 @@
 #include "EC_ConsumerControl.h"
 #include "EC_SupplierControl.h"
 #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
-#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 6b0af4e85dd..3149420a6f1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -6,7 +6,7 @@
 #include "EC_ProxyConsumer.h"
 #include "EC_ConsumerAdmin.h"
 #include "EC_SupplierAdmin.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 #include "ace/Auto_Ptr.h"
 
 #if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 6d33cfea8c6..5bca0bf2172 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@
 #include "ace/RB_Tree.h"
 #include "ace/Map_Manager.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index e0add81915f..1eb2794a909 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -7,9 +7,9 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_QOS_Info.h"
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Per_Supplier_Filter.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 8a3879662f4..ed97744f809 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 #include "EC_Prefix_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index ade0f194676..53f7634ce00 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -5,8 +5,8 @@
 #include "EC_Event_Channel_Base.h"
 #include "EC_QOS_Info.h"
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Sched_Params.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index b8156a664e1..717fad35865 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 
 #include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 45bed1bbf9c..a8a1fee8960 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 82a0162f440..75718ee9895 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -19,7 +19,7 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 00d0b81e4a6..ea22992bf90 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -8,8 +8,8 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_ConsumerControl.h"
 #include "EC_SupplierAdmin.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
 #include "ace/Reverse_Lock_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 590d5c61190..552383c96d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #include "EC_Filter.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index 559b3497f8b..dce214ba29d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -9,7 +9,7 @@
 #define EC_PROXY_DISCONNECTOR__H_
 
 #include /**/ "event_export.h"
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommC.h"
 #include "ace/Auto_Functor.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 25a37802392..0fbc4fe9290 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecBaseC.h"
+#include "orbsvcs/RtecBaseC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 06929bcf071..a470864444f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index f1885974944..c08e3d05705 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -19,7 +19,7 @@
 
 #include "EC_SupplierControl.h"
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 92a0da41ec3..0199dec1957 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -5,7 +5,7 @@
 #include "EC_Priority_Scheduling.h"
 #include "EC_Sched_Filter_Builder.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index f556b0f1d8b..c1093401be5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 5e153f1bcb1..6b2815e4897 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Sched_Filter.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 #include "EC_Sched_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index b89992dcba1..29c94f4f892 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -19,8 +19,8 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/orbsvcs/RtecBaseC.h"
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecBaseC.h"
+#include "orbsvcs/RtecEventCommC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 585fd0076e3..39d04fec297 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -4,9 +4,9 @@
 #include "EC_ProxyConsumer.h"
 #include "EC_ProxySupplier.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_SupplierAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 47956d2f32c..91572785bc2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 0d80ad03c9e..b4318075078 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -17,8 +17,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 534752a9eaf..88a25804797 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index dba117af1c6..e4e812f95b9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -4,8 +4,8 @@
 #include "EC_Timeout_Generator.h"
 #include "EC_Event_Channel_Base.h"
 #include "EC_ProxySupplier.h"
-#include "orbsvcs/orbsvcs/Time_Utilities.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Timeout_Filter.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index fdbe46377ab..4373aef1b62 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -2,7 +2,7 @@
 
 #include "EC_Timeout_Generator.h"
 #include "EC_Timeout_Filter.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Timeout_Generator.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index f037d3df588..37374a6f760 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h"
+#include "orbsvcs/Event/EC_UDP_Admin.h"
 
 ACE_RCSID (Event, 
            EC_UDP_Admin, 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 89588a49864..5cccfec538c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -16,7 +16,7 @@
 #define TAO_EC_UDP_ADMIN_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/RtecUDPAdminS.h"
 #include /**/ "event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 9360d98f57e..65bbe15ddd5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -2,15 +2,15 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Auto_Ptr.h"
-#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
-
-#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/orbsvcs/Event/Memory_Pools.h"
-#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
-#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
-#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Event_Utilities.h"
+
+#include "orbsvcs/Event/Dispatching_Modules.h"
+#include "orbsvcs/Event/Memory_Pools.h"
+#include "orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/Event/Event_Channel.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Event_Channel.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index a6c4709a9c9..30e0d418536 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -40,11 +40,11 @@
 
 #include "tao/Timeprobe.h"
 
-#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/orbsvcs/Event/Local_ESTypes.h"
-#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
-#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
-#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Event/Local_ESTypes.h"
+#include "orbsvcs/Event/Timer_Module.h"
+#include "orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/Event/Event_Manip.h"
 
 // ************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
index de495fe73e4..0d8e97cb479 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
@@ -8,7 +8,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/Event/Event_Manip.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Event_Manip.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index b087dc2ce4a..b78511867b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -21,7 +21,7 @@
 #define TAO_EC_EVENT_MANIP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommC.h"
 #include "old_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index a7490392d68..46252134318 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -22,15 +22,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-
-#include "orbsvcs/orbsvcs/CosNamingC.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/Event_Service_Constants.h"
+
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
 
 #define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
index b35af5eb52f..282d4786003 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
-#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/Event/Dispatching_Modules.h"
+#include "orbsvcs/Event/Timer_Module.h"
+#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/Event/Module_Factory.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index cc9677c430c..951a933d70f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Sched_Params.h"
-#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "RT_Task.h"
 #include "Debug_Macros.h"
 #include "Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index 9cbf1d10a7e..6bb34db4910 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -26,7 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/RtecSchedulerC.h"
 #include "old_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index ca449ff4800..92451aa9c6e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/High_Res_Timer.h"
 #include "tao/Timeprobe.h"
-#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Scheduler_Factory.h"
 
 #include "ReactorTask.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index de8d73e8625..6416bfa411e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Functor.h"
 
-#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "ReactorTask.h"
 #include "Timer_Module.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index e28f0cc74ea..2b93e920c66 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -13,8 +13,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/orbsvcs/Event/RT_Task.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event/RT_Task.h"
 
 class ACE_Command_Base;