ChangeLogTag:Sun Nov 27 04:00:27 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

74 files changed, 276 insertions, 105 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 61fa18469a4..4a8f29aa137 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -23,7 +23,9 @@
 #include "ace/Unbounded_Set.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 0fbc4528955..ac3e46a7031 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -25,7 +25,9 @@
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Process_Options;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 7eaac2ce351..837d6a0cf91 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -23,6 +23,11 @@
 #include "ace/Time_Value.h"
 #include "orbsvcs/AV/AV_export.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 struct TAO_AV_frame_info
@@ -98,7 +103,6 @@ protected:
 
 typedef TAO_Unbounded_Sequence<TAO_AV_Policy*> TAO_AV_PolicyList;
 
-class ACE_Message_Block;
 class TAO_AV_Protocol_Object;
 class TAO_AV_Transport;
 class TAO_AV_Flow_Handler;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 9b7a7449f2f..bd0505a0a07 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -26,7 +26,9 @@
 
 #include "tao/Versioned_Namespace.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 32bb56701f9..427be6dfbe8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -22,7 +22,9 @@
 
 #include "ace/Containers.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Command_Base;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -31,8 +33,6 @@ template<class Target,class Object> class TAO_ESF_Disconnected_Command;
 template<class Target,class Object> class TAO_ESF_Reconnected_Command;
 template<class Target> class TAO_ESF_Shutdown_Command;
 
-class ACE_Command_Base;
-
 /**
  * @class TAO_ESF_Delayed_Changes
  *
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
index 6df9adc7de1..30281eb5e20 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
@@ -20,6 +20,7 @@
 
 #ifdef __cplusplus
 
+#include "tao/orbconf.h"
 #include "ace/OS.h"
 
 /* Use prototypes in function declarations. */
@@ -94,6 +95,8 @@
 /* Size of default input buffer. */
 #define YY_BUF_SIZE 16384
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 extern int yyleng;
@@ -444,6 +447,9 @@ static char *yy_last_accepting_cpos;
 char *yytext;
 //#line 1 "ETCL/ETCL.ll"
 #define INITIAL 0
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //#line 4 "ETCL/ETCL.ll"
 // $Id$
 // ========================================================================
@@ -472,7 +478,7 @@ static const char* extract_string(char*);
 #define TAO_YY_LEX_DEBUG
 
 #ifdef TAO_CONSTRAINT_DEBUG
-#define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
+#define TAO_YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext)
 #endif /* TAO_CONSTRAINT_DEBUG */
 
 //#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
@@ -523,14 +529,14 @@ static void yy_pop_state YY_PROTO(( void ));
 static int yy_top_state YY_PROTO(( void ));
 #endif
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #else
 #define YY_NO_PUSH_STATE 1
 #define YY_NO_POP_STATE 1
 #define YY_NO_TOP_STATE 1
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifdef YY_MALLOC_DECL
 YY_MALLOC_DECL
 #else
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 03ee9965433..936dc5ec350 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -26,7 +26,9 @@
 
 #include "ace/Refcounted_Auto_Ptr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK_Dgram;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index 1b0917145f0..978ff270cee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -27,7 +27,9 @@
 #include "ace/SString.h"
 #include "ace/os_include/os_stdint.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Event_Handler;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
index 83894c55a7e..5d15185c221 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -27,7 +27,9 @@
 #include "ace/SOCK_Dgram.h"
 #include "ace/Atomic_Op.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_INET_Addr;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index f8a99055484..bf8a08f5269 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -52,7 +52,9 @@
 #include "EC_Lifetime_Utils_T.h"
 #include "ECG_CDR_Message_Receiver.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 1899b91099a..2945fdaea7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -52,7 +52,9 @@
 #include "EC_Lifetime_Utils_T.h"
 #include "ECG_CDR_Message_Sender.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK_Dgram;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index e393fdea4b6..5bb9aa0bba2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -4,6 +4,8 @@
 
 ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
 {
 }
@@ -37,3 +39,4 @@ TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *,
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 4ad494b96fe..e153de96c89 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_ConsumerControl.h
  *
@@ -24,6 +25,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
 
@@ -62,15 +67,17 @@ public:
    * reclaim all the resources attached to that object.
    */
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL);
 
   /// Some system exception was raised while trying to contact the
   /// consumer
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 406739f25b8..37b7fa36178 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -29,6 +29,8 @@
 #include "ace/SString.h"
 #include "ace/Time_Value.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Queue_Full_Service_Object;
 
 /**
@@ -185,6 +187,8 @@ protected:
   int consumer_validate_connection_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "EC_Default_Factory.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 3269d1f82cd..78fb1e73bb0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -27,7 +27,9 @@
 
 #include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index b8d99ea64db..ac1f428ef78 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -34,7 +34,9 @@
 
 #include /**/ "event_serv_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 054d9a98ed5..30f6dbe4128 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -32,11 +32,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_Utils
 {
   class UUID;
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 1f56e5409d5..5ba0e9defeb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -90,14 +90,18 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-namespace TAO_FTRT {
-  ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader)
-  ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader,
-    ACE_TEXT ("FTRT_ClientORB_Service"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (FTRT_ClientORB_Loader),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
-}
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRT,
+  FTRT_ClientORB_Loader,
+  TAO_FTRT::FTRT_ClientORB_Loader)
+
+ACE_STATIC_SVC_DEFINE (
+  FTRT_ClientORB_Loader,
+  ACE_TEXT ("FTRT_ClientORB_Service"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (FTRT_ClientORB_Loader),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
+
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
index 24c9585322a..b6bf1114663 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
@@ -49,11 +49,9 @@ namespace TAO_FTRT {
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-namespace TAO_FTRT {
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader)
-  ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader)
-  ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader)
+ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader)
+ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader)
 
 #include /**/ "ace/post.h"
 #endif //FTRT_CLIENTORB_LOADER_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index d4ac44c7f98..81333095e8d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -75,14 +75,16 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-namespace FTRTEC {
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader)
-
-  ACE_STATIC_SVC_DEFINE (Fault_Detector_Loader,
-    ACE_TEXT ("FTRTEC_Fault_Detector"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (Fault_Detector_Loader),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
-}
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRTEC,
+  Fault_Detector_Loader,
+  FTRTEC::Fault_Detector_Loader)
+
+ACE_STATIC_SVC_DEFINE (
+  Fault_Detector_Loader,
+  ACE_TEXT ("FTRTEC_Fault_Detector"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (Fault_Detector_Loader),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
index c1089b6e535..5b59e39808e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
@@ -51,11 +51,9 @@ namespace FTRTEC {
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-namespace FTRTEC {
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader)
-  ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader)
-  ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader)
+ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader)
+ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader)
 
 #include /**/ "ace/post.h"
 #endif //FAULT_DETECTOR_LOADER_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 8a7ad87eca7..1cef2d12730 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -85,14 +85,16 @@ namespace FTRTEC {
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-namespace FTRTEC {
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service)
-
-  ACE_STATIC_SVC_DEFINE (Identification_Service,
-    ACE_TEXT ("FTRTEC_Identification"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (Identification_Service),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
-}
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRTEC,
+  Identification_Service,
+  FTRTEC::Identification_Service)
+
+ACE_STATIC_SVC_DEFINE (
+  Identification_Service,
+  ACE_TEXT ("FTRTEC_Identification"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (Identification_Service),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
index 518510a44fb..69ecd289842 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
@@ -50,11 +50,8 @@ namespace FTRTEC
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-namespace FTRTEC {
-
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service)
-  ACE_STATIC_SVC_REQUIRE(Identification_Service)
-  ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service)
+ACE_STATIC_SVC_REQUIRE(Identification_Service)
+ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service)
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index fe995935502..53afcb41109 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -195,15 +195,16 @@ namespace FTRTEC
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-namespace FTRTEC
-{
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service)
-
-  ACE_STATIC_SVC_DEFINE (Replication_Service,
-    ACE_TEXT ("FTRTEC_Replication"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (Replication_Service),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
-}
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRTEC,
+  Replication_Service,
+  FTRTEC::Replication_Service)
+
+ACE_STATIC_SVC_DEFINE (
+  Replication_Service,
+  ACE_TEXT ("FTRTEC_Replication"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (Replication_Service),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 4d9f09e3082..43ba12d9fcc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -78,11 +78,8 @@ namespace FTRTEC
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-namespace FTRTEC
-{
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service)
-  ACE_STATIC_SVC_REQUIRE(Replication_Service)
-  ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service)
+ACE_STATIC_SVC_REQUIRE(Replication_Service)
+ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service)
 
 #endif //REPLCATION_SERVICE_H
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
index 53f6374b6e2..5e2f19a4954 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
@@ -34,6 +34,7 @@
 
 #include "ace/SOCK_Acceptor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -41,6 +42,7 @@ namespace ACE
     class Environment;
   }
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index 9248e779818..6dd450676ef 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -32,7 +32,7 @@
 #include "ace/Connector.h"
 #include "ace/OS.h"
 
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -40,6 +40,7 @@ namespace ACE
     class Environment;
   }
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
index 64f457f18b2..2532e88ff3f 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
@@ -23,7 +23,9 @@
 #include "tao/corbafwd.h"
 #include "ace/Strategies_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Thread_Manager;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
