Mon Apr 28 14:24:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

186 files changed, 411 insertions, 229 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 339ebcb01fa..964a91ae298 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,196 @@
+Mon Apr 28 14:24:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+        * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+        * orbsvcs/examples/LoadBalancing/ORBInitializer.h
+        * orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+        * orbsvcs/examples/ORT/Server_IORInterceptor.h
+        * orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+        * orbsvcs/ImplRepo_Service/INS_Locator.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
+        * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+        * orbsvcs/orbsvcs/Security/Security_Current.h
+        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+        * orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+        * orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+        * orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
+        * orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+        * orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+        * orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+        * orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+        * orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+        * orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+        * orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+        * orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+        * orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+        * orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+        * orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+        * tao/LocalObject.h
+        * tao/LocalObject.inl
+        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+        * tests/Bug_1495_Regression/client_interceptor.h
+        * tests/Bug_1495_Regression/Client_ORBInitializer.h
+        * tests/Bug_1495_Regression/server_interceptor.h
+        * tests/Bug_1495_Regression/Server_ORBInitializer.h
+        * tests/Bug_3276_Regression/Servant_Locator.h
+        * tests/Collocated_Forwarding/Server_ORBInitializer.h
+        * tests/Collocated_Forwarding/Server_Request_Interceptor.h
+        * tests/ORT/ORT_test_IORInterceptor.h
+        * tests/ORT/ServerORBInitializer.h
+        * tests/ORT/ServerRequestInterceptor.h
+        * tests/POA/Bug_1592_Regression/ServantLocator.h
+        * tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
+        * tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
+        * tests/POA/Forwarding/Servant_Activator.h
+        * tests/POA/Loader/Servant_Activator.h
+        * tests/POA/Loader/Servant_Locator.h
+        * tests/POA/On_Demand_Activation/Servant_Activator.h
+        * tests/POA/On_Demand_Activation/Servant_Locator.h
+        * tests/POA/On_Demand_Loading/Servant_Activator.h
+        * tests/POA/On_Demand_Loading/Servant_Locator.h
+        * tests/Portable_Interceptors/AdvSlot/server.cpp
+        * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+        * tests/Portable_Interceptors/AdvSlotExt/server.cpp
+        * tests/Portable_Interceptors/AMI/Client_Interceptor.h
+        * tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/AMI/Server_Interceptor.h
+        * tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Benchmark/client_interceptors.h
+        * tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Benchmark/server_interceptors.h
+        * tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+        * tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+        * tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
+        * tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
+        * tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+        * tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+        * tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
+        * tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
+        * tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+        * tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+        * tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+        * tests/Portable_Interceptors/Dynamic/client_interceptor.h
+        * tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Dynamic/server_interceptor.h
+        * tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+        * tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+        * tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+        * tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+        * tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+        * tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+        * tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+        * tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+        * tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+        * tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+        * tests/Portable_Interceptors/PolicyFactory/Policy.h
+        * tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+        * tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+        * tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+        * tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+        * tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+        * tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+        * tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+        * tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+        * tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+        * tests/Portable_Interceptors/Slot/driver.cpp
+        * tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+        * tests/RTCORBA/Client_Propagated/interceptors.h
+        * tests/RTScheduling/Scheduler.h
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+        * tests/TransportCurrent/lib/Client_ORBInitializer.h
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.h
+        * tests/TransportCurrent/lib/Server_ORBInitializer.h
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.h
+          Don't use TAO_Local_RefCounted_Object but ::CORBA::LocalObject now
+          LocalObject is also refcounted. Users can still sue TAO_Local_RefCounted_Object,
+          it just does nothing, actions have been takin in LocalObject.h
+          to prevent the usage of TAO_Local_RefCounted_Object in the
+          TAO distribution itself
+
 Mon Apr 28 13:45:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_ACE.mwc:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
index d211c24fd9a..2f30a58b14d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -78,7 +78,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
   if (node->is_local ())
     {
       *os << "," << be_idt_nl
-          << "public virtual TAO_Local_RefCounted_Object"
+          << "public virtual ::CORBA::LocalObject"
           << be_uidt;
     }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
index 77c52f15dc5..1a73a5260b8 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
@@ -47,7 +47,7 @@ struct EDF_Scheduler_Traits
 
 class Kokyu_DSRT_Schedulers_Export EDF_Sched_Param_Policy:
 public EDF_Scheduling::SchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
+       public ::CORBA::LocalObject
 {
  public:
 
@@ -61,7 +61,7 @@ public EDF_Scheduling::SchedulingParameterPolicy,
 
 class Kokyu_DSRT_Schedulers_Export EDF_Scheduler:
 public EDF_Scheduling::Scheduler,
-public TAO_Local_RefCounted_Object
+public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 0783dd864f3..faa4755a807 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -12,28 +12,24 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy ()
 }
 
 FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
-    const FP_Segment_Sched_Param_Policy &rhs
-  )
+    const FP_Segment_Sched_Param_Policy &rhs)
   : CORBA::Object (),
   CORBA::Policy (),
-  CORBA::LocalObject (),
   FP_Scheduling::SegmentSchedulingParameterPolicy (),
