1 files changed, 5 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index 7dac70972c2..c30fa026c6b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -16,20 +16,15 @@
 #define TAO_PORTABLEGROUP_LOADER_H
 
 #include /**/ "ace/pre.h"
-
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-#include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 /**
  * @class TAO_PortableGroup_Adapter
@@ -54,15 +49,13 @@ public:
   static int Initializer (void);
 };
 
+ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
+ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
+
 static int
 TAO_Requires_PortableGroup_Initializer =
   TAO_PortableGroup_Loader::Initializer ();
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
-ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLEGROUP_LOADER_H */