1 files changed, 9 insertions, 5 deletions
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 1edd4812af9..486369efbed 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PS_ForwardC.h"
-#include "ace/Atomic_Op.h"
+#include "tao/PortableServer/PS_ForwardC.h"
 #include "tao/Abstract_Servant_Base.h"
+#include "ace/Atomic_Op.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Operation_Table;
 
@@ -217,8 +219,10 @@ private:
   TAO_ServantBase *ptr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Servant_Base.i"
+# include "tao/PortableServer/Servant_Base.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"