-  TAO_Local_RefCounted_Object (),
+  CORBA::LocalObject (),
   value_ (rhs.value_)
 {
 }
 
 FP_Scheduling::SegmentSchedulingParameter
-FP_Segment_Sched_Param_Policy::value (
-      )
+FP_Segment_Sched_Param_Policy::value (void)
 {
   return value_;
 }
 
 void
 FP_Segment_Sched_Param_Policy::value (
-        const FP_Scheduling::SegmentSchedulingParameter & value
-      )
+        const FP_Scheduling::SegmentSchedulingParameter & value)
 {
   this->value_ = value;
 }
@@ -41,7 +37,7 @@ FP_Segment_Sched_Param_Policy::value (
 CORBA::Policy_ptr
 FP_Segment_Sched_Param_Policy::copy (void)
 {
-  FP_Segment_Sched_Param_Policy* tmp;
+  FP_Segment_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
index ea2f0dd541e..a18f8c519b4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
@@ -39,7 +39,7 @@ struct FP_Scheduler_Traits
 
 class Kokyu_DSRT_Schedulers_Export FP_Segment_Sched_Param_Policy:
 public FP_Scheduling::SegmentSchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
+       public ::CORBA::LocalObject
 {
  public:
      FP_Segment_Sched_Param_Policy ();
@@ -62,7 +62,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
 
 class Kokyu_DSRT_Schedulers_Export Fixed_Priority_Scheduler:
 public FP_Scheduling::FP_Scheduler,
-public TAO_Local_RefCounted_Object
+public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index c3ee1477ae5..5791fdc4f8e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -16,9 +16,8 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
   )
   : CORBA::Object (),
   CORBA::Policy (),
-  CORBA::LocalObject (),
   MIF_Scheduling::SchedulingParameterPolicy (),
-  TAO_Local_RefCounted_Object (),
+  CORBA::LocalObject (),
   value_ (rhs.value_)
 {
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
index cf1829ccb50..6fb40c9c717 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
@@ -39,7 +39,7 @@ struct MIF_Scheduler_Traits
 
 class Kokyu_DSRT_Schedulers_Export MIF_Sched_Param_Policy:
 public MIF_Scheduling::SchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
+       public ::CORBA::LocalObject
 {
  public:
      MIF_Sched_Param_Policy ();
@@ -59,7 +59,7 @@ public MIF_Scheduling::SchedulingParameterPolicy,
 
 class Kokyu_DSRT_Schedulers_Export MIF_Scheduler:
 public MIF_Scheduling::Scheduler,
-public TAO_Local_RefCounted_Object
+public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 1fb9e9a896d..9e84dcec991 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -16,9 +16,8 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
   )
   : CORBA::Object (),
   CORBA::Policy (),
-  CORBA::LocalObject (),
   MUF_Scheduling::SchedulingParameterPolicy (),
-  TAO_Local_RefCounted_Object (),
+  CORBA::LocalObject (),
   value_ (rhs.value_)
 {
 }
@@ -38,7 +37,7 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value)
 CORBA::Policy_ptr
 MUF_Sched_Param_Policy::copy (void)
 {
-  MUF_Sched_Param_Policy* tmp;
+  MUF_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     MUF_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
index e9b70810567..abaa4226cd0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
@@ -55,7 +55,7 @@ struct MUF_Scheduler_Traits
 
 class Kokyu_DSRT_Schedulers_Export MUF_Sched_Param_Policy:
 public MUF_Scheduling::SchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
+       public ::CORBA::LocalObject
 {
  public:
     MUF_Sched_Param_Policy ();
@@ -75,7 +75,7 @@ public MUF_Scheduling::SchedulingParameterPolicy,
 
 class Kokyu_DSRT_Schedulers_Export MUF_Scheduler:
 public MUF_Scheduling::Scheduler,
-public TAO_Local_RefCounted_Object
+public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index 97d6fa90153..fd3b7524a1f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -9,7 +9,7 @@
 
 class Segment_Sched_Param_Policy:
 public FP_Scheduling::SegmentSchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
+       public ::CORBA::LocalObject
 {
  public:
   virtual RTCORBA::Priority value (void);
@@ -26,7 +26,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
 
 class Fixed_Priority_Scheduler:
 public FP_Scheduling::FP_Scheduler,
-public TAO_Local_RefCounted_Object
+public ::CORBA::LocalObject
 {
  public:
 
@@ -91,7 +91,7 @@ public TAO_Local_RefCounted_Object
 
   virtual char * scheduling_discipline_name (void);
 
-  virtual RTScheduling::ResourceManager_ptr 
+  virtual RTScheduling::ResourceManager_ptr
     create_resource_manager (const char * name,
                              CORBA::Policy_ptr scheduling_parameter);
 
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index 70ef49412e7..094d4ae56bf 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -32,7 +32,7 @@ class DT : public ACE_Message_Block
 
 class Segment_Sched_Param_Policy:
 public MIF_Scheduling::SegmentSchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
+       public ::CORBA::LocalObject
 {
  public:
   virtual CORBA::Short importance (void);
@@ -51,7 +51,7 @@ typedef ACE_Message_Queue<ACE_NULL_SYNCH> DT_Message_Queue;
 
 class MIF_Scheduler:
 public MIF_Scheduling::MIF_Scheduler,
-public TAO_Local_RefCounted_Object
+public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 062e4077d88..1e892df895f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -36,7 +36,7 @@ class ImR_Locator_i;
  */
 class INS_Locator
   : public virtual IORTable::Locator,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   INS_Locator (ImR_Locator_i& loc);
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
index 18b2210531d..0fb4c8c1ed6 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
@@ -10,7 +10,7 @@
 
 class ORB_Initializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index de2e6ebd5c6..6e92e1eb365 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -30,7 +30,7 @@ state_slot_id (PortableInterceptor::SlotId slot_id);
 
 class ReplicaController
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   virtual
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
index 584463e99a7..171dfdeb7a6 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
@@ -44,7 +44,7 @@ class ServerRequestInterceptor;
  */
 class ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 74cb2fd2228..a5be7e9910e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -46,7 +46,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
  */
 class ServerRequestInterceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index fc5b5b2a382..52d41076d35 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -21,7 +21,7 @@
 
 class Server_IORInterceptor
   : public virtual PortableInterceptor::IORInterceptor_3_0,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index f64aa68b211..6ea98e2fab8 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -19,7 +19,7 @@
 
 class Server_IORInterceptor_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index 3a933b94c75..acab0b5ceda 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// FT ORB initializer.
 class TAO_FT_ClientORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 49a8b165b93..289f386ab77 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all FTCORBA related policies.
 class TAO_FT_ClientPolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 870a3c23f6e..a3cf1126670 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -44,7 +44,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -89,7 +89,7 @@ private:
  */
 class TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 637356ff8ec..1fc06596f71 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -18,9 +18,8 @@ TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
   )
   : CORBA::Object (),
     CORBA::Policy (),
-    CORBA::LocalObject (),
     FT::RequestDurationPolicy (),
-    TAO_Local_RefCounted_Object (),
+    CORBA::LocalObject (),
     request_duration_ (rhs.request_duration_)
 {
 }
@@ -43,9 +42,8 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
   )
   : CORBA::Object (),
     CORBA::Policy (),
-    CORBA::LocalObject (),
     FT::HeartbeatPolicy (),
-    TAO_Local_RefCounted_Object (),
+    CORBA::LocalObject (),
     heartbeat_ (rhs.heartbeat_),
     heartbeat_interval_ (rhs.heartbeat_interval_),
     heartbeat_timeout_ (rhs.heartbeat_timeout_)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index aa61223e197..8b2546ff124 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -69,7 +69,7 @@ namespace TAO
    */
   class FT_ClientRequest_Interceptor
     : public virtual PortableInterceptor::ClientRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
   {
   public:
 
@@ -90,7 +90,7 @@ namespace TAO
     virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
     virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
-        
+
     void ft_send_extended_sc (CORBA::Boolean send);
 
   protected:
@@ -119,7 +119,7 @@ namespace TAO
 
     /// Retention id generated by the client
     CORBA::Long retention_id_;
-        
+
     /// Transmit a TAG_FT_GROUP component in place of the
     /// FT_GROUP_VERSION data required by the spec.
     CORBA::Boolean ft_send_extended_sc_;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 947686c2c51..5550f15dffc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -53,7 +53,7 @@ class TAO_Profile;
  */
 class TAO_FT_ORB_Utils_Export TAO_FT_IOGR_Property
   : public virtual TAO_IOP::TAO_IOR_Property,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index aba180a7e2d..b544ada7263 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// RTCORBA ORB initializer.
 class TAO_FT_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index fd3ba323a2d..5bb75dfa353 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -40,7 +40,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all FTCORBA related policies.
 class TAO_FT_PolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 5e40b4b054c..55c1f2f5ab8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -87,7 +87,7 @@ private:
  */
 class TAO_FT_Export TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -143,7 +143,7 @@ private:
  */
 class TAO_FT_Export TAO_FT_Heart_Beat_Enabled_Policy
   : public FT::HeartbeatEnabledPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
index 3aa80e1b0a1..e07682aff63 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
@@ -9,7 +9,6 @@ TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::
   :ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
   , request_duration_ (duration)
 {
 }
@@ -18,9 +17,8 @@ ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TAO_FT_Request_Duration_Policy &rhs)
   :ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , FT::RequestDurationPolicy ()
-  , TAO_Local_RefCounted_Object ()
+  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , request_duration_ (rhs.request_duration_)
 {
 }
@@ -33,7 +31,6 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
   : ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_ (heartbeat)
   , heartbeat_interval_ (interval)
   , heartbeat_timeout_ (timeout)
@@ -46,7 +43,6 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (const TAO_FT_Heart_Beat_Poli
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , FT::HeartbeatPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_ (rhs.heartbeat_)
   , heartbeat_interval_ (rhs.heartbeat_interval_)
   , heartbeat_timeout_ (rhs.heartbeat_timeout_)
@@ -60,7 +56,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   : ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_enabled_value_ (heartbeat)
 {
 }
@@ -72,7 +67,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , FT::HeartbeatEnabledPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index b45f004765c..681b774a3db 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// RTCORBA ORB initializer.
 class TAO_FT_ServerORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index 55eba9ef6fb..76353d509ab 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all FTCORBA related policies.
 class TAO_FT_ServerPolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 5d602eec42e..34ac0eabd2a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_FT_Heart_Beat_Enabled_Policy
   : public FT::HeartbeatEnabledPolicy
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index 21dfaed4af7..15006251244 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -18,9 +18,8 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   )
   : CORBA::Object (),
     CORBA::Policy (),
-    CORBA::LocalObject (),
     FT::HeartbeatEnabledPolicy (),
-    TAO_Local_RefCounted_Object (),
+    CORBA::LocalObject (),
     heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 3af991ac16e..98de05c3e06 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -49,7 +49,7 @@ namespace TAO
    */
   class FT_ServerRequest_Interceptor
     : public virtual PortableInterceptor::ServerRequestInterceptor
-    , public virtual TAO_Local_RefCounted_Object
+    , public virtual ::CORBA::LocalObject
   {
   public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
index 3c46e040344..f099ff747f9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
@@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// RTCORBA ORB initializer.
 class FTRT_ClientORB_Initializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Priority mapping types
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index e1eb6fa03ef..b91a962f3bf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class FTRT_ClientORB_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// ctor.
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
index 877c6a26205..fb97b6ac338 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
@@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class FTEC_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index 5823e871dab..9edff67c3da 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Set_Update_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   TAO_Set_Update_Interceptor ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index 5e954707386..6692136aab7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -45,7 +45,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_LB_ClientORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index a20986f4f6d..b7c379ecc40 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -54,7 +54,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_LB_ClientRequestInterceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index aa22bfd1059..5a45b571013 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -50,7 +50,7 @@ class TAO_LB_LoadAlert;
  */
 class TAO_LB_IORInterceptor
   : public virtual PortableInterceptor::IORInterceptor_3_0,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index d5a570cb318..a090cbdcb01 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -40,7 +40,7 @@ class TAO_LB_LoadManager;
  */
 class TAO_LB_MemberLocator
   : public virtual PortableServer::ServantLocator,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index c019eebf019..1e99d50c554 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -52,7 +52,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_LB_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index dfdd7c2f0e6..e9750636ba0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -48,7 +48,7 @@ class TAO_LB_LoadAlert;
  */
 class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index 78d9db559d8..c79d3690a82 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// PortableGroup ORB initializer.
 class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index f1b942eaaaa..1e38ca405f3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -57,7 +57,7 @@ namespace TAO
      */
     class TAO_SSLIOP_Export SSLIOP_Credentials
       : public virtual SecurityLevel3::Credentials,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       typedef SSLIOP::Credentials_ptr _ptr_type;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index 3cd5ecb3e5f..88ac30c7fb9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -60,7 +60,7 @@ namespace TAO
      */
     class TAO_SSLIOP_Export CredentialsAcquirer
       : public virtual SecurityLevel3::CredentialsAcquirer,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 9d7cd1cf0e9..269b53d2e1f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -57,7 +57,7 @@ namespace TAO
      */
     class Current
       : public ::SSLIOP::Current,
-        public TAO_Local_RefCounted_Object
+        public ::CORBA::LocalObject
     {
     public:
       typedef Current_ptr _ptr_type;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 9375c18ac2d..be13316b77b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -54,7 +54,7 @@ namespace TAO
      */
     class Server_Invocation_Interceptor
       : public virtual PortableInterceptor::ServerRequestInterceptor,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 82c86738a09..fa85e9f75bb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -51,7 +51,7 @@ namespace TAO
      */
     class ORBInitializer
       : public virtual PortableInterceptor::ORBInitializer,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index b53f35a3582..7d3311aeeb1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -53,7 +53,7 @@ namespace TAO
      */
     class EstablishTrustPolicy
       : public virtual SecurityLevel2::EstablishTrustPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index bd5c87416be..95048ce20fc 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -50,7 +50,7 @@ namespace TAO
      */
     class QOPPolicy
       : public virtual SecurityLevel2::QOPPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
index 32da7a31219..3c74c27d5e2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
@@ -52,7 +52,7 @@ namespace TAO
      */
     class AccessDecision
       : public virtual TAO::SL2::AccessDecision,
-	public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
     {
     public:
       /*! Constructor */
@@ -166,7 +166,7 @@ namespace TAO
      */
     class SecurityManager
       : public virtual SecurityLevel2::SecurityManager,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 74065d41b01..2d207113592 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -45,7 +45,7 @@ namespace TAO
      */
     class ContextEstablishmentPolicy
       : public virtual SecurityLevel3::ContextEstablishmentPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 25c932ef5e9..238b0f06d41 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -59,7 +59,7 @@ namespace TAO
      */
     class TAO_Security_Export CredentialsCurator
       : public virtual SecurityLevel3::CredentialsCurator,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       typedef CredentialsCurator_ptr _ptr_type;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index f45f789aaaf..68b5118359f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -50,7 +50,7 @@ namespace TAO
      */
     class ObjectCredentialsPolicy
       : public virtual SecurityLevel3::ObjectCredentialsPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
index 9804c3013c5..121f24d4f23 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -45,7 +45,7 @@ namespace TAO
        */
       class PolicyFactory
         : public virtual PortableInterceptor::PolicyFactory,
-          public virtual TAO_Local_RefCounted_Object
+          public virtual ::CORBA::LocalObject
       {
       public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index 08bfa48a9d3..3da92850217 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -55,7 +55,7 @@ namespace TAO
      */
     class TAO_Security_Export SecurityCurrent
       : public virtual SecurityLevel3::SecurityCurrent,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 4bd46f9ea20..bc97221694c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -46,7 +46,7 @@ namespace TAO
      */
     class SecurityManager
       : public virtual SecurityLevel3::SecurityManager,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 847ad9a85fd..ccc784d678b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -46,7 +46,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Security_Export TAO_Security_Current
   : public SecurityLevel2::Current,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index 5fafd3f3928..936af6c378e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -54,7 +54,7 @@ namespace TAO
      */
     class TAO_Security_Export ORBInitializer
       : public virtual PortableInterceptor::ORBInitializer,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index 336d9523d21..f81f25a26c0 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -48,7 +48,7 @@ namespace TAO
      */
     class PolicyFactory
       : public PortableInterceptor::PolicyFactory,
-        public TAO_Local_RefCounted_Object
+        public ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
index b081f37b25f..7d812e928eb 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
@@ -44,7 +44,7 @@ class ServerRequestInterceptor;
  */
 class ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
index 7ccd73b60f5..5e1e7c5fbcc 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
@@ -44,7 +44,7 @@ class ServerRequestInterceptor;
  */
 class ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index bbcd23168c9..015cb27533f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -45,7 +45,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
  */
 class ServerRequestInterceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index 9d6ac8cca22..97d4735ebf8 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
@@ -38,7 +38,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index cf3f4ff782e..4d49861d69d 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -35,7 +35,7 @@
  */
 class Server_Request_Interceptor
   : public virtual Simple_ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index b80f8a306dc..6dc4fb2876b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -23,7 +23,7 @@
 /// RTCORBA ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index 58a08867a06..ed30383aacc 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -23,7 +23,7 @@
 /// RTCORBA ORB initializer.
 class Server_ORBInitializer2 :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index 0b5eb02ab6c..d4ede34bf6b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -25,7 +25,7 @@
 */
 class TAO249_ServerRequest_Interceptor
 : public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 209e1ecd17c..a2c88f6ddce 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -26,7 +26,7 @@
 */
 class TAO249_ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index 58a08867a06..ed30383aacc 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -23,7 +23,7 @@
 /// RTCORBA ORB initializer.
 class Server_ORBInitializer2 :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 536d3782173..a038756837b 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -26,7 +26,7 @@
 */
 class TAO249_ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index 58a08867a06..ed30383aacc 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -23,7 +23,7 @@
 /// RTCORBA ORB initializer.
 class Server_ORBInitializer2 :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 7b978a5702a..1085209cac6 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -25,7 +25,7 @@
 */
 class ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index 71fc032b9d5..088c8343ac8 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -23,7 +23,7 @@
 /// RTCORBA ORB initializer.
 class Server_ORBInitializer2 :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index 1e5af4cc2d5..cdeb9e083ac 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -26,7 +26,7 @@
 */
 class TAO249_ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
index a4e8ed8baa5..6b53d4ca40f 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
@@ -23,7 +23,7 @@
 /// RTCORBA ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
index bf87427ba9b..b28599c118a 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
@@ -25,7 +25,7 @@
 */
 class TAO249_ServerRequest_Interceptor
 : public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
index fa650dc5676..9ae2e562723 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
@@ -41,7 +41,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index 5dc35aa4be1..9389883ffde 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -39,7 +39,7 @@
  */
 class Server_Request_Interceptor
   : public virtual ForwardRequestTest::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 216998968c9..9d81a143ce8 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -174,6 +174,7 @@ namespace CORBA
   };
 }   // End CORBA namespace
 
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
 /**
  * @brief This class is there to keep backwards compatibility to the
  *        v1.1 C++ mapping
@@ -199,6 +200,7 @@ class TAO_Export TAO_Local_RefCounted_Object
          const TAO_Local_RefCounted_Object &);
      //@}
 };
+#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl
index 2927b69f7e5..6f04ad71ab6 100644
--- a/TAO/tao/LocalObject.inl
+++ b/TAO/tao/LocalObject.inl
@@ -42,9 +42,11 @@ CORBA::LocalObject::LocalObject (void)
 {
 }
 
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
 ACE_INLINE
 TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void)
 {
 }
+#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index 9850870f124..c6cc9c9ebb8 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index b6bbbd44b78..0f7194fa847 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Echo_Server_Request_Interceptor;
 /// Server ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 8e8ec520789..d0ea171f9ce 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index dd1814cd281..ebe5725ac94 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.h b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
index edfe869d26e..9884f406281 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.h
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
@@ -9,7 +9,7 @@
 
 class Servant_Locator
   : public PortableServer::ServantLocator
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
index 625c8d4debe..b6aaa094286 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
@@ -29,7 +29,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
index 375f7860ac6..8d40f494b20 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
@@ -25,7 +25,7 @@
  */
 class Server_Request_Interceptor
   : public virtual Collocated_ForwardRequestTest::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 995cc77a3e6..09f977b4b64 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -32,7 +32,7 @@
 
 class ORT_test_IORInterceptor
   : public virtual PortableInterceptor::IORInterceptor_3_0,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h
index 016a56fba86..29cb614b171 100644
--- a/TAO/tests/ORT/ServerORBInitializer.h
+++ b/TAO/tests/ORT/ServerORBInitializer.h
@@ -37,7 +37,7 @@
  */
 class ServerORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index 2c512632061..34a083ac3dd 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -47,7 +47,7 @@
  */
 class ServerRequestInterceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
index 3ff37066256..69406ef0814 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
@@ -42,7 +42,7 @@
  */
 class ServantLocator
   : public virtual PortableServer::ServantLocator,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
index fce0e29d4a3..60aa0aa5461 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
@@ -34,7 +34,7 @@
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
index 01860e44c06..1828110b6ed 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
@@ -41,7 +41,7 @@
  */
 class Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.h b/TAO/tests/POA/Forwarding/Servant_Activator.h
index 081a137a852..57a31ea1bb8 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.h
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.h
@@ -29,7 +29,7 @@
 
 class ServantActivator :
   public virtual PortableServer::ServantActivator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
   // = TITLE
   //   This class is used by a POA with USE_SERVANT_MANAGER and
diff --git a/TAO/tests/POA/Loader/Servant_Activator.h b/TAO/tests/POA/Loader/Servant_Activator.h
index 77df93604ba..8b46a485bfe 100644
--- a/TAO/tests/POA/Loader/Servant_Activator.h
+++ b/TAO/tests/POA/Loader/Servant_Activator.h
@@ -32,7 +32,7 @@
 
 class ServantActivator :
   public virtual PortableServer::ServantActivator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
   //= TITLE
   //   Servant Activator for the test servant.
diff --git a/TAO/tests/POA/Loader/Servant_Locator.h b/TAO/tests/POA/Loader/Servant_Locator.h
index 06396147ff5..422ec066b79 100644
--- a/TAO/tests/POA/Loader/Servant_Locator.h
+++ b/TAO/tests/POA/Loader/Servant_Locator.h
@@ -33,7 +33,7 @@
 
 class ServantLocator :
   public virtual PortableServer::ServantLocator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
   // = TITLE
   //   This class is used by a POA with USE_SERVANT_MANAGER and
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
index e6252375228..af28972deb1 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
@@ -25,7 +25,7 @@
 
 class ServantActivator :
   public virtual PortableServer::ServantActivator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   ServantActivator (CORBA::ORB_ptr orb);
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
index ecf820f2886..fb1460827ac 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
@@ -26,7 +26,7 @@
 
 class ServantLocator :
   public virtual PortableServer::ServantLocator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 
 {
   // = TITLE
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h
index 9c6f2250bb0..aeca82015f8 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h
@@ -28,7 +28,7 @@
 
 class ServantActivator_i :
   public virtual PortableServer::ServantActivator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 
 {
   //= TITLE
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h
index 385170cd40e..f1a0b45c5f8 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h
@@ -29,7 +29,7 @@
 
 class ServantLocator_i :
   public virtual PortableServer::ServantLocator,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 
 {
   // = TITLE
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
index c5b3adb42bf..f1ed172d9f7 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
@@ -15,7 +15,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   Echo_Client_Request_Interceptor (void);
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
index 97fca542091..0062c074e26 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
@@ -15,7 +15,7 @@
 
 class Client_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   Client_ORBInitializer ();
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
index 14bceffeff3..c3a5ae2991e 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
@@ -15,7 +15,7 @@
 
 class Echo_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   Echo_Server_Request_Interceptor ();
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
index 0fce0838184..43d2521d8a5 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
@@ -15,7 +15,7 @@
 
 class Server_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   Server_ORBInitializer (void);
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index 0d3a588adf2..71d51541beb 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -65,7 +65,7 @@ private:
 //
 //
 class ReplicaController: public virtual ServerRequestInterceptor,
-                         public virtual TAO_Local_RefCounted_Object
+                         public virtual ::CORBA::LocalObject
 {
 public:
   virtual char*
@@ -124,7 +124,7 @@ public:
 //
 //
 class ORB_Initializer : public virtual ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
+                        public virtual ::CORBA::LocalObject
 {
 public:
   virtual void
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 2a3fb8a0e8a..0c87fa96951 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -177,7 +177,7 @@ private:
 //
 //
 class ReplicaController: public virtual ServerRequestInterceptor,
-                         public virtual TAO_Local_RefCounted_Object
+                         public virtual ::CORBA::LocalObject
 {
   PortableInterceptor::Current_ptr pi_current_;
 public:
@@ -244,7 +244,7 @@ public:
 //
 //
 class ORB_Initializer : public virtual ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
+                        public virtual ::CORBA::LocalObject
 {
 public:
   virtual void
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index db73009d539..f2d7983a596 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -65,7 +65,7 @@ private:
 //
 //
 class ReplicaController: public virtual ServerRequestInterceptor,
-                         public virtual TAO_Local_RefCounted_Object
+                         public virtual ::CORBA::LocalObject
 {
 public:
   ReplicaController (PortableInterceptor::Current_ptr pi_current)
@@ -154,7 +154,7 @@ public:
 //
 //
 class ORB_Initializer : public virtual ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
+                        public virtual ::CORBA::LocalObject
 {
 public:
   virtual void
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index 11348d09d9d..7b5dc285c54 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index ec9035abf99..33d2e965627 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Server ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index 22a2a4626db..efe8ef39a88 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -22,7 +22,7 @@
 
 class Vault_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -52,7 +52,7 @@ private:
 
 class Vault_Client_Request_Context_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -82,7 +82,7 @@ private:
 
 class Vault_Client_Request_Dynamic_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -112,7 +112,7 @@ private:
 
 class Vault_Client_Request_NOOP_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index 0ce1704f5b7..b2f106599f9 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -22,7 +22,7 @@
 
 class Vault_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -53,7 +53,7 @@ private:
 
 class Vault_Server_Request_Context_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -84,7 +84,7 @@ private:
 
 class Vault_Server_Request_Dynamic_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -115,7 +115,7 @@ private:
 
 class Vault_Server_Request_NOOP_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index 9850870f124..c6cc9c9ebb8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index f9994a93d7a..d2db35c5110 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -26,7 +26,7 @@
 /// Server ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index 8e8ec520789..d0ea171f9ce 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 9e06f9fda85..91e2d900864 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index 73d1a7ed2f2..747d3cd7887 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
index 6061aad9dd0..1c0ca44b138 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
@@ -32,7 +32,7 @@
 /// RTCORBA ORB initializer.
 class ClientORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
index b1aaaec8fd7..36e4fc7032d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
@@ -27,7 +27,7 @@
 */
 class ClientRequest_Interceptor
 : public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
index 9850870f124..c6cc9c9ebb8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
index f9994a93d7a..d2db35c5110 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
@@ -26,7 +26,7 @@
 /// Server ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index a9345f46f15..4816c106c71 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index 3e9c58d9b5f..d904a3f507a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
index ef4db0dd418..d7a70955a5c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
@@ -26,7 +26,7 @@
 /// Client side ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
index 4ce7a4082ae..43de785db81 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
@@ -26,7 +26,7 @@
  */
 class Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
index dccc2ebc7b7..e9b99cf3eda 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
@@ -29,7 +29,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
index 52a5d2e5e39..6614e3bc958 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
@@ -25,7 +25,7 @@
  */
 class Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
index 81509146463..d39b06e5685 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
@@ -28,7 +28,7 @@ class Client_Request_Interceptor;
 /// Client side ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
index 6ac9f691aec..325adf61729 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
@@ -26,7 +26,7 @@
  */
 class Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index b8eed4343a0..6499213ab03 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Echo client ORB initializer.
 class Echo_Collocated_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 4456ffed47e..1b271359c52 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -23,7 +23,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
@@ -60,7 +60,7 @@ private:
 
 class Echo_Server_Request_Interceptor
   : public PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 7a6ab89c320..2c4cfe9de0e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -22,7 +22,7 @@
 /// Collocated ORB initializer.
 class Collocated_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index 6a6dab8b53f..ee11c0ae5f6 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -20,7 +20,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
@@ -57,7 +57,7 @@ private:
 
 class Echo_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 13f6cbe80f2..3a06286218c 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -27,7 +27,7 @@
 /// Echo client ORB initializer.
 class Echo_Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index 57f92f71138..f522246aefb 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -27,7 +27,7 @@
 /// Echo server ORB initializer.
 class Echo_Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 98513716bc6..36835290eb9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -20,7 +20,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index 30727c56541..754bea0000f 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -20,7 +20,7 @@
 
 class Echo_Server_Request_Interceptor
   : public PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index de46c5ee758..21d533515b9 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -38,7 +38,7 @@
 /// Client side ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 099f360b0a4..fedb0d1fc2c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -47,7 +47,7 @@
  */
 class Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index c1cd4bd7166..b6fb1f72cc3 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -41,7 +41,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index cd53fad237d..fa6ad5dc857 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -56,7 +56,7 @@
  */
 class Server_Request_Interceptor
   : public virtual ForwardRequestTest::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index a8e4f93dbfd..2e29ef223af 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -43,7 +43,7 @@
  */
 class FOO_ClientRequestInterceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index fe42e85e5d2..62fcc70c7ca 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -40,7 +40,7 @@
  */
 class FOO_Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 6a699c40792..a2cb6b41ea9 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -43,7 +43,7 @@
  */
 class FOO_IORInterceptor
   : public virtual PortableInterceptor::IORInterceptor_3_0,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index ce563c445fa..e9239d5acf5 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -40,7 +40,7 @@
  */
 class FOO_IORInterceptor_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
index 7aed2e7790a..4ab0fba1354 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
@@ -39,7 +39,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
index 45b443ba47e..2c04b7c8c32 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
@@ -43,7 +43,7 @@
  */
 class Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
index 249d15eacdd..64bc837a047 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
@@ -47,7 +47,7 @@ extern PortableInterceptor::SlotId slot_id;
  */
 class ClientORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index 60bb14ec5d1..90acf1f73db 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -42,7 +42,7 @@
  */
 class ClientRequestInterceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index 1789695af4b..d7c6d9b99a8 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -39,7 +39,7 @@
  */
 class ClientRequestInterceptor2
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index f4ebd2a58c3..968bf9a32ee 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -48,7 +48,7 @@ extern PortableInterceptor::SlotId slot_id;
  */
 class ServerORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index f40512200c3..e4be031209e 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -41,7 +41,7 @@
  */
 class ServerRequestInterceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index eeede279715..07404ca4890 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -42,7 +42,7 @@
  */
 class IORInterceptor
   : public virtual PortableInterceptor::IORInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
index fdebe1daa6f..8cfa9725b25 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
@@ -28,7 +28,7 @@
  */
 class Policy
   : public virtual Test::Policy,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
index f18411deb62..f817803f6e7 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
@@ -39,7 +39,7 @@
  */
 class PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
index e9d65e82a56..3f4034bcab0 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
@@ -40,7 +40,7 @@
  */
 class Server_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
index 0280f393533..67930a90275 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
@@ -27,7 +27,7 @@
 /// Echo client ORB initializer.
 class Echo_Collocated_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index ab7fc5e820a..20fce3fbff1 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -22,7 +22,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
@@ -59,7 +59,7 @@ private:
 
 class Echo_Server_Request_Interceptor
   : public PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
index 55004810ad0..c3527047ad8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
@@ -28,7 +28,7 @@
 /// Echo client ORB initializer.
 class Echo_Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
index 190fb9f8dd4..7fa088d2b74 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
@@ -27,7 +27,7 @@
 /// Echo client ORB initializer.
 class Echo_Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index d1b6b22f9f3..6d17ec03c4b 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index eef328e94dc..44dab0149bb 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -22,7 +22,7 @@
 
 class Echo_Server_Request_Interceptor
   : public PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
index 0dd990c22d3..d2d875268d0 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
index ef4db0dd418..d7a70955a5c 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
@@ -26,7 +26,7 @@
 /// Client side ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index a7ff5181b50..01dedacbeaa 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -26,7 +26,7 @@
  */
 class Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index dccc2ebc7b7..e9b99cf3eda 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -29,7 +29,7 @@ class Server_Request_Interceptor;
 /// Server side ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 52a5d2e5e39..6614e3bc958 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -25,7 +25,7 @@
  */
 class Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
index e01a6522b16..2bdb0bd80e2 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
@@ -26,7 +26,7 @@
 /// Server ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index e2d4ca3e84f..3281fbf1e4a 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -41,7 +41,7 @@
  */
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index 053753ee635..c60f09b3175 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -42,7 +42,7 @@
  */
 class Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object,
+    public virtual ::CORBA::LocalObject,
     public virtual Request_Interceptor
 {
 public:
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index 7c3444f0d04..b93fc6a811b 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -41,7 +41,7 @@
  */
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index 66d1ff9443d..9b7eb22db40 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -42,7 +42,7 @@
  */
 class Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object,
+    public virtual ::CORBA::LocalObject,
     public virtual Request_Interceptor
 {
 public:
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index 9850870f124..c6cc9c9ebb8 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index fdd057149c4..6bffdffaf04 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Server ORB initializer.
 class Server_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index e2a65a1f048..25510e64609 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index 18cad2930d6..12d511c2291 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -21,7 +21,7 @@
 
 class Echo_Server_Request_Interceptor
   : public virtual PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
index 0937839c2fa..c5b0d680127 100644
--- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp
+++ b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
@@ -9,7 +9,7 @@
 PortableInterceptor::SlotId slot_id;
 
 class ORB_Initializer : public virtual PortableInterceptor::ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
+                        public virtual ::CORBA::LocalObject
 {
 public:
   virtual void
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index 9850870f124..c6cc9c9ebb8 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -25,7 +25,7 @@
 /// Client ORB initializer.
 class Client_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index e8fea450a25..e3f2a2850cc 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -21,7 +21,7 @@
 
 class Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
   /// Client-side interceptor.  Verifies presense of RTCORBA priority
   /// context in the reply messages.
diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h
index a3e06044221..3b8c3b0110b 100644
--- a/TAO/tests/RTScheduling/Scheduler.h
+++ b/TAO/tests/RTScheduling/Scheduler.h
@@ -7,7 +7,7 @@
 
 class TAO_Scheduler:
 public RTScheduling::Scheduler,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index 76f300cf32c..56cdd4753c2 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -32,7 +32,7 @@ namespace Test
 
   class IIOP_Server_Request_Interceptor
     : public virtual Test::Server_Request_Interceptor
-    , public virtual TAO_Local_RefCounted_Object
+    , public virtual ::CORBA::LocalObject
   {
   public:
 
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
index 7c5eb831aab..85ffd0f62f9 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -30,7 +30,7 @@ namespace Test
 
   class Current_Test_Export Client_ORBInitializer :
     public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
   {
   public:
     Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
index 148b8075c8e..137c293ffcf 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
@@ -51,7 +51,7 @@ namespace Test
    */
   class Current_Test_Export Client_Request_Interceptor
     : public virtual PortableInterceptor::ClientRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
   {
  public:
 
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
index e9d517c30bd..73eb67a25e5 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -29,7 +29,7 @@ namespace Test
 
   class Current_Test_Export Server_ORBInitializer :
     public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
   {
   public:
     Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index 5498b253198..cb1bef0826f 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -46,7 +46,7 @@ namespace Test
    */
   class Current_Test_Export Server_Request_Interceptor
     : public virtual PortableInterceptor::ServerRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
   {
   public: