1 files changed, 8 insertions, 13 deletions
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 056efb7578c..59dd117fcdf 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -16,20 +16,24 @@
 #define TAO_POAMANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/poa_macros.h"
-#include "tao/PortableServer/POAManagerC.h"
+#include "poa_macros.h"
+#include "POAManagerC.h"
 
 // Local Object
 #include "tao/LocalObject.h"
 #include "tao/PI_ForwardC.h"
 #include "ace/Unbounded_Set.h"
 
+// Forward decl.
+class TAO_Root_POA;
+class TAO_Object_Adapter;
+
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -37,13 +41,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward decl.
-class TAO_Root_POA;
-class TAO_Object_Adapter;
-
-
 class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
   public TAO_Local_RefCounted_Object
@@ -157,14 +154,12 @@ protected:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/POAManager.i"
+# include "POAManager.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"