1 files changed, 5 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index dfa0d7eb7af..c1faf85d5eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //=============================================================================
 /**
  *  @file   FilterAdmin.h
@@ -20,12 +19,10 @@
 
 #include "ace/Hash_Map_Manager.h"
 
-#include "orbsvcs/Notify/ID_Factory.h"
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Topology_Object.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ID_Factory.h"
+#include "Event.h"
+#include "notify_serv_export.h"
+#include "Topology_Object.h"
 
 /**
  * @class TAO_Notify_FilterAdmin
@@ -106,10 +103,8 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
   TAO_Notify_ID_Factory filter_ids_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/FilterAdmin.inl"
+#include "FilterAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"