1 files changed, 9 insertions, 5 deletions
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
index 6471e5bce3f..e77cbc95b8f 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -14,15 +14,17 @@
 #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
 #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 "IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -35,11 +37,13 @@ namespace TAO
 
       virtual bool has_system_id (void) const;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IDASSIGNMENTSTRATEGYSYSTEM_H */