1 files changed, 4 insertions, 14 deletions
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
index 1189a6cd171..be88ba7ff60 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -15,25 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Synch_Options;
-class ACE_Time_Value;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 class TAO_Connector;
 class TAO_Connection_Handler;
 class TAO_Transport;
+class ACE_Synch_Options;
+class ACE_Time_Value;
 
 /**
  * @class TAO_Connect_Strategy
@@ -79,13 +72,10 @@ public:
                     ACE_Time_Value *val) = 0;
 
 protected:
-
   /// Cached copy of the ORB core pointer
-  TAO_ORB_Core * const orb_core_;
-
+  TAO_ORB_Core *orb_core_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_CONNECT_STRATEGY_H*/