index 4d824cb7cf2..52c6e098da8 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
@@ -24,6 +24,7 @@
 #include "tao/Protocol_Factory.h"
 #include "ace/Service_Config.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -31,6 +32,7 @@ namespace ACE
     class Environment;
   }
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index ecbccbdaf1a..15ebfddd229 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -75,6 +75,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -8253,3 +8255,4 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index ef308b15c7f..bd0d14d45f5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -48,6 +48,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -1242,6 +1244,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "IFR_BaseS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
index 1b61891e2f7..1ec728b1667 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -403,3 +404,5 @@ POA_CORBA::TypedefDef::_get_type_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index 3d6746ad09f..396586e5433 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -903,6 +905,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseS_T.inl"
 #endif /* defined INLINE */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
index 0a48000f77e..4514816a147 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -1503,3 +1504,4 @@ template <class T> ACE_INLINE
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 0b600368c9b..1fe85a7d2a5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -75,6 +75,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -24769,3 +24771,4 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index 83ceea96c6a..6ea55966148 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -48,6 +48,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -7879,6 +7881,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "IFR_BasicS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
index ce9eeacd9e4..145677a50a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -9652,3 +9653,5 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index e51d59c3efa..f06759d4b3c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -7947,6 +7949,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicS_T.inl"
 #endif /* defined INLINE */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
index dc17374df92..3db89111ce8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
@@ -13430,3 +13432,4 @@ template <class T> ACE_INLINE
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 31dcee3fd14..a9e2b380b37 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -73,6 +73,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -14689,3 +14691,4 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index 1bc5fc2a6e4..13f64641067 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -47,6 +47,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -5100,6 +5102,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "IFR_ComponentsS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
index 7027d026daa..75931686c79 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -6961,3 +6962,5 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 7d1ccb307aa..f5868a35eb2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -5363,6 +5365,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsS_T.inl"
 #endif /* defined INLINE */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
index 1ab68c0aadd..547d5af6150 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -9010,3 +9011,4 @@ template <class T> ACE_INLINE
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index 989fae38f6c..57a991f3f8c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -73,6 +73,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -7769,3 +7771,4 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 96b05e5d1ae..87f87bdbf01 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -49,6 +49,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -2121,6 +2123,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "IFR_ExtendedS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
index a1780252eee..52ed37c258a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 POA_CORBA::FixedDef::_get_def_kind_skel (
@@ -2221,3 +2223,5 @@ POA_CORBA::ValueBoxDef::_get_type_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index c6f26a31235..936317c7330 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -2008,6 +2010,8 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedS_T.inl"
 #endif /* defined INLINE */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
index 8c2b0803d8d..6a35508b490 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -3333,3 +3334,4 @@ void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index ed2dcdc6397..c23f75b1661 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -32,7 +32,9 @@
 
 #include "ace/Configuration.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Configuration;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index 95df79a19d2..30c04de398f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ProvidesDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -88,6 +90,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index d4c8a0d1c3d..fbfeb8adbdd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_PublishesDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -56,6 +58,8 @@ public:
   // Return our definition kind.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index b02b0d7e1f0..ab9dc1cdee9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (Log,
            BasicLog_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb,
 				PortableServer::POA_ptr poa,
                                 TAO_LogMgr_i &logmgr_i,
@@ -88,3 +90,5 @@ TAO_BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 				 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 965f0261c6a..6e28231c4a7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -37,6 +37,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 
 /**
@@ -91,6 +93,8 @@ protected:
   PortableServer::POA_var	poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index 37e03007548..41314e7affa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -29,7 +29,9 @@
 #include "ace/RW_Thread_Mutex.h"
 #include "log_serv_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
index 4e7f7254df0..4309f9bd594 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
@@ -23,7 +23,9 @@
 #include "ace/Event_Handler.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
index d1ab436a70f..e2900cca27d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
@@ -23,7 +23,9 @@
 #include "ace/Event_Handler.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 6238e2f61d2..ac8e4b6a893 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -5623,7 +5623,7 @@ libTAO_SSLIOP_la_SOURCES = \
   SSLIOP/SSLIOP_TargetCredentials.cpp \
   SSLIOP/SSLIOP_Transport.cpp \
   SSLIOP/SSLIOP_Util.cpp \
-  SSLIOP/params_dup.c \
+  SSLIOP/params_dup.cpp \
   SSLIOP/ssl_endpointsC.cpp \
   SSLIOPC.cpp
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index 469caa06276..817e0bd1b47 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -22,18 +22,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "tao/orbconf.h"
+
 // Need by ACE_DLList_Node.
 #include "ace/Containers.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Forward declarations.
 template <class T> class ACE_Unbounded_List;
 template <class T> class ACE_Unbounded_List_Iterator;
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ACE_NS_Node
  *
@@ -46,8 +49,6 @@ public:
   friend class ACE_Unbounded_List<T>;
   friend class ACE_Unbounded_List_Iterator<T>;
 
-
-
 # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   /// This isn't necessary, but it keeps some compilers happy.
   ~ACE_NS_Node (void);
@@ -66,10 +67,6 @@ private:
   T item_;
 };
 
-
-
-
-
 /**
  * @class ACE_Unbounded_List_Iterator
  *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
index cca5b551b16..22fc4dcf653 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -22,7 +22,9 @@
 #include "ace/CORBA_macros.h"
 #include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 7d274fd44d7..ea89a320be5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -25,7 +25,7 @@ TAO_Notify_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-/********************************************************************************************************/
+/*****************************************************************************/
 
 TAO_Notify_Method_Request_Updates_No_Copy::TAO_Notify_Method_Request_Updates_No_Copy (const TAO_Notify_EventTypeSeq& added
                                                                               , const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index c8a069d7249..f33e3768aa8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -37,8 +37,9 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base
-                                                        ,public TAO_Notify_Method_Request_Queueable
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates
+  : public TAO_Notify_Method_Request_Updates_Base
+  , public TAO_Notify_Method_Request_Queueable
 {
 public:
   /// Constuctor
@@ -51,7 +52,7 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-/***********************************************************************************************************************/
+/*****************************************************************************/
 
 typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
                                         , TAO_Notify_Proxy*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index bfe4e4de89f..3a88d7c6131 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -20,8 +20,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Environment;
@@ -59,6 +62,8 @@ protected:
   PROXY proxy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "Method_Request_Updates_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h
index cbc9485a6cc..4a6660e5fcb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h
@@ -25,7 +25,9 @@
 #include "tao/orbconf.h"
 #include "tao/TimeBaseC.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class LOCK, class TYPE> class ACE_Atomic_Op;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
index 038eb7c8bcb..1efed121cf8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -22,7 +22,9 @@
 
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Event_Handler;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 3fa8cd9168d..2fe63ad4f4a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -19,7 +19,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 0f9389753c7..8d5e64694ad 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -27,6 +27,7 @@
 #include "orbsvcs/SSLIOPC.h"
 #include "tao/IIOP_Connection_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -109,6 +110,7 @@ namespace TAO
 
 } // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "IIOP_SSL_Connection_Handler.inl"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index bd0af0c207e..00170aa76ff 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -47,7 +47,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
         if (dsa != 0)
           {
             // Not exception safe!
-            ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup_wrapper (dsa));
+            ::EVP_PKEY_set1_DSA (p.in (), DSAPARAMS_DUP_WRAPPER_NAME (dsa));
             ::DSA_free (dsa);
           }
       }
