1 files changed, 4 insertions, 10 deletions
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index f3c2e405447..e706f0e7b87 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -14,17 +14,15 @@
 #define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
 #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/PortableServer/IdUniquenessStrategy.h"
+#include "IdUniquenessStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -46,14 +44,10 @@ namespace TAO
       virtual ::PortableServer::IdUniquenessPolicyValue type() const;
     };
 
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple)
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple)
-ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple)
-
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H */