1 files changed, 3 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h
index 92b05194d9d..98f3eec8ec3 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h
@@ -15,16 +15,12 @@
 
 #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/orbconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declaration
 class TAO_Root_POA;
 class TAO_Object_Adapter;
@@ -62,16 +58,14 @@ namespace TAO
     protected:
 
       TAO_Object_Adapter &object_adapter_;
-      TAO_Root_POA &poa_;
+      ::TAO_Root_POA &poa_;
       Non_Servant_Upcall *previous_;
     };
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Non_Servant_Upcall.inl"
+# include "Non_Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"