1 files changed, 14 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 5b829d361c6..9414cb975d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -1,19 +1,19 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Null_Factory.h"
-#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
-#include "orbsvcs/Event/EC_Filter_Builder.h"
-#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
-#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
-#include "orbsvcs/Event/EC_ObserverStrategy.h"
-#include "orbsvcs/Event/EC_Null_Scheduling.h"
-#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/Event/EC_SupplierControl.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug
+#include "EC_Null_Factory.h"
+#include "EC_Reactive_Dispatching.h"
+#include "EC_Filter_Builder.h"
+#include "EC_Trivial_Supplier_Filter.h"
+#include "EC_ConsumerAdmin.h"
+#include "EC_SupplierAdmin.h"
+#include "EC_Default_ProxyConsumer.h"
+#include "EC_Default_ProxySupplier.h"
+#include "EC_ObserverStrategy.h"
+#include "EC_Null_Scheduling.h"
+#include "EC_Reactive_Timeout_Generator.h"
+#include "EC_ConsumerControl.h"
+#include "EC_SupplierControl.h"
+#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 
@@ -21,8 +21,6 @@
 
 ACE_RCSID(Event, EC_Null_Factory, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
 {
 }
@@ -238,4 +236,3 @@ TAO_EC_Null_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   delete x;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL