1 files changed, 4 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
index fa07f1c30a3..007659174cd 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/RequestProcessingStrategyFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -41,14 +39,11 @@ namespace TAO
         RequestProcessingStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
-ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
-
-
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */