1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
index cf1e19b7f92..7df7a8296c9 100644
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ b/TAO/tao/ImR_Client/ImR_Client.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ImR_Client/imr_client_export.h"
+#include "imr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class ServerObject_i;
 
 namespace TAO
@@ -64,17 +62,15 @@ namespace TAO
       ServerObject_i *server_object_;
     };
 
+    ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
+    ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
+
     static int
     TAO_Requires_ImR_Client_Initializer =
       TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer ();
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */