1 files changed, 7 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index be559fae20a..d2eabf13760 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -14,30 +14,28 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Topology_Object.h"
-#include "orbsvcs/Notify/Topology_Factory.h"
-#include "orbsvcs/Notify/Reconnection_Registry.h"
-#include "orbsvcs/Notify/Routing_Slip.h"
+#include "Topology_Object.h"
+#include "Topology_Factory.h"
+#include "Reconnection_Registry.h"
+#include "Routing_Slip.h"
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/NotifyExtS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+class TAO_Notify_EventChannel;
+template <class TYPE> class TAO_Notify_Container_T;
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Notify_EventChannel;
-template <class TYPE> class TAO_Notify_Container_T;
-
 /**
  * @class TAO_Notify_EventChannelFactory
  *
@@ -196,8 +194,6 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */