1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 65c614de389..9cc254b555a 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -16,17 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Key_Adapters.h"
+#include "Key_Adapters.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/Server_Strategy_Factory.h"
 #include "ace/Map_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Server_Strategy_Factory.h"
+#include "Servant_Base.h"
 
 // Forward declarations.
 class TAO_Id_Uniqueness_Strategy;
@@ -615,10 +613,8 @@ public:
                          TAO_Active_Object_Map_Entry &entry);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Active_Object_Map.i"
+# include "Active_Object_Map.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"