@@ -59,7 +59,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
         if (dh != 0)
           {
             // Not exception safe!
-            ::EVP_PKEY_set1_DH (p.in (), DHparams_dup_wrapper (dh));
+            ::EVP_PKEY_set1_DH (p.in (), DHPARAMS_DUP_WRAPPER_NAME (dh));
             ::DH_free (dh);
           }
       }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
index 2c54418d138..cea38d78e06 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
@@ -3,8 +3,6 @@
 #include "params_dup.h"
 
 #include <openssl/asn1.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
 
 
 DSA *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
index 42bb96d7b72..823374df63a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
@@ -3,6 +3,12 @@
 #ifndef TAO_SSLIOP_PARAMS_DUP_H
 #define TAO_SSLIOP_PARAMS_DUP_H
 
+#include "ace/pre.h"
+
+#include "tao/orbconf.h"
+
+#include "ace/Global_Macros.h"
+
 // As of 0.9.7e, OpenSSL's DSAparams_dup() and DHparams_dup() macros
 // contain casts that are invalid in C++.  These C wrapper functions
 // allows them to be called from C++.
@@ -38,4 +44,6 @@ extern DH  *DHPARAMS_DUP_WRAPPER_NAME (DH *dh);
 }
 #endif
 
+#include "ace/post.h"
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 98848755d25..44ebd3e82b3 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -17,6 +17,8 @@ ACE_RCSID(orbsvcs,
           Scheduler_Factory,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Initialize static class members.
 RtecScheduler::Scheduler_ptr ACE_Scheduler_Factory::server_ = 0;
 ACE_Scheduler_Factory::Factory_Status ACE_Scheduler_Factory::status_ =
@@ -789,3 +791,5 @@ ACE_Scheduler_Factory::set_preemption_priority
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex> *ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index aa43e530553..f0b9fdf91ab 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -28,6 +29,8 @@
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Sched/sched_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Reconfig_Scheduler_Entry;
 struct TAO_RT_Info_Tuple;
 typedef ACE_Ordered_MultiSet<TAO_RT_Info_Tuple *> TUPLE_SET;
@@ -267,18 +270,11 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "orbsvcs/Scheduler_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_SCHEDULER_FACTORY_H */
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
index add09220816..2c01870582f 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
@@ -1,9 +1,13 @@
+// -*- C++ -*-
+
 // ============================================================================
 //
 // $Id$
 //
 // ============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This helper function allows the application to determine whether
 // the factory is uninitialized, or in a config or runtime mode of
 // operation.
@@ -13,3 +17,5 @@ ACE_Scheduler_Factory::status (void)
 {
   return status_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index ac70a799402..f8363038749 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -8,6 +8,7 @@
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
 
+#include "tao/orbconf.h"
 #include "ace/OS.h"
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -83,6 +84,8 @@
 /* Size of default input buffer. */
 #define YY_BUF_SIZE 16384
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 extern int yyleng;
@@ -405,6 +408,8 @@ char *yytext;
 
 #define INITIAL 0
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // $Id$
 // ========================================================================
 //