ChangeLogTag: Mon Sep 17 19:00:00 2001 Irfan Pyarali <irfan@cs.wustl.edu>

172 files changed, 18967 insertions, 17529 deletions

diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index 40c3680f482..594b1e909de 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -52,10 +52,15 @@ public:
    * selected acceptors (endpoints) from the array delimited by
    * <acceptors_begin> and <acceptors_end>.
    */
-  virtual int fill_mprofile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             TAO_Acceptor **acceptors_begin,
-                             TAO_Acceptor **acceptors_end) = 0;
+  virtual int fill_profile (const TAO_ObjectKey &object_key,
+                            TAO_MProfile &mprofile,
+                            TAO_Acceptor **acceptors_begin,
+                            TAO_Acceptor **acceptors_end,
+                            CORBA::Short priority = TAO_INVALID_PRIORITY) = 0;
+
+  /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
+  /// tag component of profiles.
+  virtual int encode_endpoints (TAO_MProfile &mprofile) = 0;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 208ee97a8bc..11e0a966b29 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -30,6 +30,7 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Connector_Registry.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #include "ace/Object_Manager.h"
 
@@ -58,7 +59,7 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
   if (sh == 0)
     {
       // Purge connections (if necessary)
-      this->orb_core_->transport_cache ()->purge ();
+      this->orb_core_->lane_resources ().transport_cache ().purge ();
 
       ACE_NEW_RETURN (sh,
                       SVC_HANDLER (this->orb_core_,
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 10c21c531e2..2c9e324c692 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -48,27 +48,6 @@ TAO_Acceptor_Registry::endpoint_count (void)
 }
 
 int
-TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
-                                      TAO_MProfile &mprofile,
-                                      TAO_Acceptor_Filter *filter)
-{
-  // Allocate space for storing the profiles.  There can never be more
-  // profiles than there are endpoints.  In some cases, there can be
-  // fewer profiles than endpoints.
-  size_t pfile_count = this->endpoint_count ();
-  if (mprofile.set (pfile_count) < 0)
-    return -1;
-
-  // Leave it to the filter to decide which acceptors/in which order
-  // go into the mprofile.
-  return filter->fill_mprofile (object_key,
-                                mprofile,
-                                this->begin (),
-                                this->end ());
-
-}
-
-int
 TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
 {
   TAO_AcceptorSetIterator end = this->end ();
@@ -115,7 +94,7 @@ TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag)
 
   for (;
        acceptor != end ;
-       acceptor++)
+       ++acceptor)
     {
       if ((*acceptor)->tag () == tag)
         return *acceptor;
@@ -124,9 +103,10 @@ TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag)
   return 0;
 }
 
-
 int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
+                             ACE_Reactor *reactor,
+                             int ignore_address,
                              CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -141,7 +121,9 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
 
       // All TAO pluggable protocols are expected to have the ability
       // to create a default endpoint.
-      if (this->open_default (orb_core, 0) == -1)
+      if (this->open_default (orb_core,
+                              reactor,
+                              0) == -1)
         ACE_THROW_RETURN (CORBA::INTERNAL (
                             CORBA_SystemException::_tao_minor_code (
                               TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
@@ -263,8 +245,10 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
               ACE_CString addrs = iop.substring (slot + 3);
 
               int result = this->open_i (orb_core,
+                                         reactor,
                                          addrs,
                                          factory,
+                                         ignore_address,
                                          ACE_TRY_ENV);
               ACE_CHECK_RETURN (-1);
 
@@ -304,6 +288,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
 // Iterate through the loaded transport protocols and create a default
 // server for each protocol.
 int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
+                                         ACE_Reactor *reactor,
                                          const char *options)
 {
   TAO_ProtocolFactorySet *pfs = orb_core->protocol_factories ();
@@ -336,6 +321,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
       if (!(*i)->factory ()->requires_explicit_endpoint ())
         {
           if (this->open_default (orb_core,
+                                  reactor,
                                   TAO_DEF_GIOP_MAJOR,  // default major
                                   TAO_DEF_GIOP_MINOR,  // default minor
                                   i,
@@ -367,6 +353,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
 // the indicated protocol.
 int
 TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
+                                     ACE_Reactor *reactor,
                                      int major,
                                      int minor,
                                      TAO_ProtocolFactorySetItor &factory,
@@ -392,6 +379,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
 
   // Initialize the acceptor to listen on a default endpoint.
   if (acceptor->open_default (orb_core,
+                              reactor,
                               major,
                               minor,
                               options) == -1)
@@ -478,8 +466,10 @@ TAO_Acceptor_Registry::extract_endpoint_version (ACE_CString &address,
 
 int
 TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
+                               ACE_Reactor *reactor,
                                ACE_CString &addrs,
                                TAO_ProtocolFactorySetItor &factory,
+                               int ignore_address,
                                CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_CString options_tmp;
@@ -521,12 +511,14 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                           minor);
 
           // Check for existence of endpoint.
-          if (address.length () == 0)
+          if (address.length () == 0 ||
+              ignore_address)
             {
               // Protocol prefix was specified without any endpoints.
               // All TAO pluggable protocols are expected to have the
               // ability to create a default endpoint.
               if (this->open_default (orb_core,
+                                      reactor,
                                       major,
                                       minor,
                                       factory,
@@ -546,6 +538,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
 
           // An explicit endpoint was provided.
           else if (acceptor->open (orb_core,
+                                   reactor,
                                    major,
                                    minor,
                                    address.c_str (),
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index c64bb7cfa37..2253cad75c2 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -64,6 +64,8 @@ public:
 
   /// Initialize all registered acceptors.  Return -1 on error.
   int open (TAO_ORB_Core *orb_core,
+            ACE_Reactor *reactor,
+            int ignore_address,
             CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -73,15 +75,6 @@ public:
   /// Returns the total number of endpoints in all of its acceptors.
   size_t endpoint_count (void);
 
-  /**
-   * Use <filter> to populate <mprofile> object with profiles.
-   * Different filters implement different strategies for selection
-   * of endpoints to be included into <mprofile>.
-   */
-  int make_mprofile (const TAO_ObjectKey& object_key,
-                     TAO_MProfile &mprofile,
-                     TAO_Acceptor_Filter *filter);
-
   /// Check if there is at least one profile in <mprofile> that
   /// corresponds to a collocated object.
   int is_collocated (const TAO_MProfile& mprofile);
@@ -97,10 +90,12 @@ private:
 
   /// Create a default acceptor for all loaded protocols.
   int open_default (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     const char *options);
 
   /// Create a default acceptor using the specified protocol factory.
   int open_default (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     int major,
                     int minor,
                     TAO_ProtocolFactorySetItor &factory,
@@ -120,8 +115,10 @@ private:
   /// Iterator through addrs in the string <iop>, and create an
   /// acceptor for each one.
   int open_i (TAO_ORB_Core *orb_core,
+              ACE_Reactor *reactor,
               ACE_CString &address,
               TAO_ProtocolFactorySetItor &factory,
+              int ignore_address,
               CORBA::Environment &ACE_TRY_ENV);
 
 private:
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index ab4b228771a..6786b867f9d 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "CORBALOC_Parser.h"
 #include "ORB_Core.h"
 #include "Stub.h"
@@ -307,7 +306,6 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
   // Create a TAO_Stub.
   TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
                                                   mprofile,
-                                                  orb->orb_core (),
                                                   ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
new file mode 100644
index 00000000000..0cbc7c4847f
--- /dev/null
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -0,0 +1,24 @@
+// $Id$
+
+#include "tao/Collocation_Resolver.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID(tao, Collocation_Resolver, "$Id$")
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Collocation_Resolver.i"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void)
+{
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<TAO_Collocation_Resolver>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<TAO_Collocation_Resolver>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
new file mode 100644
index 00000000000..1388d4c9238
--- /dev/null
+++ b/TAO/tao/Collocation_Resolver.h
@@ -0,0 +1,51 @@
+//=============================================================================
+/**
+ *  @file    Collocation_Resolver.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_COLLOCATION_RESOLVER_H
+#define TAO_COLLOCATION_RESOLVER_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corbafwd.h"
+#include "ace/Service_Object.h"
+
+/**
+ * @class TAO_Collocation_Resolver
+ *
+ * @brief This class helps in resolving if a CORBA:Object is collocated.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Collocation_Resolver
+  : public ACE_Service_Object
+{
+public:
+
+  /// Destructor.
+  virtual ~TAO_Collocation_Resolver (void);
+
+  /// Is <object> collocated?
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object,
+                                        CORBA::Environment &ACE_TRY_ENV) const = 0;
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Collocation_Resolver.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/RTCORBA/Pool_Per_Endpoint.i b/TAO/tao/Collocation_Resolver.i
index cfa1da318d3..cfa1da318d3 100644
--- a/TAO/tao/RTCORBA/Pool_Per_Endpoint.i
+++ b/TAO/tao/Collocation_Resolver.i
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
new file mode 100644
index 00000000000..f754ee649b4
--- /dev/null
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -0,0 +1,26 @@
+// $Id$
+
+#include "tao/Default_Collocation_Resolver.h"
+
+ACE_RCSID(tao, Default_Collocation_Resolver, "$Id$")
+
+#include "tao/Object.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Default_Collocation_Resolver.i"
+#endif /* ! __ACE_INLINE__ */
+
+CORBA::Boolean
+TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object,
+                                                 CORBA::Environment &) const
+{
+  return object->_is_collocated ();
+}
+
+ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver,
+                       ACE_TEXT ("Default_Collocation_Resolver"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_Default_Collocation_Resolver),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_FACTORY_DEFINE (TAO, TAO_Default_Collocation_Resolver)
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
new file mode 100644
index 00000000000..352a06a8d06
--- /dev/null
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -0,0 +1,52 @@
+//=============================================================================
+/**
+ *  @file    Default_Collocation_Resolver.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_DEFAULT_COLLOCATION_RESOLVER_H
+#define TAO_DEFAULT_COLLOCATION_RESOLVER_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Collocation_Resolver.h"
+#include "ace/Service_Config.h"
+
+/**
+ * @class TAO_Default_Collocation_Resolver
+ *
+ * @brief Simple resolver used to decide if a CORBA::Object is
+ * collocated.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Default_Collocation_Resolver :
+  public TAO_Collocation_Resolver
+{
+public:
+
+  /// Is <object> collocated?
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object,
+                                        CORBA::Environment &ACE_TRY_ENV) const;
+};
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver)
+ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver)
+
+#if defined (__ACE_INLINE__)
+# include "tao/Default_Collocation_Resolver.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_DEFAULT_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/Default_Collocation_Resolver.i b/TAO/tao/Default_Collocation_Resolver.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/Default_Collocation_Resolver.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index bd47d196f83..6e356be1282 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -24,31 +24,28 @@ TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *,
 }
 
 int
-TAO_Default_Protocols_Hooks::call_client_protocols_hook (
-                                int &,
-                                int &,
-                                int &,
-                                const char *)
+TAO_Default_Protocols_Hooks::call_client_protocols_hook (int &,
+                                                         int &,
+                                                         int &,
+                                                         const char *)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::call_server_protocols_hook (
-                                int &,
-                                int &,
-                                int &,
-                                const char *)
+TAO_Default_Protocols_Hooks::call_server_protocols_hook (int &,
+                                                         int &,
+                                                         int &,
+                                                         const char *)
 {
   return 0;
 }
 
 void
-TAO_Default_Protocols_Hooks::add_rt_service_context_hook (
-                                TAO_Service_Context &,
-                                CORBA::Policy *,
-                                CORBA::Short &,
-                                CORBA::Environment &)
+TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
+                                                          CORBA::Policy *,
+                                                          CORBA::Short &,
+                                                          CORBA::Environment &)
 {
 }
 
@@ -110,6 +107,13 @@ TAO_Default_Protocols_Hooks::set_default_policies (CORBA::Environment &)
   return 0;
 }
 
+int
+TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &,
+                                                                 CORBA::Environment &)
+{
+  return 0;
+}
+
 void
 TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
                                                  TAO_Service_Context &,
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 8fe8a625625..5069bc8caf1 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -24,7 +24,7 @@
 
 class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
 {
- public:
+public:
 
   /// destructor
   virtual ~TAO_Default_Protocols_Hooks (void);
@@ -57,12 +57,11 @@ class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
                                   &is_client_propagated,
                                   CORBA::Short &server_priority);
 
-  virtual void get_selector_bands_policy_hook (
-                           CORBA::Policy *bands_policy,
-                           CORBA::Short &min_priority,
-                           CORBA::Short &max_priority,
-                           CORBA::Short &p,
-                           int &in_range);
+  virtual void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
+                                               CORBA::Short &min_priority,
+                                               CORBA::Short &max_priority,
+                                               CORBA::Short &p,
+                                               int &in_range);
 
   virtual int get_thread_CORBA_priority (CORBA::Short &,
                                          CORBA::Environment &);
@@ -82,6 +81,9 @@ class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
 
   virtual int set_default_policies (CORBA::Environment &ACE_TRY_ENV);
 
+  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
+                                                  CORBA::Environment &ACE_TRY_ENV);
+
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
new file mode 100644
index 00000000000..719d8e852a9
--- /dev/null
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -0,0 +1,92 @@
+// $Id$
+
+#include "tao/Default_Thread_Lane_Resources_Manager.h"
+
+ACE_RCSID(tao, Default_Thread_Lane_Resources_Manager, "$Id$")
+
+#include "tao/ORB_Core.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Leader_Follower.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Default_Thread_Lane_Resources_Manager.i"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
+  : TAO_Thread_Lane_Resources_Manager (orb_core),
+    lane_resources_ (0)
+{
+  // Create the default resources.
+  ACE_NEW (this->lane_resources_,
+           TAO_Thread_Lane_Resources (orb_core));
+}
+
+TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void)
+{
+  // Delete the default resources.
+  delete this->lane_resources_;
+}
+
+int
+TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (CORBA_Environment &ACE_TRY_ENV)
+{
+  int result =
+    this->lane_resources_->open_acceptor_registry (0,
+                                                   ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  return result;
+}
+
+void
+TAO_Default_Thread_Lane_Resources_Manager::finalize (void)
+{
+  // Finalize default resources.
+  this->lane_resources_->finalize ();
+}
+
+TAO_Thread_Lane_Resources &
+TAO_Default_Thread_Lane_Resources_Manager::lane_resources (void)
+{
+  return *this->lane_resources_;
+}
+
+TAO_Thread_Lane_Resources &
+TAO_Default_Thread_Lane_Resources_Manager::default_lane_resources (void)
+{
+  return this->lane_resources ();
+}
+
+void
+TAO_Default_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+{
+  this->lane_resources_->shutdown_reactor ();
+}
+
+int
+TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofile)
+{
+  return this->lane_resources_->is_collocated (mprofile);
+}
+
+TAO_Thread_Lane_Resources_Manager *
+TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core)
+{
+  TAO_Thread_Lane_Resources_Manager *manager = 0;
+
+  /// Create the Default Thread Lane Resources Manager.
+  ACE_NEW_RETURN (manager,
+                  TAO_Default_Thread_Lane_Resources_Manager (core),
+                  0);
+
+  return manager;
+}
+
+ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory,
+                       ACE_TEXT ("Default_Thread_Lane_Resources_Manager_Factory"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_Default_Thread_Lane_Resources_Manager_Factory),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_FACTORY_DEFINE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
new file mode 100644
index 00000000000..5b8faafea25
--- /dev/null
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -0,0 +1,97 @@
+//=============================================================================
+/**
+ *  @file    Default_Thread_Lane_Resources_Manager.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H
+#define TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "ace/Service_Config.h"
+
+/**
+ * @class TAO_Default_Thread_Lane_Resources_Manager
+ *
+ * @brief Simple manager for thread lane resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Default_Thread_Lane_Resources_Manager :
+  public TAO_Thread_Lane_Resources_Manager
+{
+public:
+
+  /// Constructor.
+  TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
+
+  /// Destructor.
+  ~TAO_Default_Thread_Lane_Resources_Manager (void);
+
+  /// Finalize resources.
+  void finalize (void);
+
+  /// Open default resources.
+  int open_default_resources (CORBA_Environment &ACE_TRY_ENV);
+
+  /// Shutdown reactor.
+  void shutdown_reactor (void);
+
+  // Does <mprofile> belong to us?
+  int is_collocated (const TAO_MProfile &mprofile);
+
+  /// @name Accessors
+  // @{
+
+  TAO_Thread_Lane_Resources &lane_resources (void);
+
+  TAO_Thread_Lane_Resources &default_lane_resources (void);
+
+  // @}
+
+protected:
+
+  /// Default lane resources.
+  TAO_Thread_Lane_Resources *lane_resources_;
+};
+
+/**
+ * @class TAO_Default_Thread_Lane_Resources_Manager_Factory
+ *
+ * @brief This class is a factory for managers of thread resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory
+  : public TAO_Thread_Lane_Resources_Manager_Factory
+{
+public:
+
+  /// Factory method.
+  TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
+
+};
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
+ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
+
+#if defined (__ACE_INLINE__)
+# include "tao/Default_Thread_Lane_Resources_Manager.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.i b/TAO/tao/Default_Thread_Lane_Resources_Manager.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 6e8d3a5d5e4..35d8ddc685f 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -133,7 +133,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA_DomainManager::_non_existent_skel},
       {"",0},{"",0},{"",0},
-      {"get_domain_policy", 	&POA_CORBA_DomainManager::get_domain_policy_skel},
+      {"get_domain_policy",     &POA_CORBA_DomainManager::get_domain_policy_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -326,7 +326,8 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
@@ -785,18 +786,18 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"copy", 	&POA_CORBA_ConstructionPolicy::copy_skel},
+      {"copy",  &POA_CORBA_ConstructionPolicy::copy_skel},
       {"_is_a",  &POA_CORBA_ConstructionPolicy::_is_a_skel},
       {"",0},
-      {"destroy", 	&POA_CORBA_ConstructionPolicy::destroy_skel},
+      {"destroy",       &POA_CORBA_ConstructionPolicy::destroy_skel},
       {"",0},{"",0},
       {"_interface",  &POA_CORBA_ConstructionPolicy::_interface_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA_ConstructionPolicy::_non_existent_skel},
       {"",0},{"",0},
-      {"_get_policy_type", 	&POA_CORBA_ConstructionPolicy::_get_policy_type_skel},
+      {"_get_policy_type",      &POA_CORBA_ConstructionPolicy::_get_policy_type_skel},
       {"",0},{"",0},
-      {"make_domain_manager", 	&POA_CORBA_ConstructionPolicy::make_domain_manager_skel},
+      {"make_domain_manager",   &POA_CORBA_ConstructionPolicy::make_domain_manager_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -984,7 +985,8 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 82c4f13092c..4e4adfa7a96 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -43,7 +43,7 @@ class TAO_Export TAO_Endpoint
 public:
   /// Constructor.
   TAO_Endpoint (CORBA::ULong tag,
-                CORBA::Short priority = -1);
+                CORBA::Short priority = TAO_INVALID_PRIORITY);
 
   /// Destructor.
   virtual ~TAO_Endpoint (void);
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index c854f691e4e..c73e9f97a76 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1,8 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
-
 #include "tao/IIOP_Acceptor.h"
 #include "tao/IIOP_Profile.h"
 #include "tao/MProfile.h"
@@ -21,7 +19,6 @@ ACE_RCSID(tao,
           IIOP_Acceptor,
           "$Id$")
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
@@ -85,9 +82,9 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 int
-TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-                                    TAO_MProfile &mprofile,
-                                    CORBA::Boolean share_profile)
+TAO_IIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+                                   TAO_MProfile &mprofile,
+                                   CORBA::Short priority)
 {
   // Sanity check.
   if (this->endpoint_count_ == 0)
@@ -95,17 +92,20 @@ TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
 
   // Check if multiple endpoints should be put in one profile or
   // if they should be spread across multiple profiles.
-  if (share_profile == 1)
-    return this->create_shared_profile (object_key,
-                                        mprofile);
+  if (priority == TAO_INVALID_PRIORITY)
+    return this->create_new_profile (object_key,
+                                     mprofile,
+                                     priority);
   else
-    return this->create_new_profiles (object_key,
-                                     mprofile);
+    return this->create_shared_profile (object_key,
+                                        mprofile,
+                                        priority);
 }
 
 int
-TAO_IIOP_Acceptor::create_new_profiles (const TAO_ObjectKey &object_key,
-                                        TAO_MProfile &mprofile)
+TAO_IIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+                                       TAO_MProfile &mprofile,
+                                       CORBA::Short priority)
 {
   // Adding this->endpoint_count_ to the TAO_MProfile.
   int count = mprofile.profile_count ();
@@ -125,6 +125,7 @@ TAO_IIOP_Acceptor::create_new_profiles (const TAO_ObjectKey &object_key,
                                         this->version_,
                                         this->orb_core_),
                       -1);
+      pfile->endpoint ()->priority (priority);
 
       if (mprofile.give_profile (pfile) == -1)
         {
@@ -155,7 +156,8 @@ TAO_IIOP_Acceptor::create_new_profiles (const TAO_ObjectKey &object_key,
 
 int
 TAO_IIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
-                                          TAO_MProfile &mprofile)
+                                          TAO_MProfile &mprofile,
+                                          CORBA::Short priority)
 {
   size_t index = 0;
   TAO_Profile *pfile = 0;
@@ -166,11 +168,11 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
     {
       pfile = mprofile.get_profile (i);
       if (pfile->tag () == TAO_TAG_IIOP_PROFILE)
-      {
-        iiop_profile = ACE_dynamic_cast (TAO_IIOP_Profile *,
-                                         pfile);
-        break;
-      }
+        {
+          iiop_profile = ACE_dynamic_cast (TAO_IIOP_Profile *,
+                                           pfile);
+          break;
+        }
     }
 
   // If <mprofile> doesn't contain a IIOP_Profile, we need to create
@@ -185,7 +187,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
                                         this->version_,
                                         this->orb_core_),
                       -1);
-      iiop_profile->endpoint ()->priority (this->priority ());
+      iiop_profile->endpoint ()->priority (priority);
 
       if (mprofile.give_profile (iiop_profile) == -1)
         {
@@ -224,7 +226,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
                                          this->addrs_[index].get_port_number (),
                                          this->addrs_[index]),
                       -1);
-      endpoint->priority (this->priority_);
+      endpoint->priority (priority);
       iiop_profile->add_endpoint (endpoint);
     }
 
@@ -259,6 +261,7 @@ TAO_IIOP_Acceptor::close (void)
 
 int
 TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
+                         ACE_Reactor *reactor,
                          int major,
                          int minor,
                          const char *address,
@@ -318,7 +321,8 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                     1) != 0)
         return -1;
       else
-        return this->open_i (addr);
+        return this->open_i (addr,
+                             reactor);
     }
   else if (port_separator_loc == 0)
     {
@@ -364,11 +368,13 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (this->addrs_[0].set (addr) != 0)
     return -1;
 
-  return this->open_i (addr);
+  return this->open_i (addr,
+                       reactor);
 }
 
 int
 TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
+                                 ACE_Reactor *reactor,
                                  int major,
                                  int minor,
                                  const char *options)
@@ -413,11 +419,13 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
                 1) != 0)
     return -1;
 
-  return this->open_i (addr);
+  return this->open_i (addr,
+                       reactor);
 }
 
 int
-TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
+TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
+                           ACE_Reactor *reactor)
 {
   ACE_NEW_RETURN (this->creation_strategy_,
                   TAO_IIOP_CREATION_STRATEGY (this->orb_core_,
@@ -438,7 +446,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
     {
       // don't care, i.e., let the OS choose an ephemeral port
       if (this->base_acceptor_.open (addr,
-                                     this->orb_core_->reactor (this),
+                                     reactor,
                                      this->creation_strategy_,
                                      this->accept_strategy_,
                                      this->concurrency_strategy_) == -1)
@@ -468,7 +476,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
           // Now try to actually open on that port
           a.set_port_number (p);
           if (this->base_acceptor_.open (a,
-                                         this->orb_core_->reactor (this),
+                                         reactor,
                                          this->creation_strategy_,
                                          this->accept_strategy_,
                                          this->concurrency_strategy_) != -1)
@@ -546,8 +554,7 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
       // just return ours.
       return this->dotted_decimal_address (addr, host);
     }
-  else
-  if (specified_hostname != 0)
+  else if (specified_hostname != 0)
     {
       // If the user specified a hostname, pass it back
       // blindly as it overrides our choice of hostname.
@@ -725,16 +732,16 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
   // processing.
   if (!(cdr.read_octet (major)
         && cdr.read_octet (minor)))
-  {
-    if (TAO_debug_level > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"),
-                    major,
-                    minor));
-      }
-    return -1;
-  }
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"),
+                      major,
+                      minor));
+        }
+      return -1;
+    }
 
   CORBA::String_var host;
   CORBA::UShort port = 0;
@@ -838,22 +845,11 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
 
           if (name == "priority")
             {
-              CORBA::Short corba_priority =
-                ACE_static_cast (CORBA::Short,
-                                 ACE_OS::atoi (value.c_str ()));
-
-              if (corba_priority >= 0
-                  /* && corba_priority < 32768 */)
-                // priority_ and corba_priority will always be less
-                // than 32768 since CORBA::Short is a signed 16 bit
-                // integer.
-                this->priority_ = corba_priority;
-              else
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint ")
-                                   ACE_TEXT ("priority: <%s>\n"),
-                                   value.c_str ()),
-                                  -1);
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                                 value.c_str ()),
+                                -1);
             }
           else if (name == "portspan")
             {
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index f86cc5ba6e8..f8d415c2995 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -67,18 +67,20 @@ public:
    * Pluggable.h for details.
    */
   virtual int open (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     int version_major,
                     int version_minor,
                     const char *address,
                     const char *options = 0);
   virtual int open_default (TAO_ORB_Core *orb_core,
+                            ACE_Reactor *reactor,
                             int version_major,
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile,
-                               CORBA::Boolean share_profile);
+  virtual int create_profile (const TAO_ObjectKey &object_key,
+                              TAO_MProfile &mprofile,
+                              CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
   virtual CORBA::ULong endpoint_count (void);
 
@@ -111,7 +113,8 @@ protected:
    * virtual to allow a derived class implementation to be invoked
    * instead.
    */
-  virtual int open_i (const ACE_INET_Addr &addr);
+  virtual int open_i (const ACE_INET_Addr &addr,
+                      ACE_Reactor *reactor);
 
   /**
    * Probe the system for available network interfaces, and initialize
@@ -126,7 +129,6 @@ protected:
    * Parse protocol specific options.
    *
    * Currently supported:
-   *    priority -- specifies the RT CORBA priority for the endpoint
    *    portspan -- specifies the range of ports over which the acceptor
    *                should scan looking for a free port (this is convenient
    *                for situations where you might normally use an ephemeral
@@ -141,13 +143,15 @@ protected:
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
-  int create_new_profiles (const TAO_ObjectKey &object_key,
-                           TAO_MProfile &mprofile);
+  int create_new_profile (const TAO_ObjectKey &object_key,
+                          TAO_MProfile &mprofile,
+                          CORBA::Short priority);
 
   /// Helper method to create a profile that contains all of
   /// our endpoints.
   int create_shared_profile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile);
+                             TAO_MProfile &mprofile,
+                             CORBA::Short priority);
 
 protected:
 
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index fdd6cf457ef..1f7cc7c3c7d 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -1,18 +1,19 @@
 // $Id$
 
-#include "IIOP_Connection_Handler.h"
-#include "Timeprobe.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "ORB.h"
-#include "CDR.h"
-#include "Messaging_Policy_i.h"
-#include "Server_Strategy_Factory.h"
-#include "IIOP_Transport.h"
-#include "IIOP_Endpoint.h"
-#include "Transport_Cache_Manager.h"
-#include "Base_Transport_Property.h"
-#include "Resume_Handle.h"
+#include "tao/IIOP_Connection_Handler.h"
+#include "tao/Timeprobe.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "tao/CDR.h"
+#include "tao/Messaging_Policy_i.h"
+#include "tao/Server_Strategy_Factory.h"
+#include "tao/IIOP_Transport.h"
+#include "tao/IIOP_Endpoint.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Base_Transport_Property.h"
+#include "tao/Resume_Handle.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/IIOP_Connection_Handler.i"
@@ -272,8 +273,8 @@ TAO_IIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
 int
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 56f4cedc330..e4c86a4ffec 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -12,6 +12,7 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Invocation.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "ace/Strategies_T.h"
 
 ACE_RCSID (TAO,
@@ -157,8 +158,8 @@ TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
 
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
-  if (this->orb_core ()->transport_cache ()->find_transport (desc,
-                                                             base_transport) == 0)
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
+                                                                              base_transport) == 0)
     {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -174,7 +175,7 @@ TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                     ACE_TEXT ("making a new connection\n")));
 
       // Purge connections (if necessary)
-      this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->lane_resources ().transport_cache ().purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection
@@ -226,8 +227,8 @@ TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
       base_transport = TAO_Transport::_duplicate (svc_handler->transport ());
       // Add the handler to Cache
       int retval =
-        this->orb_core ()->transport_cache ()->cache_transport (desc,
-                                                                base_transport);
+        this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                 base_transport);
 
       if (retval != 0 && TAO_debug_level > 0)
         {
@@ -372,8 +373,8 @@ TAO_IIOP_Connector::preconnect (const char *preconnects)
 
               // Add the handler to Cache
               int retval =
-                this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                        handlers[slot]->transport ());
+                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                         handlers[slot]->transport ());
               successes++;
 
               if (retval != 0 && TAO_debug_level > 4)
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 46d339d8c9e..faca3b3155f 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -6,6 +6,7 @@
 #include "tao/IIOP_Acceptor.h"
 #include "tao/IIOP_Profile.h"
 #include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/operation_details.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
@@ -257,17 +258,16 @@ void
 TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
 {
   // Get a handle to the acceptor registry
-  TAO_Acceptor_Registry * ar =
-    this->orb_core ()->acceptor_registry ();
-
+  TAO_Acceptor_Registry &ar =
+    this->orb_core ()->lane_resources ().acceptor_registry ();
 
   // Get the first acceptor in the registry
-  TAO_AcceptorSetIterator acceptor = ar->begin ();
+  TAO_AcceptorSetIterator acceptor = ar.begin ();
 
   IIOP::ListenPointList listen_point_list;
 
   for (;
-       acceptor != ar->end ();
+       acceptor != ar.end ();
        acceptor++)
     {
       // Check whether it is a IIOP acceptor
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 52e649885bb..ef812ce8907 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -121,7 +121,6 @@ TAO_IOR_Manipulation_impl::merge_iors (
 
   TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string
                                           Merged_Profiles,
-                                          orb_core,
                                           ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
@@ -226,7 +225,6 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string
                                           Diff_Profiles,
-                                          orb_core,
                                           ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index 2ff165ca020..6cc1218267a 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -15,6 +15,7 @@
 
 #include "tao/LF_Follower.h"
 #include "tao/ORB_Core.h"
+#include "tao/New_Leader_Generator.h"
 #include "ace/Intrusive_List.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -22,12 +23,14 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_LF_Event;
+class TAO_New_Leader_Generator;
 
 class TAO_Export TAO_Leader_Follower
 {
 public:
   /// Constructor
-  TAO_Leader_Follower (TAO_ORB_Core *orb_core);
+  TAO_Leader_Follower (TAO_ORB_Core *orb_core,
+                       TAO_New_Leader_Generator *new_leader_generator = 0);
 
   /// Destructor
   ~TAO_Leader_Follower (void);
@@ -155,6 +158,9 @@ public:
   /// Accesor to the reactor
   ACE_Reactor *reactor (void);
 
+  /// Called when we are out of leaders.
+  void no_leaders_available (void);
+
 private:
   /// Shortcut to obtain the TSS resources of the orb core.
   TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const;
@@ -225,6 +231,10 @@ private:
   /// Condition variable for server threads waiting for the client
   /// leader to complete.
   TAO_SYNCH_CONDITION event_loop_threads_condition_;
+
+  /// Leader/Follower class uses this method to notify the system that
+  /// we are out of leaders.
+  TAO_New_Leader_Generator *new_leader_generator_;
 };
 
 class TAO_Export TAO_LF_Client_Thread_Helper
diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i
index 6bddae3f4be..cdc68d7e7bd 100644
--- a/TAO/tao/Leader_Follower.i
+++ b/TAO/tao/Leader_Follower.i
@@ -4,7 +4,8 @@
 // ****************************************************************
 
 ACE_INLINE
-TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core)
+TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core,
+                                          TAO_New_Leader_Generator *new_leader_generator)
   : orb_core_ (orb_core),
     reverse_lock_ (lock_),
     leaders_ (0),
@@ -12,7 +13,8 @@ TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core)
     reactor_ (0),
     client_thread_is_leader_ (0),
     event_loop_threads_waiting_ (0),
-    event_loop_threads_condition_ (lock_)
+    event_loop_threads_condition_ (lock_),
+    new_leader_generator_ (new_leader_generator)
 {
 }
 
@@ -28,6 +30,13 @@ TAO_Leader_Follower::follower_available (void) const
   return !this->follower_set_.empty ();
 }
 
+ACE_INLINE void
+TAO_Leader_Follower::no_leaders_available (void)
+{
+  if (this->new_leader_generator_)
+    this->new_leader_generator_->no_leaders_available ();
+}
+
 ACE_INLINE int
 TAO_Leader_Follower::elect_new_leader (void)
 {
@@ -41,6 +50,10 @@ TAO_Leader_Follower::elect_new_leader (void)
         {
           return this->elect_new_leader_i ();
         }
+      else
+        {
+          this->no_leaders_available ();
+        }
     }
   return 0;
 }
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index c8acfce06f1..c1d049c4866 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -46,6 +46,8 @@ PUB_HDRS = \
   Server_Strategy_Factory \
   Client_Strategy_Factory \
   ORB_Core \
+  Collocation_Resolver \
+  Default_Collocation_Resolver \
   ORB_Table \
   LF_Follower \
   LF_Follower_Auto_Adder \
@@ -58,7 +60,6 @@ PUB_HDRS = \
   Leader_Follower \
   Leader_Follower_Flushing_Strategy \
   Reactor_Holder \
-  Single_Reactor \
   Wait_Strategy \
   Wait_On_Read \
   Wait_On_Reactor \
@@ -193,6 +194,8 @@ ORB_CORE_FILES = \
   OctetSeqC \
   StringSeqC \
   ORB_Core \
+  Collocation_Resolver \
+  Default_Collocation_Resolver \
   Stub_Factory \
   ORB_Table \
   LF_Follower \
@@ -205,7 +208,6 @@ ORB_CORE_FILES = \
   LF_Event_Loop_Thread_Helper \
   LF_Strategy \
   LF_Strategy_Complete \
-  Reactor_Registry \
   params \
   Resource_Factory \
   Server_Strategy_Factory \
@@ -214,7 +216,6 @@ ORB_CORE_FILES = \
   TAO_Server_Request \
   Typecode_Constants \
   TypeCodeFactory_Adapter \
-  Single_Reactor \
   Wait_Strategy \
   Wait_On_Read \
   Wait_On_Reactor \
@@ -277,7 +278,9 @@ ORB_CORE_FILES = \
   LRU_Connection_Purging_Strategy \
   Policy_Set \
   Default_Endpoint_Selector_Factory \
-  POA_Extension_Initializer \
+  Thread_Lane_Resources \
+  Thread_Lane_Resources_Manager \
+  Default_Thread_Lane_Resources_Manager \
   Default_Stub_Factory
 
 DYNAMIC_ANY_FILES =
@@ -286,14 +289,8 @@ TEMPLATE_FILES = \
   Acceptor_Impl \
   Connector_Impl \
   Connector_Impl \
-  CONV_FRAMES_T \
-  GIOPS_T \
-  IOPS_T \
-  PollableS_T \
   Sequence_T \
-  TAOS_T \
-  TAO_Singleton \
-  TimeBaseS_T
+  TAO_Singleton
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
@@ -496,9 +493,9 @@ realclean:
 
 
 .obj/Pluggable.o .obj/Pluggable.so .shobj/Pluggable.o .shobj/Pluggable.so: Pluggable.cpp \
-  Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -587,111 +584,111 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -710,18 +707,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -730,9 +727,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -744,15 +741,15 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Client_Strategy_Factory.h \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Transport_Mux_Strategy.h \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i
 
 .obj/Transport.o .obj/Transport.so .shobj/Transport.o .shobj/Transport.so: Transport.cpp Transport.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -844,21 +841,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -890,12 +887,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -938,105 +935,105 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h Encodable.h Environment.h Sequence.h CDR.h \
   Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
-  params.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  TAO_Singleton.h \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
   Interceptor_List.h Interceptor_List.inl Protocols_Hooks.h ORB_Core.i \
   Client_Strategy_Factory.h Wait_Strategy.h Wait_Strategy.inl \
   Transport_Mux_Strategy.h Stub.h \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  ORB_Core.h \
-  Stub.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Stub.i \
   Sync_Strategies.h \
-  Transport.h \
-  TAOC.h \
-  TimeBaseC.h \
-  TAOC.i \
-  Sync_Strategies.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/Sync_Strategies.i \
   Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/Addr.h \
@@ -1044,20 +1041,22 @@ realclean:
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
-  Connection_Handler.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
   Pluggable_Messaging.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
   Synch_Queued_Message.h Queued_Message.h LF_Event.h LF_Event.inl \
-  Queued_Message.inl Asynch_Queued_Message.h Flushing_Strategy.h debug.h \
-  Resume_Handle.h Resume_Handle.inl
+  Queued_Message.inl Asynch_Queued_Message.h Flushing_Strategy.h \
+  Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  debug.h Resume_Handle.h Resume_Handle.inl
 
 .obj/Incoming_Message_Queue.o .obj/Incoming_Message_Queue.so .shobj/Incoming_Message_Queue.o .shobj/Incoming_Message_Queue.so: Incoming_Message_Queue.cpp \
   Incoming_Message_Queue.h \
   $(ACE_ROOT)/ace/pre.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -1066,9 +1065,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1149,89 +1148,89 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl ORB_Core.h corbafwd.h ORB.h Exception.h \
   Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
   Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -1253,11 +1252,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -1376,94 +1375,94 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   ORB.h Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h Encodable.h Environment.h Sequence.h CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -1485,11 +1484,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -1607,111 +1606,111 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Tagged_Components.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
   PolicyC.h TAO_Export.h Encodable.h Exception.h Environment.h Sequence.h \
   CDR.h Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   Profile.i Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i Stub.h \
-  Pluggable.h \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  CurrentC.h \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -1730,18 +1729,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -1750,9 +1749,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -1764,13 +1763,13 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i debug.h
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i debug.h
 
 .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \
-  Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -1859,19 +1858,19 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Endpoint.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i
 
 .obj/Connector_Registry.o .obj/Connector_Registry.so .shobj/Connector_Registry.o .shobj/Connector_Registry.so: Connector_Registry.cpp \
-  Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -1960,102 +1959,102 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  params.h \
-  CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Connector_Registry.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -2074,18 +2073,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -2094,9 +2093,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -2108,22 +2107,22 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl
 
 .obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp \
-  Connection_Handler.h \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -2166,8 +2165,8 @@ realclean:
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
-  Transport.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -2221,21 +2220,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -2266,12 +2265,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -2312,112 +2311,112 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Connection_Handler.inl \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  Server_Strategy_Factory.h \
-  Messaging_Policy_i.h \
-  Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
   Resume_Handle.h TAO_Export.h Resume_Handle.inl
 
 .obj/Acceptor_Registry.o .obj/Acceptor_Registry.so .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.so: Acceptor_Registry.cpp \
-  Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2506,110 +2505,110 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  Acceptor_Registry.i \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -2628,18 +2627,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -2648,9 +2647,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -2662,21 +2661,21 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  MProfile.h \
-  MProfile.i \
-  Acceptor_Filter.h \
-  Acceptor_Filter.i \
-  Endpoint.h \
-  Endpoint.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Acceptor_Filter.h \
+  $(TAO_ROOT)/tao/Acceptor_Filter.i \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/Protocol_Factory.o .obj/Protocol_Factory.so .shobj/Protocol_Factory.o .shobj/Protocol_Factory.so: Protocol_Factory.cpp \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2765,12 +2764,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -2781,9 +2780,9 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/Acceptor_Filter.o .obj/Acceptor_Filter.so .shobj/Acceptor_Filter.o .shobj/Acceptor_Filter.so: Acceptor_Filter.cpp \
-  Acceptor_Filter.h \
+  $(TAO_ROOT)/tao/Acceptor_Filter.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2872,17 +2871,17 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Acceptor_Filter.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Acceptor_Filter.i
 
 .obj/iiop_endpoints.o .obj/iiop_endpoints.so .shobj/iiop_endpoints.o .shobj/iiop_endpoints.so: iiop_endpoints.cpp iiop_endpoints.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2971,44 +2970,44 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
   iiop_endpoints.i
 
 .obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \
-  IIOP_Factory.h \
+  $(TAO_ROOT)/tao/IIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  Protocol_Factory.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -3097,12 +3096,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -3127,35 +3126,35 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  IIOP_Acceptor.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  IIOP_Connection_Handler.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Svc_Handler.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -3220,136 +3219,138 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Connection_Handler.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Connection_Handler.inl \
-  IIOP_Transport.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/IIOP_Transport.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i \
-  IIOPC.h \
-  IIOPC.i \
-  IIOP_Transport.i \
-  IIOP_Connection_Handler.i \
-  Acceptor_Impl.h \
-  Acceptor_Impl.i \
-  Acceptor_Impl.cpp \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/IIOP_Transport.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.h \
+  $(TAO_ROOT)/tao/Acceptor_Impl.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
-  Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Table.h \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  IIOP_Acceptor.i \
-  IIOP_Connector.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.i \
+  $(TAO_ROOT)/tao/IIOP_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Connector.i \
   $(ACE_ROOT)/ace/Connector.h \
   $(ACE_ROOT)/ace/Connector.cpp \
-  Connector_Impl.h \
-  Connector_Impl.inl \
-  Connector_Impl.cpp
+  $(TAO_ROOT)/tao/Connector_Impl.h \
+  $(TAO_ROOT)/tao/Connector_Impl.inl \
+  $(TAO_ROOT)/tao/Connector_Impl.cpp
 
 .obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.so .shobj/IIOP_Lite_Factory.o .shobj/IIOP_Lite_Factory.so: IIOP_Lite_Factory.cpp \
-  IIOP_Lite_Factory.h \
+  $(TAO_ROOT)/tao/IIOP_Lite_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  Protocol_Factory.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -3438,12 +3439,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -3468,35 +3469,35 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  IIOP_Acceptor.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  IIOP_Connection_Handler.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Svc_Handler.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -3561,130 +3562,132 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Connection_Handler.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Connection_Handler.inl \
-  IIOP_Transport.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/IIOP_Transport.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i \
-  IIOPC.h \
-  IIOPC.i \
-  IIOP_Transport.i \
-  IIOP_Connection_Handler.i \
-  Acceptor_Impl.h \
-  Acceptor_Impl.i \
-  Acceptor_Impl.cpp \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/IIOP_Transport.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.h \
+  $(TAO_ROOT)/tao/Acceptor_Impl.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
-  Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Table.h \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  IIOP_Acceptor.i \
-  IIOP_Connector.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.i \
+  $(TAO_ROOT)/tao/IIOP_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Connector.i \
   $(ACE_ROOT)/ace/Connector.h \
   $(ACE_ROOT)/ace/Connector.cpp \
-  Connector_Impl.h \
-  Connector_Impl.inl \
-  Connector_Impl.cpp \
+  $(TAO_ROOT)/tao/Connector_Impl.h \
+  $(TAO_ROOT)/tao/Connector_Impl.inl \
+  $(TAO_ROOT)/tao/Connector_Impl.cpp \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -3694,8 +3697,8 @@ realclean:
 
 .obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp IIOP_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
-  Profile.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -3784,110 +3787,110 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Tagged_Components.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IIOP_Endpoint.h \
-  Endpoint.h \
-  Endpoint.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
-  IIOP_Endpoint.i \
-  IIOP_Profile.i \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.i \
   CDR.h Environment.h ORB.h ORB_Core.h corbafwd.h Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PolicyC.h PollableC.h PollableC.i MessagingC.i \
   CurrentC.h PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -3909,11 +3912,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -3942,10 +3945,10 @@ realclean:
   ORB_Core.i debug.h iiop_endpoints.h iiop_endpoints.i
 
 .obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
-  IIOP_Transport.h \
+  $(TAO_ROOT)/tao/IIOP_Transport.h \
   $(ACE_ROOT)/ace/pre.h \
-  Transport.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -4034,21 +4037,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -4079,12 +4082,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -4125,34 +4128,34 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
   $(ACE_ROOT)/ace/SOCK.h \
@@ -4179,153 +4182,155 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Handler.cpp \
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
-  IIOPC.h \
-  IIOPC.i \
-  IIOP_Transport.i \
-  IIOP_Connection_Handler.h \
+  $(TAO_ROOT)/tao/IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/IIOP_Transport.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Acceptor.cpp \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Connection_Handler.h \
-  Connection_Handler.inl \
-  IIOP_Connection_Handler.i \
-  IIOP_Acceptor.h \
-  Pluggable.h \
-  Pluggable.i \
-  Acceptor_Impl.h \
-  Acceptor_Impl.i \
-  Acceptor_Impl.cpp \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.h \
+  $(TAO_ROOT)/tao/Acceptor_Impl.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
-  Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Table.h \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  IIOP_Acceptor.i \
-  IIOP_Profile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IIOP_Endpoint.h \
-  IIOP_Endpoint.i \
-  IIOP_Profile.i \
-  Acceptor_Registry.h \
-  Acceptor_Registry.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  target_specification.i \
-  operation_details.i \
-  Timeprobe.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
-  Transport_Mux_Strategy.h \
-  Sync_Strategies.h \
-  TAOC.h \
-  TAOC.i \
-  Sync_Strategies.i \
-  Stub.h \
-  MProfile.h \
-  MProfile.i \
-  Stub.i \
-  GIOP_Message_Base.h \
-  Pluggable_Messaging.h \
-  Pluggable_Messaging.i \
-  GIOP_Message_Generator_Parser_Impl.h \
-  GIOP_Message_Generator_Parser_11.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser.h \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl \
-  GIOP_Message_Generator_Parser_12.h \
-  GIOP_Message_Generator_Parser_12.inl \
-  GIOP_Message_Generator_Parser_Impl.inl \
-  GIOP_Utils.h \
-  GIOP_Utils.i \
-  GIOP_Message_State.h \
-  GIOP_Message_State.inl \
-  GIOP_Message_Base.i \
-  GIOP_Message_Lite.h \
-  GIOP_Message_Lite.i
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/Sync_Strategies.h \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/Sync_Strategies.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \
+  $(TAO_ROOT)/tao/GIOP_Utils.h \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Message_State.h \
+  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Lite.i
 
 .obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \
-  IIOP_Connector.h \
+  $(TAO_ROOT)/tao/IIOP_Connector.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SOCK_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -4519,183 +4524,185 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/Connector.cpp \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Connector_Impl.h \
-  Connector_Impl.inl \
-  Connector_Impl.cpp \
-  IIOP_Connection_Handler.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Connector_Impl.h \
+  $(TAO_ROOT)/tao/Connector_Impl.inl \
+  $(TAO_ROOT)/tao/Connector_Impl.cpp \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Acceptor.cpp \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Connection_Handler.h \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Connection_Handler.inl \
-  IIOP_Transport.h \
-  IIOPC.h \
-  IIOPC.i \
-  IIOP_Transport.i \
-  IIOP_Connection_Handler.i \
-  IIOP_Profile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IIOP_Endpoint.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  IIOP_Endpoint.i \
-  IIOP_Profile.i \
-  debug.h \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  Client_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/IIOP_Transport.h \
+  $(TAO_ROOT)/tao/IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/IIOP_Transport.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  Base_Transport_Property.h \
-  Base_Transport_Property.inl \
-  Invocation.h \
-  Stub.h \
-  MProfile.h \
-  MProfile.i \
-  Stub.i \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i
+  $(TAO_ROOT)/tao/Base_Transport_Property.h \
+  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 .obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
-  IIOP_Acceptor.h \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -4784,41 +4791,41 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  IIOP_Connection_Handler.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/Handle_Set.i \
@@ -4905,143 +4912,145 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Connection_Handler.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Connection_Handler.inl \
-  IIOP_Transport.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/IIOP_Transport.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i \
-  IIOPC.h \
-  IIOPC.i \
-  IIOP_Transport.i \
-  IIOP_Connection_Handler.i \
-  Acceptor_Impl.h \
-  Acceptor_Impl.i \
-  Acceptor_Impl.cpp \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/IIOP_Transport.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.h \
+  $(TAO_ROOT)/tao/Acceptor_Impl.i \
+  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
-  Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Table.h \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  IIOP_Acceptor.i \
-  IIOP_Profile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IIOP_Endpoint.h \
-  IIOP_Endpoint.i \
-  IIOP_Profile.i \
-  MProfile.h \
-  MProfile.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/IIOP_Acceptor.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
+  $(TAO_ROOT)/tao/IIOP_Profile.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/IIOP_Connection_Handler.o .obj/IIOP_Connection_Handler.so .shobj/IIOP_Connection_Handler.o .shobj/IIOP_Connection_Handler.so: IIOP_Connection_Handler.cpp \
-  IIOP_Connection_Handler.h \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
@@ -5217,148 +5226,164 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Connection_Handler.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
-  Transport.h \
-  Exception.h \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Connection_Handler.inl \
-  IIOP_Transport.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  $(TAO_ROOT)/tao/IIOP_Transport.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i \
-  IIOPC.h \
-  IIOPC.i \
-  IIOP_Transport.i \
-  IIOP_Connection_Handler.i \
-  Timeprobe.h \
-  $(ACE_ROOT)/ace/Timeprobe.h debug.h \
-  ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
-  Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  CORBA_String.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  TAO_Singleton.h \
-  TAO_Singleton_Manager.h \
-  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
-  DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/IIOP_Transport.i \
+  $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/Timeprobe.h \
+  $(ACE_ROOT)/ace/Timeprobe.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  Interceptor_List.h Interceptor_List.inl Protocols_Hooks.h ORB_Core.i \
-  Messaging_Policy_i.h \
-  MessagingC.h \
-  Messaging_Policy_i.i \
-  Server_Strategy_Factory.h IIOP_Transport.h IIOP_Endpoint.h \
-  ORB.h \
-  IIOP_Endpoint.i \
-  Transport_Cache_Manager.h Base_Transport_Property.h \
-  Base_Transport_Property.inl \
-  Resume_Handle.h Resume_Handle.inl
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/Base_Transport_Property.h \
+  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
+  $(TAO_ROOT)/tao/Resume_Handle.h \
+  $(TAO_ROOT)/tao/Resume_Handle.inl
 
 .obj/IIOP_Endpoint.o .obj/IIOP_Endpoint.so .shobj/IIOP_Endpoint.o .shobj/IIOP_Endpoint.so: IIOP_Endpoint.cpp \
-  IIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
-  Endpoint.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -5447,57 +5472,57 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Endpoint.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
-  IIOP_Endpoint.i \
-  debug.h
+  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/IIOPC.o .obj/IIOPC.so .shobj/IIOPC.o .shobj/IIOPC.so: IIOPC.cpp \
-  IIOPC.h \
+  $(TAO_ROOT)/tao/IIOPC.h \
   $(ACE_ROOT)/ace/pre.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -5506,7 +5531,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5587,42 +5612,42 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence_T.h \
-  Sequence.h \
-  Sequence.i \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  IIOPC.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/IIOPC.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i
 
 .obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
-  default_client.h \
+  $(TAO_ROOT)/tao/default_client.h \
   $(ACE_ROOT)/ace/pre.h \
-  Client_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -5664,7 +5689,7 @@ realclean:
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Signal.h \
   $(ACE_ROOT)/ace/Synch.h \
@@ -5714,9 +5739,9 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  default_client.i \
-  ORB_Core.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/default_client.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -5739,106 +5764,106 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ORB.h \
-  Exception.h \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -5847,9 +5872,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -5861,21 +5886,21 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Wait_On_Read.h \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  Wait_On_Reactor.h \
-  Wait_On_Leader_Follower.h \
-  Exclusive_TMS.h \
-  Transport_Mux_Strategy.h \
-  Muxed_TMS.h
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Wait_On_Read.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Wait_On_Reactor.h \
+  $(TAO_ROOT)/tao/Wait_On_Leader_Follower.h \
+  $(TAO_ROOT)/tao/Exclusive_TMS.h \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/Muxed_TMS.h
 
 .obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
-  default_server.h \
+  $(TAO_ROOT)/tao/default_server.h \
   $(ACE_ROOT)/ace/pre.h \
-  Server_Strategy_Factory.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -5964,12 +5989,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -5994,103 +6019,103 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  default_server.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/default_server.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -6099,9 +6124,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -6113,12 +6138,12 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \
-  default_resource.h \
+  $(TAO_ROOT)/tao/default_resource.h \
   $(ACE_ROOT)/ace/pre.h \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -6160,9 +6185,9 @@ realclean:
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  TAO_Export.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -6214,40 +6239,40 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -6266,74 +6291,74 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  default_resource.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/default_resource.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -6342,9 +6367,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -6356,37 +6381,34 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  IIOP_Factory.h \
-  Acceptor_Registry.h \
-  Acceptor_Registry.i \
-  Connector_Registry.h \
-  Connector_Registry.i \
-  Single_Reactor.h \
-  Reactor_Registry.h \
-  Reactor_Registry.i \
-  Single_Reactor.i \
-  Reactive_Flushing_Strategy.h \
-  Flushing_Strategy.h \
-  Block_Flushing_Strategy.h \
-  Leader_Follower_Flushing_Strategy.h \
-  Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/IIOP_Factory.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Reactive_Flushing_Strategy.h \
+  $(TAO_ROOT)/tao/Flushing_Strategy.h \
+  $(TAO_ROOT)/tao/Block_Flushing_Strategy.h \
+  $(TAO_ROOT)/tao/Leader_Follower_Flushing_Strategy.h \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  LRU_Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  LF_Strategy_Complete.h \
-  LF_Strategy.h \
-  LF_Strategy.inl \
-  LF_Strategy_Complete.inl \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/LRU_Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/LF_Strategy_Complete.h \
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl \
+  $(TAO_ROOT)/tao/LF_Strategy_Complete.inl \
   $(ACE_ROOT)/ace/TP_Reactor.h \
   $(ACE_ROOT)/ace/Select_Reactor.h \
   $(ACE_ROOT)/ace/Select_Reactor_T.h \
@@ -6412,10 +6434,10 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/xt_resource.o .obj/xt_resource.so .shobj/xt_resource.o .shobj/xt_resource.so: xt_resource.cpp \
-  xt_resource.h \
+  $(TAO_ROOT)/tao/xt_resource.h \
   $(ACE_ROOT)/ace/pre.h \
-  default_resource.h \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -6457,9 +6479,9 @@ realclean:
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  TAO_Export.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -6511,40 +6533,40 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -6563,13 +6585,13 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  default_resource.i
+  $(TAO_ROOT)/tao/default_resource.i
 
 .obj/qt_resource.o .obj/qt_resource.so .shobj/qt_resource.o .shobj/qt_resource.so: qt_resource.cpp \
-  qt_resource.h \
+  $(TAO_ROOT)/tao/qt_resource.h \
   $(ACE_ROOT)/ace/pre.h \
-  default_resource.h \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -6611,9 +6633,9 @@ realclean:
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  TAO_Export.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -6665,40 +6687,40 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -6717,12 +6739,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  default_resource.i
+  $(TAO_ROOT)/tao/default_resource.i
 
 .obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
-  Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -6811,60 +6833,60 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Principal.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  OctetSeqC.i \
-  Principal.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Marshal.i \
-  debug.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
-  Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -6953,59 +6975,59 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Principal.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  OctetSeqC.i \
-  Principal.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Marshal.i
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Marshal.i
 
 .obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
-  Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -7094,60 +7116,60 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Principal.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  OctetSeqC.i \
-  Principal.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Marshal.i \
-  debug.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/Managed_Types.o .obj/Managed_Types.so .shobj/Managed_Types.o .shobj/Managed_Types.so: Managed_Types.cpp \
-  Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -7236,50 +7258,50 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Managed_Types.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i
 
 .obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
-  Any.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/pre.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -7368,106 +7390,106 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Marshal.h \
-  Principal.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  OctetSeqC.i \
-  Principal.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Marshal.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  IOPC.h \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -7486,18 +7508,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -7506,9 +7528,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -7520,12 +7542,12 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/CORBA_String.o .obj/CORBA_String.so .shobj/CORBA_String.o .shobj/CORBA_String.so: CORBA_String.cpp \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -7614,19 +7636,19 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  CORBA_String.inl
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/CORBA_String.inl
 
 .obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \
-  CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
   $(ACE_ROOT)/ace/pre.h \
-  Object.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -7715,25 +7737,25 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  CurrentC.i \
-  Sequence_T.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i
 
 .obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
   $(ACE_ROOT)/ace/streams.h \
@@ -7764,8 +7786,8 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -7831,101 +7853,101 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.h \
-  Typecode.i \
-  Environment.h \
-  Environment.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  IOPC.h \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -7944,18 +7966,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -7964,9 +7986,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -7978,13 +8000,13 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Dynamic_Adapter.h
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Dynamic_Adapter.h
 
 .obj/WrongTransactionC.o .obj/WrongTransactionC.so .shobj/WrongTransactionC.o .shobj/WrongTransactionC.so: WrongTransactionC.cpp \
-  WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -8008,7 +8030,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -8074,26 +8096,26 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Environment.h \
-  Environment.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i
+  $(TAO_ROOT)/tao/CDR.i
 
 .obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \
-  Environment.h \
+  $(TAO_ROOT)/tao/Environment.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -8182,101 +8204,101 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Environment.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -8295,18 +8317,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -8315,9 +8337,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -8329,12 +8351,12 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \
-  Object.h \
+  $(TAO_ROOT)/tao/Object.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -8423,112 +8445,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -8547,18 +8569,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -8567,9 +8589,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -8581,32 +8603,32 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  Connector_Registry.h \
-  Connector_Registry.i \
-  Remote_Object_Proxy_Broker.h \
-  Dynamic_Adapter.h \
-  IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Connector_Registry.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Dynamic_Adapter.h \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -8614,7 +8636,7 @@ realclean:
 
 .obj/LocalObject.o .obj/LocalObject.so .shobj/LocalObject.o .shobj/LocalObject.so: LocalObject.cpp LocalObject.h \
   $(ACE_ROOT)/ace/pre.h Object.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -8703,42 +8725,42 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
   LocalObject.i PolicyC.h TAO_Export.h Encodable.h Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
+  $(TAO_ROOT)/tao/Environment.i \
   Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
   CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h CurrentC.h \
-  Object.h \
-  CurrentC.i \
-  PolicyC.i
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i
 
 .obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp \
-  ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -8827,50 +8849,50 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  ObjectIDList.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Any.h \
-  Any.i
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i
 
 .obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -8962,54 +8984,54 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   ORB_Table.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -9040,88 +9062,88 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  ORB_Table.inl \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
   Connector_Registry.h \
-  Pluggable.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  params.h \
-  CORBA_String.h \
-  params.i \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
   IOR_Parser.h \
-  IOR_Parser.i \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Object.h Typecode.h Stub.h \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  CurrentC.h \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -9133,19 +9155,19 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
   ORB_Core.h Server_Strategy_Factory.h debug.h TAO_Internal.h NVList.h \
-  NVList.i \
+  $(TAO_ROOT)/tao/NVList.i \
   Dynamic_Adapter.h MProfile.h ORBInitInfo.h PortableInterceptorC.h \
   LocalObject.h StringSeqC.h StringSeqC.i ORBInitInfo.inl \
   ORBInitializer_Registry.h TAO_Singleton.h \
-  ORBInitializer_Registry.inl \
+  $(TAO_ROOT)/tao/ORBInitializer_Registry.inl \
   CodecFactory_ORBInitializer.h IOPC.h TypeCodeFactory_Adapter.h \
   Messaging_ORBInitializer.h ValueFactory_Map.h \
-  ValueFactory_Map.i \
+  $(TAO_ROOT)/tao/ValueFactory_Map.i \
   Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -9179,7 +9201,7 @@ realclean:
   $(ACE_ROOT)/ace/Arg_Shifter.h
 
 .obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -9269,12 +9291,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
@@ -9287,7 +9309,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   Encodable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9368,117 +9390,117 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
+  $(TAO_ROOT)/tao/Environment.i \
   Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
   CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  Stub.h \
-  Pluggable.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  CurrentC.h \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -9497,18 +9519,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -9517,9 +9539,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -9531,40 +9553,40 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  PortableInterceptor.h \
-  RequestInfo_Util.h \
-  ClientRequestInfo.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  ClientRequestInfo.inl \
-  ClientInterceptorAdapter.h \
-  ClientInterceptorAdapter.inl
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/Encodable.o .obj/Encodable.so .shobj/Encodable.o .shobj/Encodable.so: Encodable.cpp \
-  Encodable.h \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -9653,17 +9675,17 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/Abstract_Servant_Base.o .obj/Abstract_Servant_Base.so .shobj/Abstract_Servant_Base.o .shobj/Abstract_Servant_Base.so: Abstract_Servant_Base.cpp \
-  Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -9752,17 +9774,17 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/Object_Proxy_Broker.o .obj/Object_Proxy_Broker.so .shobj/Object_Proxy_Broker.o .shobj/Object_Proxy_Broker.so: Object_Proxy_Broker.cpp \
-  Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -9851,18 +9873,18 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Impl.h
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h
 
 .obj/Remote_Object_Proxy_Broker.o .obj/Remote_Object_Proxy_Broker.so .shobj/Remote_Object_Proxy_Broker.o .shobj/Remote_Object_Proxy_Broker.so: Remote_Object_Proxy_Broker.cpp \
-  Remote_Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Broker.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -9951,20 +9973,20 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Remote_Object_Proxy_Impl.h
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h
 
 .obj/Object_Proxy_Impl.o .obj/Object_Proxy_Impl.so .shobj/Object_Proxy_Impl.o .shobj/Object_Proxy_Impl.so: Object_Proxy_Impl.cpp \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -10053,17 +10075,17 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/Remote_Object_Proxy_Impl.o .obj/Remote_Object_Proxy_Impl.so .shobj/Remote_Object_Proxy_Impl.o .shobj/Remote_Object_Proxy_Impl.so: Remote_Object_Proxy_Impl.cpp \
-  Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -10152,112 +10174,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Impl.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.h \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10276,18 +10298,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -10296,9 +10318,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -10310,28 +10332,28 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -10339,7 +10361,7 @@ realclean:
 
 .obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -10428,118 +10450,118 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   PolicyC.h TAO_Export.h Encodable.h Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
+  $(TAO_ROOT)/tao/Environment.i \
   Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
   CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   DomainC.i \
-  Stub.h \
-  Pluggable.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  CurrentC.h \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10558,18 +10580,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -10578,9 +10600,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -10592,36 +10614,36 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  PortableInterceptor.h \
-  RequestInfo_Util.h \
-  ClientRequestInfo.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  ClientRequestInfo.inl \
-  ClientInterceptorAdapter.h \
-  ClientInterceptorAdapter.inl \
-  IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -10629,7 +10651,7 @@ realclean:
 
 .obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -10718,114 +10740,114 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Any.h \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
   TAO_Export.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i \
-  Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.h \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10844,18 +10866,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -10864,9 +10886,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -10878,33 +10900,33 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  RequestInfo_Util.h
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h
 
 .obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
-  Principal.h \
+  $(TAO_ROOT)/tao/Principal.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -10993,33 +11015,33 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  OctetSeqC.i \
-  Principal.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i
+  $(TAO_ROOT)/tao/CDR.i
 
 .obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
-  Sequence.h \
+  $(TAO_ROOT)/tao/Sequence.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -11108,23 +11130,23 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i
 
 .obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
-  MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -11179,7 +11201,7 @@ realclean:
   $(ACE_ROOT)/ace/Log_Record.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Log_Record.i \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -11215,60 +11237,60 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Profile.h \
-  Tagged_Components.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  Pluggable.h \
-  Pluggable.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i
 
 .obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -11357,114 +11379,114 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Endpoint.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i \
   Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -11483,18 +11505,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -11503,9 +11525,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -11517,35 +11539,35 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
   Sequence.h Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
   TAOC.h TAOC.i operation_details.h corbafwd.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i \
   Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   Invocation.i Asynch_Invocation.h \
-  Invocation.h \
-  Asynch_Reply_Dispatcher.h \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -11567,28 +11589,28 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Asynch_Timeout_Handler.h \
-  Messaging.h \
-  Asynch_Reply_Dispatcher.i \
-  Asynch_Invocation.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \
+  $(TAO_ROOT)/tao/Messaging.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Asynch_Invocation.i \
   ORB_Core.h Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \
-  TAOC.h \
-  Sync_Strategies.i \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Sync_Strategies.i \
   Buffering_Constraint_Policy.h \
-  Buffering_Constraint_Policy.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i \
   Messaging_Policy_i.h \
-  Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
   debug.h $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \
-  Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -11643,8 +11665,8 @@ realclean:
   $(ACE_ROOT)/ace/Log_Record.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Log_Record.i \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -11680,59 +11702,59 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Environment.h \
-  Environment.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  Principal.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  OctetSeqC.i \
-  Principal.i \
-  Marshal.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Marshal.i \
-  debug.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
-  CDR.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -11821,101 +11843,101 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -11934,18 +11956,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -11954,9 +11976,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -11968,12 +11990,12 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \
-  ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -12062,16 +12084,16 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  ValueFactory.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ValueFactory.i
 
 .obj/ValueFactory_Map.o .obj/ValueFactory_Map.so .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.so: ValueFactory_Map.cpp \
-  ValueFactory_Map.h \
+  $(TAO_ROOT)/tao/ValueFactory_Map.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/OS.h \
@@ -12187,19 +12209,19 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Memory_Pool.i \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Export.h \
-  orbconf.h \
-  TAO_Singleton_Manager.inl \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
@@ -12207,47 +12229,47 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ValueFactory_Map.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  ORB.h \
-  Exception.h \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ValueFactory_Map.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i
 
 .obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
-  Timeprobe.h \
+  $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -12273,8 +12295,8 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -12340,101 +12362,101 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -12453,18 +12475,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -12473,9 +12495,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -12487,10 +12509,10 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
-  Client_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -12533,12 +12555,12 @@ realclean:
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  TAO_Export.h
+  $(TAO_ROOT)/tao/TAO_Export.h
 
 .obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
-  debug.h \
+  $(TAO_ROOT)/tao/debug.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -12627,17 +12649,17 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
-  Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -12726,28 +12748,28 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Object_KeyC.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i
 
 .obj/Protocols_Hooks.o .obj/Protocols_Hooks.so .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.so: Protocols_Hooks.cpp Protocols_Hooks.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -12839,12 +12861,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -12946,12 +12968,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -12976,33 +12998,33 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Default_Protocols_Hooks.i \
+  $(TAO_ROOT)/tao/Default_Protocols_Hooks.i \
   PolicyC.h TAO_Export.h Encodable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   Exception.h \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
+  $(TAO_ROOT)/tao/Environment.i \
   Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
   CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -13010,7 +13032,7 @@ realclean:
 
 .obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp Invocation.h \
   $(ACE_ROOT)/ace/pre.h CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -13099,112 +13121,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -13223,18 +13245,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -13243,9 +13265,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -13257,37 +13279,37 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i Any.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i Any.h \
   Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
   TAOC.h TAOC.i operation_details.h corbafwd.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i \
   Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   Invocation.i Principal.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  Principal.i \
+  $(TAO_ROOT)/tao/Principal.i \
   Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
   Dynamic_Adapter.h Object_KeyC.h debug.h Transport.h Exception.h \
   Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -13311,20 +13333,20 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl Pluggable.h \
   Connector_Registry.h \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
   Wait_Strategy.h Wait_Strategy.inl Transport_Mux_Strategy.h \
   Bind_Dispatcher_Guard.h \
-  Bind_Dispatcher_Guard.i \
-  Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/Bind_Dispatcher_Guard.i \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
   Endpoint.h Base_Transport_Property.h \
-  Base_Transport_Property.inl \
+  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
   Messaging_Policy_i.h \
-  Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
   GIOP_Utils.h \
-  GIOP_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
   ORB_Core.h Endpoint_Selector_Factory.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
@@ -13332,9 +13354,9 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/Invocation_Endpoint_Selectors.o .obj/Invocation_Endpoint_Selectors.so .shobj/Invocation_Endpoint_Selectors.o .shobj/Invocation_Endpoint_Selectors.so: Invocation_Endpoint_Selectors.cpp \
-  Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -13423,115 +13445,115 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.h \
-  Stub.h \
-  Pluggable.h \
-  Pluggable.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -13550,18 +13572,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -13570,9 +13592,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -13584,37 +13606,37 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation.i \
-  Endpoint.h \
-  Endpoint.i \
-  Base_Transport_Property.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  Base_Transport_Property.inl
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Base_Transport_Property.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Base_Transport_Property.inl
 
 .obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \
-  Asynch_Invocation.h \
+  $(TAO_ROOT)/tao/Asynch_Invocation.h \
   $(ACE_ROOT)/ace/pre.h \
-  Invocation.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -13703,112 +13725,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -13827,18 +13849,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -13847,9 +13869,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -13861,39 +13883,39 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  Asynch_Reply_Dispatcher.h \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -13915,23 +13937,23 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Asynch_Timeout_Handler.h \
-  Messaging.h \
-  Asynch_Reply_Dispatcher.i \
-  Asynch_Invocation.i \
-  Timeprobe.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \
+  $(TAO_ROOT)/tao/Messaging.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Asynch_Invocation.i \
+  $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
-  Transport_Mux_Strategy.h
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
 .obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \
-  operation_details.h \
+  $(TAO_ROOT)/tao/operation_details.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -14020,46 +14042,46 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Service_Context.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i
 
 .obj/ClientRequestInfo.o .obj/ClientRequestInfo.so .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.so: ClientRequestInfo.cpp ClientRequestInfo.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -14151,107 +14173,107 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   PortableInterceptorC.h DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   LocalObject.h LocalObject.i StringSeqC.h StringSeqC.i Service_Context.h \
-  IOPC.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   ClientRequestInfo.inl Invocation.h Stub.h \
-  Pluggable.h \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -14270,18 +14292,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -14290,9 +14312,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -14304,21 +14326,21 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
   Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
   TAOC.h \
-  TimeBaseC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
   TAOC.i operation_details.h target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i \
   Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   Invocation.i Tagged_Components.h debug.h
 
 .obj/RequestInfo_Util.o .obj/RequestInfo_Util.so .shobj/RequestInfo_Util.o .shobj/RequestInfo_Util.so: RequestInfo_Util.cpp RequestInfo_Util.h \
@@ -14411,39 +14433,39 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i Any.h StringSeqC.h Sequence.h StringSeqC.i
 
 .obj/ClientInterceptorAdapter.o .obj/ClientInterceptorAdapter.so .shobj/ClientInterceptorAdapter.o .shobj/ClientInterceptorAdapter.so: ClientInterceptorAdapter.cpp \
@@ -14537,111 +14559,111 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   ClientRequestInfo.h PortableInterceptorC.h DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   LocalObject.h LocalObject.i StringSeqC.h StringSeqC.i Service_Context.h \
-  IOPC.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   ClientRequestInfo.inl Interceptor_List.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Interceptor_List.inl ClientInterceptorAdapter.inl Invocation.h Stub.h \
-  Pluggable.h \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -14660,15 +14682,15 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -14677,8 +14699,8 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -14690,21 +14712,21 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
   Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
   TAOC.h \
-  TimeBaseC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
   TAOC.i operation_details.h target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i \
   Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   Invocation.i
 
 .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp PortableInterceptorC.h \
@@ -14797,68 +14819,68 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   CORBA_String.h \
-  CORBA_String.inl
+  $(TAO_ROOT)/tao/CORBA_String.inl
 
 .obj/DynamicC.o .obj/DynamicC.so .shobj/DynamicC.o .shobj/DynamicC.so: DynamicC.cpp DynamicC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -14947,40 +14969,40 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i \
-  StringSeqC.h \
-  StringSeqC.i
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i
 
 .obj/OctetSeqC.o .obj/OctetSeqC.so .shobj/OctetSeqC.o .shobj/OctetSeqC.so: OctetSeqC.cpp OctetSeqC.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -15072,94 +15094,94 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Sequence.h \
-  corbafwd.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
   OctetSeqC.i Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i CDR.h \
   Typecode.h ORB_Core.h ORB.h Exception.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h \
   Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  IOPC.h \
-  Any.h \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -15181,11 +15203,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -15303,39 +15325,39 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  corbafwd.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
   StringSeqC.i Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i CDR.h \
   Typecode.h
 
 .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \
@@ -15428,94 +15450,94 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   ORB.h Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -15537,11 +15559,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -15568,62 +15590,60 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i ORB_Table.h \
-  ORB_Table.inl \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
   TAO_Internal.h default_client.h \
-  Client_Strategy_Factory.h \
-  default_client.i \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/default_client.i \
   default_server.h \
-  Server_Strategy_Factory.h \
-  default_server.i \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/default_server.i \
   default_resource.h \
-  Resource_Factory.h \
-  default_resource.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/default_resource.i \
   debug.h MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
   Stub.h \
-  MProfile.h \
-  ORB.h \
-  ORB_Core.h \
-  Stub.i \
-  Reactor_Registry.h \
-  Reactor_Registry.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Stub.i \
   Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
   Connector_Registry.h \
-  params.h \
-  Connector_Registry.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i \
   Acceptor_Registry.h \
-  Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
   Sync_Strategies.h \
-  Transport.h \
-  Transport_Cache_Manager.h \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -15645,43 +15665,45 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  TAOC.h \
-  TimeBaseC.h \
-  TAOC.i \
-  Sync_Strategies.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/Sync_Strategies.i \
   Object_Loader.h Object_Loader.i ObjectIDList.h \
-  ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
   Services_Activate.h Invocation.h Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
   TAOC.h operation_details.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i \
   Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i BiDir_Adapter.h Default_Stub_Factory.h \
-  Stub_Factory.h \
-  Default_Endpoint_Selector_Factory.h \
-  Endpoint_Selector_Factory.h \
-  Default_Protocols_Hooks.h \
-  Default_Protocols_Hooks.i \
-  IORInfo.h LocalObject.h Flushing_Strategy.h POA_Extension_Initializer.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  Invocation.i BiDir_Adapter.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/Collocation_Resolver.i \
+  $(TAO_ROOT)/tao/Stub_Factory.h \
+  IORInfo.h LocalObject.h Flushing_Strategy.h \
   Buffering_Constraint_Policy.h \
-  Buffering_Constraint_Policy.i \
-  LF_Event_Loop_Thread_Helper.h \
-  LF_Strategy.h \
-  LF_Strategy.inl \
-  LF_Event_Loop_Thread_Helper.inl \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i \
+  $(TAO_ROOT)/tao/LF_Event_Loop_Thread_Helper.h \
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl \
+  $(TAO_ROOT)/tao/LF_Event_Loop_Thread_Helper.inl \
   $(ACE_ROOT)/ace/Env_Value_T.h \
   $(ACE_ROOT)/ace/Env_Value_T.i \
   $(ACE_ROOT)/ace/Env_Value_T.cpp \
@@ -15691,9 +15713,247 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h
 
+.obj/Collocation_Resolver.o .obj/Collocation_Resolver.so .shobj/Collocation_Resolver.o .shobj/Collocation_Resolver.so: Collocation_Resolver.cpp \
+  $(TAO_ROOT)/tao/Collocation_Resolver.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Collocation_Resolver.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/Default_Collocation_Resolver.o .obj/Default_Collocation_Resolver.so .shobj/Default_Collocation_Resolver.o .shobj/Default_Collocation_Resolver.so: Default_Collocation_Resolver.cpp \
+  $(TAO_ROOT)/tao/Default_Collocation_Resolver.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Collocation_Resolver.i \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Default_Collocation_Resolver.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i
+
 .obj/Stub_Factory.o .obj/Stub_Factory.so .shobj/Stub_Factory.o .shobj/Stub_Factory.so: Stub_Factory.cpp Stub_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -15782,12 +16042,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -15799,7 +16059,7 @@ realclean:
 
 .obj/ORB_Table.o .obj/ORB_Table.so .shobj/ORB_Table.o .shobj/ORB_Table.so: ORB_Table.cpp ORB_Table.h \
   $(ACE_ROOT)/ace/pre.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -15808,7 +16068,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -15824,7 +16084,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -15855,15 +16115,15 @@ realclean:
   $(ACE_ROOT)/ace/Log_Record.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Log_Record.i \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -15924,7 +16184,7 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Memory_Pool.i \
-  ORB_Table.inl \
+  $(TAO_ROOT)/tao/ORB_Table.inl \
   ORB_Core.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -15933,83 +16193,83 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   ORB.h Exception.h \
-  corbafwd.h \
-  Exception.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
   Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
-  params.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
   PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \
   MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -16030,9 +16290,9 @@ realclean:
   ORB_Core.i
 
 .obj/LF_Follower.o .obj/LF_Follower.so .shobj/LF_Follower.o .shobj/LF_Follower.so: LF_Follower.cpp \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -16056,7 +16316,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -16090,10 +16350,10 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  Leader_Follower.h \
-  ORB_Core.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -16129,99 +16389,99 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16240,18 +16500,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -16260,9 +16520,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -16274,16 +16534,17 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i
+  $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/LF_Follower_Auto_Ptr.o .obj/LF_Follower_Auto_Ptr.so .shobj/LF_Follower_Auto_Ptr.o .shobj/LF_Follower_Auto_Ptr.so: LF_Follower_Auto_Ptr.cpp \
-  LF_Follower_Auto_Ptr.h \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Ptr.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -16307,9 +16568,9 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  Leader_Follower.h \
-  LF_Follower.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -16343,9 +16604,9 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  ORB_Core.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -16381,99 +16642,99 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16492,18 +16753,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -16512,9 +16773,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -16526,17 +16787,18 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  LF_Follower_Auto_Ptr.inl
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Ptr.inl
 
 .obj/LF_Follower_Auto_Adder.o .obj/LF_Follower_Auto_Adder.so .shobj/LF_Follower_Auto_Adder.o .shobj/LF_Follower_Auto_Adder.so: LF_Follower_Auto_Adder.cpp \
-  LF_Follower_Auto_Adder.h \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Adder.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -16560,9 +16822,9 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  Leader_Follower.h \
-  LF_Follower.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -16596,9 +16858,9 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  ORB_Core.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -16634,99 +16896,99 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16745,18 +17007,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -16765,9 +17027,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -16779,18 +17041,19 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  LF_Follower_Auto_Adder.inl
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Adder.inl
 
 .obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \
-  Leader_Follower.h \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
   $(ACE_ROOT)/ace/pre.h \
-  LF_Follower.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -16814,7 +17077,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -16848,9 +17111,9 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  ORB_Core.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -16886,99 +17149,99 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16997,18 +17260,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -17017,9 +17280,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -17031,31 +17294,32 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  LF_Follower_Auto_Ptr.h \
-  LF_Follower_Auto_Ptr.inl \
-  LF_Follower_Auto_Adder.h \
-  LF_Follower_Auto_Adder.inl \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Event_Binder.h \
-  LF_Event_Binder.inl \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Ptr.h \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Ptr.inl \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Adder.h \
+  $(TAO_ROOT)/tao/LF_Follower_Auto_Adder.inl \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/LF_Event_Binder.h \
+  $(TAO_ROOT)/tao/LF_Event_Binder.inl \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -17077,18 +17341,18 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl
 
 .obj/Leader_Follower_Flushing_Strategy.o .obj/Leader_Follower_Flushing_Strategy.so .shobj/Leader_Follower_Flushing_Strategy.o .shobj/Leader_Follower_Flushing_Strategy.so:  \
  Leader_Follower_Flushing_Strategy.cpp \
-  Leader_Follower_Flushing_Strategy.h \
+  $(TAO_ROOT)/tao/Leader_Follower_Flushing_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  Flushing_Strategy.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Flushing_Strategy.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -17177,108 +17441,108 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -17297,18 +17561,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -17317,9 +17581,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -17331,23 +17595,24 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -17369,20 +17634,20 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Queued_Message.h \
-  LF_Event.h \
-  LF_Event.inl \
-  Queued_Message.inl
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Queued_Message.h \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/Queued_Message.inl
 
 .obj/LF_Event.o .obj/LF_Event.so .shobj/LF_Event.o .shobj/LF_Event.so: LF_Event.cpp \
-  LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -17471,109 +17736,109 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  LF_Event.inl \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  Leader_Follower.h \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -17592,18 +17857,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -17612,9 +17877,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -17626,17 +17891,18 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i
+  $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/LF_Event_Binder.o .obj/LF_Event_Binder.so .shobj/LF_Event_Binder.o .shobj/LF_Event_Binder.so: LF_Event_Binder.cpp \
-  LF_Event_Binder.h \
+  $(TAO_ROOT)/tao/LF_Event_Binder.h \
   $(ACE_ROOT)/ace/pre.h \
-  LF_Event.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -17725,19 +17991,19 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  LF_Event.inl \
-  LF_Event_Binder.inl
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/LF_Event_Binder.inl
 
 .obj/LF_Event_Loop_Thread_Helper.o .obj/LF_Event_Loop_Thread_Helper.so .shobj/LF_Event_Loop_Thread_Helper.o .shobj/LF_Event_Loop_Thread_Helper.so: LF_Event_Loop_Thread_Helper.cpp \
-  LF_Event_Loop_Thread_Helper.h \
+  $(TAO_ROOT)/tao/LF_Event_Loop_Thread_Helper.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -17761,15 +18027,15 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  LF_Strategy.h \
-  TAO_Export.h \
-  LF_Strategy.inl \
-  LF_Event_Loop_Thread_Helper.inl
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl \
+  $(TAO_ROOT)/tao/LF_Event_Loop_Thread_Helper.inl
 
 .obj/LF_Strategy.o .obj/LF_Strategy.so .shobj/LF_Strategy.o .shobj/LF_Strategy.so: LF_Strategy.cpp \
-  LF_Strategy.h \
+  $(TAO_ROOT)/tao/LF_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -17793,14 +18059,14 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  TAO_Export.h \
-  LF_Strategy.inl
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl
 
 .obj/LF_Strategy_Complete.o .obj/LF_Strategy_Complete.so .shobj/LF_Strategy_Complete.o .shobj/LF_Strategy_Complete.so: LF_Strategy_Complete.cpp \
-  LF_Strategy_Complete.h \
+  $(TAO_ROOT)/tao/LF_Strategy_Complete.h \
   $(ACE_ROOT)/ace/pre.h \
-  LF_Strategy.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -17824,11 +18090,11 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  TAO_Export.h \
-  LF_Strategy.inl \
-  LF_Strategy_Complete.inl \
-  Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl \
+  $(TAO_ROOT)/tao/LF_Strategy_Complete.inl \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -17862,9 +18128,9 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  ORB_Core.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -17900,99 +18166,99 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -18011,18 +18277,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -18031,9 +18297,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -18045,271 +18311,17 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i
-
-.obj/Reactor_Registry.o .obj/Reactor_Registry.so .shobj/Reactor_Registry.o .shobj/Reactor_Registry.so: Reactor_Registry.cpp \
-  Reactor_Registry.h \
-  $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/svc_export.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Record.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Log_Record.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Reactor_Registry.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Leader_Follower.h \
-  LF_Follower.h \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  $(ACE_ROOT)/ace/Intrusive_List.h \
-  $(ACE_ROOT)/ace/Intrusive_List.inl \
-  $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  LF_Strategy.h \
-  LF_Strategy.inl
+  $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \
-  params.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -18398,20 +18410,20 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i
+  $(TAO_ROOT)/tao/params.i
 
 .obj/Resource_Factory.o .obj/Resource_Factory.so .shobj/Resource_Factory.o .shobj/Resource_Factory.so: Resource_Factory.cpp \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
@@ -18445,7 +18457,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -18464,9 +18476,9 @@ realclean:
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  TAO_Export.h \
-  Pluggable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -18518,95 +18530,95 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  params.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -18625,18 +18637,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -18645,9 +18657,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -18659,13 +18671,13 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Client_Strategy_Factory.h
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h
 
 .obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
-  Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -18754,21 +18766,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i
 
 .obj/Sync_Strategies.o .obj/Sync_Strategies.so .shobj/Sync_Strategies.o .shobj/Sync_Strategies.so: Sync_Strategies.cpp \
-  Sync_Strategies.h \
+  $(TAO_ROOT)/tao/Sync_Strategies.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -18857,22 +18869,22 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Transport.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -18903,12 +18915,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -18949,118 +18961,118 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  TAOC.h \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  TAOC.i \
-  Sync_Strategies.i \
-  Buffering_Constraint_Policy.h \
-  LocalObject.h \
-  LocalObject.i \
-  Buffering_Constraint_Policy.i \
-  Stub.h \
-  Pluggable.h \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/Sync_Strategies.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i \
-  Stub.i
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i
 
 .obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
@@ -19165,8 +19177,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
   TAO_Internal.h TAO_Export.h default_server.h \
-  Server_Strategy_Factory.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -19189,112 +19201,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  default_server.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/default_server.i \
   default_client.h \
-  Client_Strategy_Factory.h \
-  default_client.i \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/default_client.i \
   default_resource.h \
-  Resource_Factory.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  default_resource.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/default_resource.i \
   IIOP_Factory.h MCAST_Parser.h \
-  IOR_Parser.h \
-  IOR_Parser.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -19303,9 +19315,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -19317,7 +19329,7 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
   MCAST_Parser.i CORBANAME_Parser.h CORBANAME_Parser.i CORBALOC_Parser.h \
   CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i DLL_Parser.h DLL_Parser.i \
   StringSeqC.h corbafwd.h Sequence.h StringSeqC.i Object_Loader.h \
@@ -19327,11 +19339,19 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
   Default_Stub_Factory.h \
-  Stub_Factory.h \
+  $(TAO_ROOT)/tao/Stub_Factory.h \
   Default_Endpoint_Selector_Factory.h \
-  Endpoint_Selector_Factory.h \
+  $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
   Default_Protocols_Hooks.h Protocols_Hooks.h \
-  Default_Protocols_Hooks.i
+  $(TAO_ROOT)/tao/Default_Protocols_Hooks.i \
+  Default_Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/Default_Thread_Lane_Resources_Manager.i \
+  Default_Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/Collocation_Resolver.i \
+  $(TAO_ROOT)/tao/Default_Collocation_Resolver.i
 
 .obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp TAO_Server_Request.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -19423,102 +19443,102 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
   Tagged_Profile.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i \
-  Tagged_Profile.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
   OctetSeqC.h Sequence.h OctetSeqC.i Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   Object.h TAO_Server_Request.i CDR.h Environment.h Principal.h \
-  Principal.i \
+  $(TAO_ROOT)/tao/Principal.i \
   ORB_Core.h ORB.h Exception.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Remote_Object_Proxy_Impl.h \
   CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -19540,11 +19560,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -19573,23 +19593,23 @@ realclean:
   ORB_Core.i Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h debug.h \
   Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Pluggable_Messaging.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
   GIOP_Utils.h \
-  GIOP_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
   Transport.h Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -19615,7 +19635,7 @@ realclean:
   Incoming_Message_Queue.h Incoming_Message_Queue.inl Transport.inl
 
 .obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
-  Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -19670,8 +19690,8 @@ realclean:
   $(ACE_ROOT)/ace/Log_Record.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Log_Record.i \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -19707,67 +19727,67 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  DomainC.h \
-  DomainC.i \
-  WrongTransactionC.h \
-  NVList.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  Any.h \
-  Any.i \
-  NVList.i \
-  BoundsC.h \
-  BoundsC.i \
-  PollableC.h \
-  PollableC.i
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i
 
 .obj/TypeCodeFactory_Adapter.o .obj/TypeCodeFactory_Adapter.so .shobj/TypeCodeFactory_Adapter.o .shobj/TypeCodeFactory_Adapter.so: TypeCodeFactory_Adapter.cpp \
-  TypeCodeFactory_Adapter.h \
+  $(TAO_ROOT)/tao/TypeCodeFactory_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -19856,285 +19876,30 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Typecode.h \
-  Typecode.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Single_Reactor.o .obj/Single_Reactor.so .shobj/Single_Reactor.o .shobj/Single_Reactor.so: Single_Reactor.cpp \
-  Single_Reactor.h \
-  $(ACE_ROOT)/ace/pre.h \
-  Reactor_Registry.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/svc_export.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Record.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Log_Record.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Reactor_Registry.i \
-  Single_Reactor.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Leader_Follower.h \
-  LF_Follower.h \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  $(ACE_ROOT)/ace/Intrusive_List.h \
-  $(ACE_ROOT)/ace/Intrusive_List.inl \
-  $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i
-
 .obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \
-  Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -20223,19 +19988,19 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Wait_Strategy.inl
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl
 
 .obj/Wait_On_Read.o .obj/Wait_On_Read.so .shobj/Wait_On_Read.o .shobj/Wait_On_Read.so: Wait_On_Read.cpp \
-  Wait_On_Read.h \
+  $(TAO_ROOT)/tao/Wait_On_Read.h \
   $(ACE_ROOT)/ace/pre.h \
-  Wait_Strategy.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -20324,23 +20089,23 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Wait_Strategy.inl \
-  Transport.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -20371,12 +20136,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -20417,49 +20182,49 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Resume_Handle.h \
-  Resume_Handle.inl \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Resume_Handle.h \
+  $(TAO_ROOT)/tao/Resume_Handle.inl \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl
 
 .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \
-  Wait_On_Reactor.h \
+  $(TAO_ROOT)/tao/Wait_On_Reactor.h \
   $(ACE_ROOT)/ace/pre.h \
-  Wait_Strategy.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -20548,103 +20313,103 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Wait_Strategy.inl \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -20663,18 +20428,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -20683,9 +20448,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -20697,19 +20462,19 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -20731,24 +20496,24 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl
 
 .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \
-  Wait_On_Leader_Follower.h \
+  $(TAO_ROOT)/tao/Wait_On_Leader_Follower.h \
   $(ACE_ROOT)/ace/pre.h \
-  Wait_Strategy.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -20837,103 +20602,103 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Wait_Strategy.inl \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -20952,18 +20717,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -20972,9 +20737,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -20986,29 +20751,30 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -21030,24 +20796,24 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl
 
 .obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \
-  Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -21056,9 +20822,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21139,44 +20905,44 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i
 
 .obj/Exclusive_TMS.o .obj/Exclusive_TMS.so .shobj/Exclusive_TMS.o .shobj/Exclusive_TMS.so: Exclusive_TMS.cpp \
-  Exclusive_TMS.h \
+  $(TAO_ROOT)/tao/Exclusive_TMS.h \
   $(ACE_ROOT)/ace/pre.h \
-  Transport_Mux_Strategy.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -21185,9 +20951,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21268,44 +21034,44 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  debug.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/debug.h \
   Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -21337,12 +21103,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -21388,11 +21154,11 @@ realclean:
   Incoming_Message_Queue.inl Transport.inl
 
 .obj/Muxed_TMS.o .obj/Muxed_TMS.so .shobj/Muxed_TMS.o .shobj/Muxed_TMS.so: Muxed_TMS.cpp \
-  Muxed_TMS.h \
+  $(TAO_ROOT)/tao/Muxed_TMS.h \
   $(ACE_ROOT)/ace/pre.h \
-  Transport_Mux_Strategy.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -21401,9 +21167,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21484,35 +21250,35 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
@@ -21544,24 +21310,24 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  debug.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -21606,10 +21372,10 @@ realclean:
   Incoming_Message_Queue.inl Transport.inl
 
 .obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \
-  Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -21618,9 +21384,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21701,43 +21467,43 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Reply_Dispatcher.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i
 
 .obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.so .shobj/Synch_Reply_Dispatcher.o .shobj/Synch_Reply_Dispatcher.so: Synch_Reply_Dispatcher.cpp \
-  Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
-  Reply_Dispatcher.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -21746,9 +21512,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21829,103 +21595,103 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -21944,18 +21710,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -21964,9 +21730,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -21978,21 +21744,21 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -22014,14 +21780,14 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Incoming_Message_Queue.inl \
-  Transport.inl
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl
 
 .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \
-  Asynch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -22045,8 +21811,8 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  Transport.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -22112,20 +21878,20 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -22156,12 +21922,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -22202,111 +21968,111 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  Asynch_Timeout_Handler.h \
-  Messaging.h \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  Asynch_Reply_Dispatcher.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \
+  $(TAO_ROOT)/tao/Messaging.h \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Asynch_Timeout_Handler.o .obj/Asynch_Timeout_Handler.so .shobj/Asynch_Timeout_Handler.o .shobj/Asynch_Timeout_Handler.so: Asynch_Timeout_Handler.cpp \
-  Asynch_Timeout_Handler.h \
+  $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -22344,8 +22110,8 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/Event_Handler.i \
-  TAO_Export.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -22397,10 +22163,10 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/Handle_Set.i \
@@ -22413,17 +22179,17 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  Asynch_Reply_Dispatcher.h \
-  Transport.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -22442,12 +22208,12 @@ realclean:
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -22488,63 +22254,63 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  Messaging.h \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  Asynch_Reply_Dispatcher.i \
-  Transport_Mux_Strategy.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Messaging.h \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
 .obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
@@ -22556,8 +22322,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22638,91 +22404,91 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i Object.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i Object.h \
   Exception.h CDR.h Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   IOPC.i Typecode.h ORB_Core.h corbafwd.h ORB.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h Encodable.h Environment.h Remote_Object_Proxy_Impl.h \
   CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  IOPC.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h \
-  Any.h \
+  $(TAO_ROOT)/tao/Any.h \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -22743,11 +22509,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -22777,7 +22543,7 @@ realclean:
 
 .obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp PollableC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -22866,113 +22632,113 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   PollableC.i \
-  Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -22991,18 +22757,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -23011,9 +22777,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -23025,33 +22791,33 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i
 
 .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \
-  CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(ACE_ROOT)/ace/pre.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -23140,43 +22906,43 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CONV_FRAMEC.i \
-  Any.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i
 
 .obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
-  Tagged_Components.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -23185,9 +22951,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23268,105 +23034,105 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  Profile.h \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -23385,18 +23151,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -23405,9 +23171,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -23419,13 +23185,13 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Service_Context.o .obj/Service_Context.so .shobj/Service_Context.o .shobj/Service_Context.so: Service_Context.cpp \
-  Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -23434,9 +23200,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23517,41 +23283,41 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Service_Context.inl
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Service_Context.inl
 
 .obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \
-  GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -23640,47 +23406,47 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/GIOPC.i
 
 .obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \
-  BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -23769,35 +23535,35 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Any.h \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  BoundsC.i
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/BoundsC.i
 
 .obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -23886,64 +23652,64 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  PolicyC.h \
-  Encodable.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  TimeBaseC.h \
-  Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
   TAOC.i
 
 .obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp Object_Loader.h \
   $(ACE_ROOT)/ace/pre.h \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -24032,15 +23798,15 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -24052,7 +23818,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.so .shobj/TAO_Singleton_Manager.o .shobj/TAO_Singleton_Manager.so: TAO_Singleton_Manager.cpp \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -24112,11 +23878,11 @@ realclean:
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Atomic_Op.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Export.h \
-  TAO_Singleton_Manager.inl \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -24152,15 +23918,15 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.h \
-  Typecode.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i
 
 .obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp \
   $(ACE_ROOT)/ace/ARGV.h \
@@ -24217,7 +23983,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  DLL_ORB.h \
+  $(TAO_ROOT)/tao/DLL_ORB.h \
   $(ACE_ROOT)/ace/Task.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -24339,55 +24105,55 @@ realclean:
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  ORB.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  DLL_ORB.inl \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  debug.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/DLL_ORB.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp \
-  Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -24476,103 +24242,103 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Adapter.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Object_KeyC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Object_KeyC.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -24591,18 +24357,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -24611,9 +24377,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -24625,16 +24391,16 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/Services_Activate.o .obj/Services_Activate.so .shobj/Services_Activate.o .shobj/Services_Activate.so: Services_Activate.cpp \
-  Services_Activate.h \
+  $(TAO_ROOT)/tao/Services_Activate.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -24723,30 +24489,30 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/Service_Callbacks.o .obj/Service_Callbacks.so .shobj/Service_Callbacks.o .shobj/Service_Callbacks.so: Service_Callbacks.cpp \
-  Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -24755,9 +24521,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -24838,47 +24604,47 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Service_Callbacks.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i
 
 .obj/Parser_Registry.o .obj/Parser_Registry.so .shobj/Parser_Registry.o .shobj/Parser_Registry.so: Parser_Registry.cpp \
-  Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -24967,105 +24733,105 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Parser_Registry.i \
-  IOR_Parser.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -25084,16 +24850,16 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -25102,9 +24868,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -25116,9 +24882,9 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  default_resource.h \
-  default_resource.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/default_resource.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -25129,9 +24895,9 @@ realclean:
   $(ACE_ROOT)/ace/Service_Repository.i
 
 .obj/IOR_Parser.o .obj/IOR_Parser.so .shobj/IOR_Parser.o .shobj/IOR_Parser.so: IOR_Parser.cpp \
-  IOR_Parser.h \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -25220,21 +24986,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -25242,8 +25008,8 @@ realclean:
 
 .obj/DLL_Parser.o .obj/DLL_Parser.so .shobj/DLL_Parser.o .shobj/DLL_Parser.so: DLL_Parser.cpp DLL_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOR_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -25332,21 +25098,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -25366,12 +25132,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   DLL_Parser.i Object_Loader.h Object_Loader.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Environment.h \
-  Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -25379,8 +25145,8 @@ realclean:
 
 .obj/FILE_Parser.o .obj/FILE_Parser.so .shobj/FILE_Parser.o .shobj/FILE_Parser.so: FILE_Parser.cpp FILE_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOR_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -25469,21 +25235,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -25503,44 +25269,44 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   FILE_Parser.i \
-  Object_Loader.h \
-  Object_Loader.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Object_Loader.h \
+  $(TAO_ROOT)/tao/Object_Loader.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   $(ACE_ROOT)/ace/Read_Buffer.h \
   $(ACE_ROOT)/ace/Read_Buffer.i
 
 .obj/CORBALOC_Parser.o .obj/CORBALOC_Parser.so .shobj/CORBALOC_Parser.o .shobj/CORBALOC_Parser.so: CORBALOC_Parser.cpp CORBALOC_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOR_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -25629,21 +25395,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -25663,85 +25429,85 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   CORBALOC_Parser.i ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
-  params.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -25768,27 +25534,27 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i Stub.h \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  ORB_Core.h \
-  Stub.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Stub.i \
   MProfile.h Connector_Registry.h \
-  params.h \
-  Connector_Registry.i
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/Connector_Registry.i
 
 .obj/CORBANAME_Parser.o .obj/CORBANAME_Parser.so .shobj/CORBANAME_Parser.o .shobj/CORBANAME_Parser.so: CORBANAME_Parser.cpp CORBANAME_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOR_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -25877,21 +25643,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -25913,108 +25679,108 @@ realclean:
   CORBANAME_Parser.i Invocation.h CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -26023,9 +25789,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -26037,27 +25803,27 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i Any.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i Any.h \
   Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
   TAOC.h TAOC.i operation_details.h corbafwd.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i \
   Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   Invocation.i debug.h
 
 .obj/MCAST_Parser.o .obj/MCAST_Parser.so .shobj/MCAST_Parser.o .shobj/MCAST_Parser.so: MCAST_Parser.cpp MCAST_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOR_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/IOR_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -26146,103 +25912,103 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  IOR_Parser.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOR_Parser.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -26261,18 +26027,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -26281,9 +26047,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -26295,10 +26061,10 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
   MCAST_Parser.i \
-  Object_Loader.h \
-  Object_Loader.i \
+  $(TAO_ROOT)/tao/Object_Loader.h \
+  $(TAO_ROOT)/tao/Object_Loader.i \
   $(ACE_ROOT)/ace/Read_Buffer.h \
   $(ACE_ROOT)/ace/Read_Buffer.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
@@ -26320,9 +26086,9 @@ realclean:
   $(ACE_ROOT)/ace/SOCK_Dgram.i
 
 .obj/Bind_Dispatcher_Guard.o .obj/Bind_Dispatcher_Guard.so .shobj/Bind_Dispatcher_Guard.o .shobj/Bind_Dispatcher_Guard.so: Bind_Dispatcher_Guard.cpp \
-  Bind_Dispatcher_Guard.h \
+  $(TAO_ROOT)/tao/Bind_Dispatcher_Guard.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -26411,46 +26177,46 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Bind_Dispatcher_Guard.i \
-  Reply_Dispatcher.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Bind_Dispatcher_Guard.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Reply_Dispatcher.i \
-  Transport_Mux_Strategy.h
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
 .obj/Fault_Tolerance_Service.o .obj/Fault_Tolerance_Service.so .shobj/Fault_Tolerance_Service.o .shobj/Fault_Tolerance_Service.so: Fault_Tolerance_Service.cpp \
-  Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -26490,7 +26256,7 @@ realclean:
   $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/SString.i \
   $(ACE_ROOT)/ace/Malloc_Base.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
@@ -26543,108 +26309,108 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Fault_Tolerance_Service.i \
-  Service_Callbacks.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  Services_Activate.h \
+  $(TAO_ROOT)/tao/Services_Activate.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -26663,14 +26429,14 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -26679,9 +26445,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -26693,13 +26459,13 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Client_Strategy_Factory.h
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Client_Strategy_Factory.h
 
 .obj/Interceptor_List.o .obj/Interceptor_List.so .shobj/Interceptor_List.o .shobj/Interceptor_List.so: Interceptor_List.cpp \
-  Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -26788,83 +26554,83 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  IOPC.h \
-  IOPC.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Interceptor_List.inl \
-  CORBA_String.h \
-  CORBA_String.inl
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl
 
 .obj/IFR_Client_Adapter.o .obj/IFR_Client_Adapter.so .shobj/IFR_Client_Adapter.o .shobj/IFR_Client_Adapter.so: IFR_Client_Adapter.cpp \
-  IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -26953,12 +26719,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -27058,90 +26824,90 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   PortableInterceptorC.h DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   LocalObject.h LocalObject.i StringSeqC.h StringSeqC.i ORBInitInfo.inl \
   ORB_Core.h ORB.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  IOPC.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
   PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -27163,11 +26929,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -27287,72 +27053,72 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   TAO_Singleton.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  ORBInitializer_Registry.inl \
+  $(TAO_ROOT)/tao/ORBInitializer_Registry.inl \
   ORB.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
   TAO_Singleton_Manager.h
 
 .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \
@@ -27446,61 +27212,61 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   PortableInterceptorC.h DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -27529,11 +27295,11 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 
 .obj/Cache_Entries.o .obj/Cache_Entries.so .shobj/Cache_Entries.o .shobj/Cache_Entries.so: Cache_Entries.cpp \
-  Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
   $(ACE_ROOT)/ace/pre.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -27622,21 +27388,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Cache_Entries.inl \
-  Transport.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -27667,10 +27433,10 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -27711,41 +27477,41 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl
 
 .obj/Base_Transport_Property.o .obj/Base_Transport_Property.so .shobj/Base_Transport_Property.o .shobj/Base_Transport_Property.so: Base_Transport_Property.cpp \
-  Base_Transport_Property.h \
+  $(TAO_ROOT)/tao/Base_Transport_Property.h \
   $(ACE_ROOT)/ace/pre.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -27834,18 +27600,18 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Base_Transport_Property.inl
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Base_Transport_Property.inl
 
 .obj/Transport_Cache_Manager.o .obj/Transport_Cache_Manager.so .shobj/Transport_Cache_Manager.o .shobj/Transport_Cache_Manager.so: Transport_Cache_Manager.cpp \
-  Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/OS.h \
@@ -27960,11 +27726,11 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Memory_Pool.i \
-  TAO_Export.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
@@ -27972,21 +27738,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport.h \
-  Exception.h \
-  Exception.i \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -28027,101 +27793,101 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Transport.inl \
-  debug.h \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \
   Cleanup_Func_Registry.h \
@@ -28214,22 +27980,22 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl
 
 .obj/Transport_Descriptor_Interface.o .obj/Transport_Descriptor_Interface.so .shobj/Transport_Descriptor_Interface.o .shobj/Transport_Descriptor_Interface.so: Transport_Descriptor_Interface.cpp \
-  Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
   $(ACE_ROOT)/ace/pre.h \
-  Endpoint.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -28318,14 +28084,14 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl
 
 .obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp IORInfo.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -28417,74 +28183,74 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   PortableInterceptorC.h DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   LocalObject.h LocalObject.i MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  IOPC.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i
 
 .obj/Object_Ref_Table.o .obj/Object_Ref_Table.so .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.so: Object_Ref_Table.cpp Object_Ref_Table.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -28576,12 +28342,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -28615,23 +28381,23 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Object.h \
-  corbafwd.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
   Exception.h \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Environment.h \
-  Environment.i \
+  $(TAO_ROOT)/tao/Environment.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   debug.h
 
 .obj/BiDir_Adapter.o .obj/BiDir_Adapter.so .shobj/BiDir_Adapter.o .shobj/BiDir_Adapter.so: BiDir_Adapter.cpp \
-  BiDir_Adapter.h \
+  $(TAO_ROOT)/tao/BiDir_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
-  Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -28720,15 +28486,15 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -28748,8 +28514,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl IOPC.h \
-  Any.h CDR.h \
-  corbafwd.h \
+  Any.h $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -28830,36 +28596,36 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i Object.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i Object.h \
   Exception.h CDR.h Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   IOPC.i LocalObject.h LocalObject.i CDR_Encaps_Codec.h
 
 .obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \
@@ -28954,67 +28720,67 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \
   Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i PortableInterceptorC.i \
   LocalObject.h LocalObject.i CodecFactory.h
 
 .obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.so .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.so: CDR_Encaps_Codec.cpp CDR.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -29103,63 +28869,63 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  $(TAO_ROOT)/tao/CDR.i \
   OctetSeqC.h corbafwd.h Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
   OctetSeqC.i Any.h \
-  CDR.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
   Typecode.h Marshal.h \
-  Principal.h \
-  OctetSeqC.h \
-  Principal.i \
-  Any.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Marshal.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Marshal.i \
   CDR_Encaps_Codec.h TAO_Export.h IOPC.h Object.h Exception.h IOPC.i \
   LocalObject.h LocalObject.i
 
 .obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.so .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.so: Endpoint_Selector_Factory.cpp \
-  Endpoint_Selector_Factory.h \
+  $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -29248,12 +29014,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -29353,12 +29119,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/Block_Flushing_Strategy.o .obj/Block_Flushing_Strategy.so .shobj/Block_Flushing_Strategy.o .shobj/Block_Flushing_Strategy.so: Block_Flushing_Strategy.cpp \
   Block_Flushing_Strategy.h \
@@ -29452,21 +29218,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Transport.h Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -29498,12 +29264,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -29546,31 +29312,31 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl Queued_Message.h LF_Event.h \
   LF_Event.inl Queued_Message.inl
 
@@ -29666,21 +29432,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Transport.h Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -29712,12 +29478,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -29760,82 +29526,82 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h Encodable.h Environment.h Sequence.h CDR.h \
   Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
-  params.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
   Interceptor_List.h Interceptor_List.inl Protocols_Hooks.h ORB_Core.i \
   Queued_Message.h LF_Event.h LF_Event.inl Queued_Message.inl debug.h
@@ -29930,12 +29696,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   LF_Event.h LF_Event.inl Queued_Message.inl
 
 .obj/Synch_Queued_Message.o .obj/Synch_Queued_Message.so .shobj/Synch_Queued_Message.o .shobj/Synch_Queued_Message.so: Synch_Queued_Message.cpp Synch_Queued_Message.h \
@@ -30029,12 +29795,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   LF_Event.h LF_Event.inl Queued_Message.inl
 
 .obj/Asynch_Queued_Message.o .obj/Asynch_Queued_Message.so .shobj/Asynch_Queued_Message.o .shobj/Asynch_Queued_Message.so: Asynch_Queued_Message.cpp \
@@ -30129,12 +29895,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   LF_Event.h LF_Event.inl Queued_Message.inl
 
 .obj/Transport_Timer.o .obj/Transport_Timer.so .shobj/Transport_Timer.o .shobj/Transport_Timer.so: Transport_Timer.cpp Transport_Timer.h \
@@ -30228,21 +29994,21 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -30274,12 +30040,12 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -30321,37 +30087,37 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl
 
 .obj/Connection_Purging_Strategy.o .obj/Connection_Purging_Strategy.so .shobj/Connection_Purging_Strategy.o .shobj/Connection_Purging_Strategy.so: Connection_Purging_Strategy.cpp \
-  Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -30360,13 +30126,13 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Connection_Purging_Strategy.inl
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl
 
 .obj/LRU_Connection_Purging_Strategy.o .obj/LRU_Connection_Purging_Strategy.so .shobj/LRU_Connection_Purging_Strategy.o .shobj/LRU_Connection_Purging_Strategy.so: LRU_Connection_Purging_Strategy.cpp \
   LRU_Connection_Purging_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  Connection_Purging_Strategy.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -30375,7 +30141,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
   Transport.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -30457,20 +30223,20 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   Exception.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
+  $(TAO_ROOT)/tao/Exception.i \
   Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -30502,10 +30268,10 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -30548,37 +30314,37 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl
 
 .obj/Policy_Set.o .obj/Policy_Set.so .shobj/Policy_Set.o .shobj/Policy_Set.so: Policy_Set.cpp \
-  Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -30602,10 +30368,10 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  PolicyC.h \
-  TAO_Export.h \
-  Encodable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -30671,44 +30437,44 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  Policy_Set.i \
-  debug.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/Default_Endpoint_Selector_Factory.o .obj/Default_Endpoint_Selector_Factory.so .shobj/Default_Endpoint_Selector_Factory.o .shobj/Default_Endpoint_Selector_Factory.so:  \
  Default_Endpoint_Selector_Factory.cpp \
-  Default_Endpoint_Selector_Factory.h \
+  $(TAO_ROOT)/tao/Default_Endpoint_Selector_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  Endpoint_Selector_Factory.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -30797,12 +30563,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -30827,114 +30593,114 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Invocation.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -30943,9 +30709,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -30957,31 +30723,298 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i
 
-.obj/POA_Extension_Initializer.o .obj/POA_Extension_Initializer.so .shobj/POA_Extension_Initializer.o .shobj/POA_Extension_Initializer.so: POA_Extension_Initializer.cpp \
-  POA_Extension_Initializer.h \
-  $(ACE_ROOT)/ace/pre.h corbafwd.h \
+.obj/Thread_Lane_Resources.o .obj/Thread_Lane_Resources.so .shobj/Thread_Lane_Resources.o .shobj/Thread_Lane_Resources.so: Thread_Lane_Resources.cpp \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Intrusive_List.h \
+  $(ACE_ROOT)/ace/Intrusive_List.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.cpp \
+  $(TAO_ROOT)/tao/Leader_Follower.i
+
+.obj/Thread_Lane_Resources_Manager.o .obj/Thread_Lane_Resources_Manager.so .shobj/Thread_Lane_Resources_Manager.o .shobj/Thread_Lane_Resources_Manager.so: Thread_Lane_Resources_Manager.cpp \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -30990,11 +31023,267 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Intrusive_List.h \
+  $(ACE_ROOT)/ace/Intrusive_List.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.cpp \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/Default_Thread_Lane_Resources_Manager.o .obj/Default_Thread_Lane_Resources_Manager.so .shobj/Default_Thread_Lane_Resources_Manager.o .shobj/Default_Thread_Lane_Resources_Manager.so:  \
+ Default_Thread_Lane_Resources_Manager.cpp \
+  $(TAO_ROOT)/tao/Default_Thread_Lane_Resources_Manager.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -31005,8 +31294,15 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -31069,20 +31365,176 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Environment.h \
-  corbafwd.h \
-  Environment.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Default_Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Intrusive_List.h \
+  $(ACE_ROOT)/ace/Intrusive_List.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.cpp \
+  $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/Default_Stub_Factory.o .obj/Default_Stub_Factory.so .shobj/Default_Stub_Factory.o .shobj/Default_Stub_Factory.so: Default_Stub_Factory.cpp Default_Stub_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
-  Stub_Factory.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Stub_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -31171,12 +31623,12 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -31202,112 +31654,112 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Stub.h \
-  Pluggable.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Protocol_Factory.h \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -31316,9 +31768,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -31330,14 +31782,14 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i
 
 .obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \
-  Services.h \
+  $(TAO_ROOT)/tao/Services.h \
   $(ACE_ROOT)/ace/pre.h \
-  Sequence.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -31426,100 +31878,100 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Any.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  ORB_Core.h \
-  ORB.h \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  IOPC.h \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -31538,18 +31990,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -31558,9 +32010,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -31572,12 +32024,12 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \
-  NVList.h \
+  $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -31613,9 +32065,9 @@ realclean:
   $(ACE_ROOT)/ace/Log_Record.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -31672,62 +32124,62 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  NVList.i \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  BoundsC.h \
-  BoundsC.i \
-  debug.h \
-  Marshal.h \
-  Principal.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  Principal.i \
-  Marshal.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/IFR_TypeCodes.o .obj/IFR_TypeCodes.so .shobj/IFR_TypeCodes.o .shobj/IFR_TypeCodes.so: IFR_TypeCodes.cpp \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -31817,17 +32269,17 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/Dynamic_Adapter.o .obj/Dynamic_Adapter.so .shobj/Dynamic_Adapter.o .shobj/Dynamic_Adapter.so: Dynamic_Adapter.cpp \
-  Dynamic_Adapter.h \
+  $(TAO_ROOT)/tao/Dynamic_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -31916,102 +32368,102 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32030,18 +32482,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -32050,9 +32502,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -32064,7 +32516,7 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -32160,111 +32612,111 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   ValueBase.h \
-  corbafwd.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i CDR.h \
   Remote_Object_Proxy_Impl.h TimeBaseC.h \
-  Any.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   IOPC.i PolicyC.h Encodable.h Environment.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   PollableC.h PollableC.i MessagingC.i \
-  Stub.h \
-  Pluggable.h \
-  IOPC.h \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  PolicyC.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  CurrentC.h \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32283,18 +32735,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -32303,9 +32755,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -32317,41 +32769,41 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  LF_Event.h \
-  LF_Event.inl \
-  TAOC.h \
-  TimeBaseC.h \
-  TAOC.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  Invocation.i \
-  PortableInterceptor.h \
-  RequestInfo_Util.h \
-  ClientRequestInfo.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  ClientRequestInfo.inl \
-  ClientInterceptorAdapter.h \
-  ClientInterceptorAdapter.inl
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \
-  Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -32375,11 +32827,11 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  Policy_Set.h \
-  PolicyC.h \
-  TAO_Export.h \
-  Encodable.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -32445,96 +32897,96 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32553,18 +33005,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -32573,9 +33025,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -32587,18 +33039,18 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Buffering_Constraint_Policy.h \
-  TAOC.h \
-  TAOC.i \
-  Buffering_Constraint_Policy.i \
-  Messaging_Policy_i.h \
-  Messaging_Policy_i.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i
 
 .obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.so .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.so: Messaging_Policy_i.cpp \
-  Messaging_Policy_i.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -32622,8 +33074,8 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  MessagingC.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -32689,112 +33141,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  IOPC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  LocalObject.h \
-  LocalObject.i \
-  Messaging_Policy_i.i \
-  Stub.h \
-  Pluggable.h \
-  Pluggable.i \
-  MProfile.h \
-  Profile.h \
-  Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  MProfile.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32813,18 +33265,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -32833,9 +33285,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -32847,13 +33299,13 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Stub.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i
 
 .obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.so .shobj/Buffering_Constraint_Policy.o .shobj/Buffering_Constraint_Policy.so: Buffering_Constraint_Policy.cpp \
-  Buffering_Constraint_Policy.h \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
   $(ACE_ROOT)/ace/pre.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -32877,8 +33329,8 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  TAOC.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -32944,66 +33396,66 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
+  $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  PolicyC.h \
-  Encodable.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Environment.h \
-  Environment.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  TimeBaseC.h \
-  Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  TAOC.i \
-  LocalObject.h \
-  LocalObject.i \
-  Buffering_Constraint_Policy.i
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i
 
 .obj/Messaging_PolicyFactory.o .obj/Messaging_PolicyFactory.so .shobj/Messaging_PolicyFactory.o .shobj/Messaging_PolicyFactory.so: Messaging_PolicyFactory.cpp \
-  Messaging_PolicyFactory.h \
+  $(TAO_ROOT)/tao/Messaging_PolicyFactory.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -33092,85 +33544,85 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  IOPC.h \
-  IOPC.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
-  LocalObject.h \
-  LocalObject.i \
-  Messaging_Policy_i.h \
-  Messaging_Policy_i.i \
-  Buffering_Constraint_Policy.h \
-  TAOC.h \
-  TAOC.i \
-  Buffering_Constraint_Policy.i
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i
 
 .obj/Messaging_ORBInitializer.o .obj/Messaging_ORBInitializer.so .shobj/Messaging_ORBInitializer.o .shobj/Messaging_ORBInitializer.so: Messaging_ORBInitializer.cpp \
-  Messaging_ORBInitializer.h \
+  $(TAO_ROOT)/tao/Messaging_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -33259,105 +33711,105 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  Remote_Object_Proxy_Impl.h \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  IOPC.h \
-  IOPC.i \
-  PolicyC.h \
-  Encodable.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
-  LocalObject.h \
-  LocalObject.i \
-  Messaging_Policy_i.h \
-  Messaging_Policy_i.i \
-  Messaging_PolicyFactory.h \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
+  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
+  $(TAO_ROOT)/tao/Messaging_PolicyFactory.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -33376,18 +33828,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -33396,9 +33848,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -33410,14 +33862,14 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.so .shobj/Pluggable_Messaging.o .shobj/Pluggable_Messaging.so: Pluggable_Messaging.cpp \
-  Pluggable_Messaging.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
   $(ACE_ROOT)/ace/pre.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -33426,9 +33878,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -33509,45 +33961,45 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Pluggable_Messaging.i \
-  Pluggable.h \
-  Pluggable.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i
 
 .obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.so .shobj/Pluggable_Messaging_Utils.o .shobj/Pluggable_Messaging_Utils.so: Pluggable_Messaging_Utils.cpp \
-  Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -33556,9 +34008,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -33639,99 +34091,99 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -33750,18 +34202,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -33770,9 +34222,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -33784,14 +34236,14 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.so .shobj/GIOP_Message_Base.o .shobj/GIOP_Message_Base.so: GIOP_Message_Base.cpp GIOP_Message_Base.h \
   $(ACE_ROOT)/ace/pre.h \
-  Pluggable_Messaging.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -33800,9 +34252,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -33883,112 +34335,112 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Pluggable_Messaging.i \
-  GIOP_Message_Generator_Parser_Impl.h \
-  GIOP_Message_Generator_Parser_11.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser.h \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl \
-  GIOP_Message_Generator_Parser_12.h \
-  GIOP_Message_Generator_Parser_12.inl \
-  GIOP_Message_Generator_Parser_Impl.inl \
-  GIOP_Utils.h \
-  GIOP_Utils.i \
-  GIOP_Message_State.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
-  GIOP_Message_Base.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \
+  $(TAO_ROOT)/tao/GIOP_Utils.h \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Message_State.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Base.i \
   operation_details.h corbafwd.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   target_specification.i operation_details.i GIOP_Utils.h Pluggable.h \
-  Pluggable.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
   debug.h ORB_Core.h ORB.h Exception.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
   PolicyC.h TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \
   Remote_Object_Proxy_Impl.h CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   Policy_Manager.h \
-  Policy_Set.h \
-  PolicyC.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
   DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   Any.h TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -34010,11 +34462,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -34041,35 +34493,36 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
-  ORB_Core.h \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
   TAO_Server_Request.h Tagged_Profile.h \
-  GIOPC.h \
-  GIOPC.i \
-  Tagged_Profile.i \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
   OctetSeqC.h OctetSeqC.i Object.h TAO_Server_Request.i \
   GIOP_Message_Locate_Header.h \
-  Tagged_Profile.h \
-  GIOP_Message_Locate_Header.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.i \
   Transport.h Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -34094,16 +34547,16 @@ realclean:
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
   Incoming_Message_Queue.inl Transport.inl \
-  LF_Strategy.h \
-  LF_Strategy.inl
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl
 
 .obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \
-  GIOP_Message_Lite.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
   $(ACE_ROOT)/ace/pre.h \
-  Pluggable_Messaging.h \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -34112,9 +34565,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -34195,109 +34648,109 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Pluggable_Messaging.i \
-  GIOP_Utils.h \
-  GIOP_Utils.i \
-  GIOP_Message_State.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
-  GIOP_Message_Lite.i \
-  debug.h \
-  TAOC.h \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.h \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Message_State.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Lite.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  TAOC.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -34316,18 +34769,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -34336,9 +34789,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -34350,49 +34803,50 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  target_specification.i \
-  operation_details.i \
-  TAO_Server_Request.h \
-  Tagged_Profile.h \
-  GIOPC.h \
-  GIOPC.i \
-  Tagged_Profile.i \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  TAO_Server_Request.i \
-  GIOP_Message_Locate_Header.h \
-  GIOP_Message_Locate_Header.i \
-  Leader_Follower.h \
-  LF_Follower.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.h \
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  LF_Follower.inl \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  LF_Strategy.h \
-  LF_Strategy.inl \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
+  $(TAO_ROOT)/tao/Leader_Follower.i \
+  $(TAO_ROOT)/tao/LF_Strategy.h \
+  $(TAO_ROOT)/tao/LF_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -34414,14 +34868,14 @@ realclean:
   $(ACE_ROOT)/ace/Process_Mutex.inl \
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
-  Incoming_Message_Queue.h \
-  Incoming_Message_Queue.inl \
-  Transport.inl
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Transport.inl
 
 .obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.so .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.so: GIOP_Message_Generator_Parser.cpp \
-  GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -34510,57 +34964,57 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  GIOP_Message_Generator_Parser.inl \
-  Pluggable_Messaging_Utils.h \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  GIOP_Utils.h \
-  GIOP_Utils.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Tagged_Profile.h \
-  GIOPC.h \
-  GIOPC.i \
-  Tagged_Profile.i \
-  debug.h
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.h \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/debug.h
 
 .obj/GIOP_Message_Generator_Parser_10.o .obj/GIOP_Message_Generator_Parser_10.so .shobj/GIOP_Message_Generator_Parser_10.o .shobj/GIOP_Message_Generator_Parser_10.so: GIOP_Message_Generator_Parser_10.cpp \
   GIOP_Message_Generator_Parser_10.h \
   $(ACE_ROOT)/ace/pre.h \
-  GIOP_Message_Generator_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -34649,71 +35103,71 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
   GIOP_Utils.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  GIOP_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
   GIOP_Message_Locate_Header.h \
-  Tagged_Profile.h \
-  GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i \
-  Tagged_Profile.i \
-  GIOP_Message_Locate_Header.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.i \
   operation_details.h corbafwd.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h target_specification.i operation_details.i CDR.h \
   Any.h debug.h OctetSeqC.h Sequence.h OctetSeqC.i \
   Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   TAO_Server_Request.h Tagged_Profile.h Object.h TAO_Server_Request.i \
   GIOP_Message_State.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
   CORBA_String.h \
-  CORBA_String.inl
+  $(TAO_ROOT)/tao/CORBA_String.inl
 
 .obj/GIOP_Message_Generator_Parser_11.o .obj/GIOP_Message_Generator_Parser_11.so .shobj/GIOP_Message_Generator_Parser_11.o .shobj/GIOP_Message_Generator_Parser_11.so: GIOP_Message_Generator_Parser_11.cpp \
-  GIOP_Message_Generator_Parser_11.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
   $(ACE_ROOT)/ace/pre.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -34802,25 +35256,25 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl
 
 .obj/GIOP_Message_Generator_Parser_12.o .obj/GIOP_Message_Generator_Parser_12.so .shobj/GIOP_Message_Generator_Parser_12.o .shobj/GIOP_Message_Generator_Parser_12.so: GIOP_Message_Generator_Parser_12.cpp \
   GIOP_Message_Generator_Parser_12.h \
   $(ACE_ROOT)/ace/pre.h \
-  GIOP_Message_Generator_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -34909,117 +35363,117 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_12.inl \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
   GIOP_Utils.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  GIOP_Utils.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
   GIOP_Message_State.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
   GIOP_Message_Locate_Header.h \
-  Tagged_Profile.h \
-  GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i \
-  Tagged_Profile.i \
-  GIOP_Message_Locate_Header.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.i \
   operation_details.h corbafwd.h Service_Context.h \
-  Service_Context.inl \
+  $(TAO_ROOT)/tao/Service_Context.inl \
   target_specification.h target_specification.i operation_details.i CDR.h \
   Any.h debug.h OctetSeqC.h Sequence.h OctetSeqC.i \
   Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   TAO_Server_Request.h Tagged_Profile.h Object.h TAO_Server_Request.i \
   TAOC.h \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
   TAOC.i Pluggable.h \
-  Pluggable.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
   ORB_Core.h ORB.h Exception.h Services.h \
-  Services.i \
+  $(TAO_ROOT)/tao/Services.i \
   CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h ORB.i \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  PolicyC.h $(TAO_ROOT)/tao/ORB.i \
   Environment.h Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Protocol_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   params.h \
-  CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
+  $(TAO_ROOT)/tao/params.i \
   TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
   PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \
   MessagingC.h orbconf.h ValueBase.h \
-  ValueBase.i \
+  $(TAO_ROOT)/tao/ValueBase.i \
   ValueFactory.h \
-  ValueFactory.i \
+  $(TAO_ROOT)/tao/ValueFactory.i \
   TAO_Export.h Remote_Object_Proxy_Impl.h TimeBaseC.h IOPC.h PollableC.h \
   PollableC.i MessagingC.i CurrentC.h PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -35041,11 +35495,11 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
   Service_Callbacks.h \
-  Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -35072,16 +35526,16 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i Transport.h Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -35108,12 +35562,12 @@ realclean:
 
 .obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.so .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.so:  \
  GIOP_Message_Generator_Parser_Impl.cpp \
-  GIOP_Message_Generator_Parser_Impl.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
-  GIOP_Message_Generator_Parser_11.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -35202,28 +35656,28 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl \
-  GIOP_Message_Generator_Parser_12.h \
-  GIOP_Message_Generator_Parser_12.inl \
-  GIOP_Message_Generator_Parser_Impl.inl
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl
 
 .obj/GIOP_Utils.o .obj/GIOP_Utils.so .shobj/GIOP_Utils.o .shobj/GIOP_Utils.so: GIOP_Utils.cpp \
-  GIOP_Utils.h \
+  $(TAO_ROOT)/tao/GIOP_Utils.h \
   $(ACE_ROOT)/ace/pre.h \
-  Object.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -35312,102 +35766,102 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  GIOP_Utils.i \
-  debug.h \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -35426,18 +35880,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -35446,9 +35900,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -35460,18 +35914,18 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
   Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \
-  Endpoint.h \
-  Endpoint.i \
-  Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Cache_Entries.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h \
   $(ACE_ROOT)/ace/Strategies.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -35495,15 +35949,15 @@ realclean:
   $(ACE_ROOT)/ace/WFMO_Reactor.i \
   $(ACE_ROOT)/ace/Strategies.i \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Transport.inl
 
 .obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.so .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.so: GIOP_Message_Locate_Header.cpp \
-  GIOP_Message_Locate_Header.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.h \
   $(ACE_ROOT)/ace/pre.h \
-  Tagged_Profile.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -35512,9 +35966,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -35595,47 +36049,47 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i \
-  Tagged_Profile.i \
-  GIOP_Message_Locate_Header.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Locate_Header.i
 
 .obj/target_specification.o .obj/target_specification.so .shobj/target_specification.o .shobj/target_specification.so: target_specification.cpp \
-  target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.h \
   $(ACE_ROOT)/ace/pre.h \
-  Object_KeyC.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -35724,47 +36178,47 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Object_KeyC.i \
-  IOPC.h \
-  Any.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  IOPC.i \
-  target_specification.i
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/target_specification.i
 
 .obj/GIOP_Message_State.o .obj/GIOP_Message_State.so .shobj/GIOP_Message_State.o .shobj/GIOP_Message_State.so: GIOP_Message_State.cpp \
-  GIOP_Message_State.h \
+  $(TAO_ROOT)/tao/GIOP_Message_State.h \
   $(ACE_ROOT)/ace/pre.h \
-  GIOP_Message_Version.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -35853,114 +36307,114 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
-  GIOP_Message_Generator_Parser_Impl.h \
-  GIOP_Message_Generator_Parser_11.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl \
-  GIOP_Message_Generator_Parser_12.h \
-  GIOP_Message_Generator_Parser_12.inl \
-  GIOP_Message_Generator_Parser_Impl.inl \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  CDR.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  CurrentC.h \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object.i \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Typecode.h \
-  Typecode.i \
-  IOPC.h \
-  Any.h \
-  Any.i \
-  IOPC.i \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -35979,18 +36433,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -35999,9 +36453,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -36013,19 +36467,19 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  GIOP_Message_Base.h \
-  Pluggable_Messaging.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Pluggable_Messaging.i \
-  GIOP_Utils.h \
-  GIOP_Utils.i \
-  GIOP_Message_Base.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+  $(TAO_ROOT)/tao/GIOP_Utils.h \
+  $(TAO_ROOT)/tao/GIOP_Utils.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Base.i
 
 .obj/GIOP_Message_Version.o .obj/GIOP_Message_Version.so .shobj/GIOP_Message_Version.o .shobj/GIOP_Message_Version.so: GIOP_Message_Version.cpp GIOP_Message_Version.h \
   $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -36114,19 +36568,19 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  TAO_Export.h \
-  corbafwd.i \
-  GIOP_Message_Version.inl
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl
 
 .obj/Tagged_Profile.o .obj/Tagged_Profile.so .shobj/Tagged_Profile.o .shobj/Tagged_Profile.so: Tagged_Profile.cpp \
-  Tagged_Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
-  TAO_Export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -36135,9 +36589,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  Any.h \
-  CDR.h \
-  corbafwd.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -36218,103 +36672,103 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  try_macros.h \
-  orbconf.h \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  varbase.h \
-  corbafwd.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Environment.h \
-  Environment.i \
-  Object.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object.i \
-  Typecode.h \
-  Exception.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i \
-  Typecode.i \
-  Any.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  IOPC.i \
-  GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i \
-  Tagged_Profile.i \
-  ORB_Core.h \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  PolicyC.h \
-  Encodable.h \
-  Remote_Object_Proxy_Impl.h \
-  CurrentC.h \
-  CurrentC.i \
-  PolicyC.i \
-  ORB.i \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  debug.h \
-  Policy_Manager.i \
-  Resource_Factory.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  Pluggable.h \
-  Pluggable.i \
-  Protocol_Factory.h \
-  params.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  MessagingC.h \
-  ValueBase.h \
-  ValueBase.i \
-  ValueFactory.h \
-  ValueFactory.i \
-  TimeBaseC.h \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i \
-  PollableC.h \
-  PollableC.i \
-  MessagingC.i \
-  PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -36333,18 +36787,18 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -36353,9 +36807,9 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
@@ -36367,8 +36821,10 @@ realclean:
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Acceptor_Registry.h \
-  Acceptor_Registry.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index dc550a9b8bb..15cb64ef9fe 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -44,7 +44,6 @@ PLUGGABLE_PROTOCOLS_FILES = \
   UIOP_Acceptor.cpp \
   UIOP_Connect.cpp \
   IORC.cpp \
-  IORS.cpp \
   IORManipulation.cpp
 
 PLUGGABLE_MESSAGING_FILES = \
@@ -98,11 +97,8 @@ ORB_CORE_FILES = \
   ORB.cpp \
   corbafwd.cpp \
   PolicyC.cpp \
-  PolicyS.cpp \
   DomainC.cpp \
-  DomainS.cpp \
   TimeBaseC.cpp \
-  TimeBaseS.cpp \
   Principal.cpp \
   Sequence.cpp \
   MProfile.cpp \
@@ -141,9 +137,6 @@ ORB_CORE_FILES = \
   LF_Follower.cpp \
   LF_Follower_Auto_Ptr.cpp \
   LF_Follower_Auto_Adder.cpp \
-  Reactor_Registry.cpp \
-  Single_Reactor.cpp \
-  Reactor_Per_Priority.cpp \
   params.cpp \
   Resource_Factory.cpp \
   Server_Strategy_Factory.cpp \
@@ -166,25 +159,24 @@ ORB_CORE_FILES = \
   Asynch_Timeout_Handler.cpp \
   Dynamic_Adapter.cpp \
   IOPC.cpp \
-  IOPS.cpp \
   PollableC.cpp \
-  PollableS.cpp \
   CONV_FRAMEC.cpp \
-  CONV_FRAMES.cpp \
   Tagged_Components.cpp \
   Services.cpp \
   NVList.cpp \
   MessagingC.cpp \
-  MessagingS.cpp \
   Policy_Manager.cpp \
   Messaging_Policy_i.cpp \
   TAOC.cpp \
-  TAOS.cpp \
   Buffering_Constraint_Policy.cpp \
   GIOPC.cpp \
   TAO_Singleton_Manager.cpp \
   DLL_ORB.cpp \
-  Endpoint_Selector_Factory.cpp
+  Endpoint_Selector_Factory.cpp \
+  Thread_Lane_Resources.cpp \
+  Thread_Lane_Resources_Manager.cpp \
+  Default_Thread_Lane_Resources_Manager.cpp
+
 
 # Build a libtool library, libTAO.la for installation in libdir.
 lib_LTLIBRARIES = libTAO.la
@@ -351,15 +343,12 @@ HEADER_FILES = \
   Principal.h \
   Profile.h \
   Protocol_Factory.h \
-  Reactor_Per_Priority.h \
-  Reactor_Registry.h \
   Resource_Factory.h \
   Sequence.h \
   Sequence_T.h \
   Servant_Base.h \
   Server_Strategy_Factory.h \
   Services.h \
-  Single_Reactor.h \
   Stub.h \
   Sync_Strategies.h \
   TAO.h \
@@ -490,13 +479,10 @@ INLINE_FILES = \
   PollableC.i \
   PollableS.i \
   PollableS_T.i \
-  Pool_Per_Endpoint.i \
   Principal.i \
   Priority_Mapping.i \
   Profile.i \
   RT_Current.i \
-  Reactor_Per_Priority.i \
-  Reactor_Registry.i \
   Reply_Dispatcher.i \
   Synch_Reply_Dispatcher.i \
   Asynch_Reply_Dispatcher.i \
@@ -504,7 +490,6 @@ INLINE_FILES = \
   Sequence_T.i \
   Servant_Base.i \
   Services.i \
-  Single_Reactor.i \
   Stub.i \
   Sync_Strategies.i \
   TAO_Singleton.inl \
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 68ae44fa594..d88b8ceb1b1 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -25,181 +25,170 @@ OBJFILES = \
 	$(OBJDIR)\Acceptor_Registry.obj \
 	$(OBJDIR)\Adapter.obj \
 	$(OBJDIR)\Any.obj \
-	$(OBJDIR)\append.obj \
 	$(OBJDIR)\Asynch_Invocation.obj \
+	$(OBJDIR)\Asynch_Queued_Message.obj \
 	$(OBJDIR)\Asynch_Reply_Dispatcher.obj \
 	$(OBJDIR)\Asynch_Timeout_Handler.obj \
-	$(OBJDIR)\Asynch_Queued_Message.obj \
-	$(OBJDIR)\Block_Flushing_Strategy.obj \
+	$(OBJDIR)\Base_Transport_Property.obj \
 	$(OBJDIR)\BiDir_Adapter.obj \
 	$(OBJDIR)\Bind_Dispatcher_Guard.obj \
+	$(OBJDIR)\Block_Flushing_Strategy.obj \
 	$(OBJDIR)\BoundsC.obj \
 	$(OBJDIR)\Buffering_Constraint_Policy.obj \
-	$(OBJDIR)\Cache_Entries.obj \
 	$(OBJDIR)\CDR.obj \
 	$(OBJDIR)\CDR_Encaps_Codec.obj \
+	$(OBJDIR)\CONV_FRAMEC.obj \
+	$(OBJDIR)\CORBALOC_Parser.obj \
+	$(OBJDIR)\CORBANAME_Parser.obj \
+	$(OBJDIR)\CORBA_String.obj \
+	$(OBJDIR)\Cache_Entries.obj \
 	$(OBJDIR)\Cleanup_Func_Registry.obj \
-	$(OBJDIR)\Client_Strategy_Factory.obj \
+	$(OBJDIR)\ClientInterceptorAdapter.obj \
 	$(OBJDIR)\ClientRequestInfo.obj \
+	$(OBJDIR)\Client_Strategy_Factory.obj \
 	$(OBJDIR)\CodecFactory.obj \
 	$(OBJDIR)\CodecFactory_ORBInitializer.obj \
+	$(OBJDIR)\Collocation_Resolver.obj \
+	$(OBJDIR)\Default_Collocation_Resolver.obj \
 	$(OBJDIR)\Connection_Purging_Strategy.obj \
-	$(OBJDIR)\Transport_Cache_Manager.obj \
-	$(OBJDIR)\Transport_Descriptor_Interface.obj \
-	$(OBJDIR)\ClientInterceptorAdapter.obj \
 	$(OBJDIR)\Connection_handler.obj \
-	$(OBJDIR)\Connector_Registry.obj \
 	$(OBJDIR)\Connector_Impl.obj \
-	$(OBJDIR)\CONV_FRAMEC.obj \
-	$(OBJDIR)\corbafwd.obj \
-	$(OBJDIR)\CORBA_String.obj \
-	$(OBJDIR)\CORBALOC_Parser.obj \
-	$(OBJDIR)\CORBANAME_Parser.obj \
+	$(OBJDIR)\Connector_Registry.obj \
 	$(OBJDIR)\CurrentC.obj \
-	$(OBJDIR)\debug.obj \
-	$(OBJDIR)\default_client.obj \
+	$(OBJDIR)\DLL_ORB.obj \
+	$(OBJDIR)\DLL_Parser.obj \
 	$(OBJDIR)\Default_Endpoint_Selector_Factory.obj \
 	$(OBJDIR)\Default_Protocols_Hooks.obj \
-	$(OBJDIR)\default_resource.obj \
-	$(OBJDIR)\default_server.obj \
 	$(OBJDIR)\Default_Stub_Factory.obj \
-	$(OBJDIR)\DLL_ORB.obj \
-	$(OBJDIR)\DLL_Parser.obj \
+	$(OBJDIR)\Default_Thread_Lane_Resources_Manager.obj \
 	$(OBJDIR)\DomainC.obj \
-	$(OBJDIR)\Dynamic_Adapter.obj \
 	$(OBJDIR)\DynamicC.obj \
+	$(OBJDIR)\Dynamic_Adapter.obj \
 	$(OBJDIR)\Encodable.obj \
 	$(OBJDIR)\Endpoint.obj \
 	$(OBJDIR)\Endpoint_Selector_Factory.obj \
 	$(OBJDIR)\Environment.obj \
 	$(OBJDIR)\Exception.obj \
 	$(OBJDIR)\Exclusive_TMS.obj \
-	$(OBJDIR)\Fault_Tolerance_Service.obj \
 	$(OBJDIR)\FILE_Parser.obj \
+	$(OBJDIR)\Fault_Tolerance_Service.obj \
 	$(OBJDIR)\Flushing_Strategy.obj \
-	$(OBJDIR)\LF_Follower.obj \
-	$(OBJDIR)\LF_Follower_Auto_Ptr.obj \
-	$(OBJDIR)\LF_Follower_Auto_Adder.obj \
+	$(OBJDIR)\GIOPC.obj \
 	$(OBJDIR)\GIOP_Message_Base.obj \
-	$(OBJDIR)\GIOP_Message_Lite.obj \
 	$(OBJDIR)\GIOP_Message_Generator_Parser.obj \
 	$(OBJDIR)\GIOP_Message_Generator_Parser_10.obj \
 	$(OBJDIR)\GIOP_Message_Generator_Parser_11.obj \
 	$(OBJDIR)\GIOP_Message_Generator_Parser_12.obj \
 	$(OBJDIR)\GIOP_Message_Generator_Parser_Impl.obj \
+	$(OBJDIR)\GIOP_Message_Lite.obj \
 	$(OBJDIR)\GIOP_Message_Locate_Header.obj \
 	$(OBJDIR)\GIOP_Message_State.obj \
 	$(OBJDIR)\GIOP_Message_Version.obj \
 	$(OBJDIR)\GIOP_Utils.obj \
-	$(OBJDIR)\GIOPC.obj \
-	$(OBJDIR)\IFR_TypeCodes.obj \
 	$(OBJDIR)\IFR_Client_Adapter.obj \
+	$(OBJDIR)\IFR_TypeCodes.obj \
 	$(OBJDIR)\IIOPC.obj \
 	$(OBJDIR)\IIOP_Acceptor.obj \
 	$(OBJDIR)\IIOP_Connection_Handler.obj \
 	$(OBJDIR)\IIOP_Connector.obj \
 	$(OBJDIR)\IIOP_Endpoint.obj \
-	$(OBJDIR)\iiop_endpoints.obj \
 	$(OBJDIR)\IIOP_Factory.obj \
 	$(OBJDIR)\IIOP_Lite_Factory.obj \
 	$(OBJDIR)\IIOP_Profile.obj \
 	$(OBJDIR)\IIOP_Transport.obj \
+	$(OBJDIR)\IOPC.obj \
+	$(OBJDIR)\IORInfo.obj \
+	$(OBJDIR)\IOR_Parser.obj \
 	$(OBJDIR)\Incoming_Message_Queue.obj \
 	$(OBJDIR)\Interceptor_List.obj \
 	$(OBJDIR)\Invocation.obj \
 	$(OBJDIR)\Invocation_Endpoint_Selectors.obj \
-	$(OBJDIR)\IOPC.obj \
-	$(OBJDIR)\IOR_Parser.obj \
-	$(OBJDIR)\IORInfo.obj \
 	$(OBJDIR)\LF_Event.obj \
 	$(OBJDIR)\LF_Event_Binder.obj \
 	$(OBJDIR)\LF_Event_Loop_Thread_Helper.obj \
+	$(OBJDIR)\LF_Follower.obj \
+	$(OBJDIR)\LF_Follower_Auto_Adder.obj \
+	$(OBJDIR)\LF_Follower_Auto_Ptr.obj \
 	$(OBJDIR)\LF_Strategy.obj \
 	$(OBJDIR)\LF_Strategy_Complete.obj \
+	$(OBJDIR)\LRU_Connection_Purging_Strategy.obj \
 	$(OBJDIR)\Leader_Follower.obj \
 	$(OBJDIR)\Leader_Follower_Flushing_Strategy.obj \
 	$(OBJDIR)\LocalObject.obj \
-	$(OBJDIR)\LRU_Connection_Purging_Strategy.obj \
+	$(OBJDIR)\MProfile.obj \
 	$(OBJDIR)\Managed_Types.obj \
 	$(OBJDIR)\Marshal.obj \
 	$(OBJDIR)\MCAST_Parser.obj \
+	$(OBJDIR)\MessagingC.obj \
 	$(OBJDIR)\Messaging_ORBInitializer.obj \
-	$(OBJDIR)\Messaging_Policy_i.obj \
 	$(OBJDIR)\Messaging_PolicyFactory.obj \
-	$(OBJDIR)\MessagingC.obj \
-	$(OBJDIR)\MProfile.obj \
+	$(OBJDIR)\Messaging_Policy_i.obj \
 	$(OBJDIR)\Muxed_TMS.obj \
 	$(OBJDIR)\NVList.obj \
+	$(OBJDIR)\ORB.obj \
+	$(OBJDIR)\ORBInitInfo.obj \
+	$(OBJDIR)\ORBInitializer_Registry.obj \
+	$(OBJDIR)\ORB_Core.obj \
+	$(OBJDIR)\ORB_Table.obj \
 	$(OBJDIR)\Object.obj \
+	$(OBJDIR)\ObjectIDList.obj \
 	$(OBJDIR)\Object_KeyC.obj \
 	$(OBJDIR)\Object_Loader.obj \
-	$(OBJDIR)\ObjectIDList.obj \
 	$(OBJDIR)\Object_Proxy_Broker.obj \
 	$(OBJDIR)\Object_Proxy_Impl.obj \
-	$(OBJDIR)\operation_details.obj \
-	$(OBJDIR)\ORB.obj \
-	$(OBJDIR)\ORBInitInfo.obj \
-	$(OBJDIR)\ORBInitializer_Registry.obj \
-	$(OBJDIR)\operation_details.obj \
-	$(OBJDIR)\OctetSeqC.obj \
-	$(OBJDIR)\StringSeqC.obj \
 	$(OBJDIR)\Object_Ref_Table.obj \
-	$(OBJDIR)\ORB_Core.obj \
-	$(OBJDIR)\ORB_Table.obj \
-	$(OBJDIR)\params.obj \
+	$(OBJDIR)\OctetSeqC.obj \
 	$(OBJDIR)\Parser_Registry.obj \
 	$(OBJDIR)\Pluggable.obj \
-	$(OBJDIR)\POA_Extension_Initializer.obj \
-	$(OBJDIR)\Transport.obj \
-	$(OBJDIR)\Transport_Timer.obj \
 	$(OBJDIR)\Pluggable_Messaging.obj \
 	$(OBJDIR)\Pluggable_Messaging_Utils.obj \
-	$(OBJDIR)\Policy_Manager.obj \
-	$(OBJDIR)\Policy_Set.obj \
 	$(OBJDIR)\PolicyC.obj \
 	$(OBJDIR)\PolicyFactory_Registry.obj \
+	$(OBJDIR)\Policy_Manager.obj \
+	$(OBJDIR)\Policy_Set.obj \
 	$(OBJDIR)\PollableC.obj \
 	$(OBJDIR)\PortableInterceptorC.obj \
 	$(OBJDIR)\Principal.obj \
-	$(OBJDIR)\Queued_Message.obj \
 	$(OBJDIR)\Profile.obj \
 	$(OBJDIR)\Protocol_Factory.obj \
 	$(OBJDIR)\Protocols_Hooks.obj \
+	$(OBJDIR)\Queued_Message.obj \
 	$(OBJDIR)\Reactive_Flushing_Strategy.obj \
-	$(OBJDIR)\Reactor_Registry.obj \
 	$(OBJDIR)\Remote_Object_Proxy_Broker.obj \
 	$(OBJDIR)\Remote_Object_Proxy_Impl.obj \
 	$(OBJDIR)\Reply_Dispatcher.obj \
+	$(OBJDIR)\RequestInfo_Util.obj \
 	$(OBJDIR)\Resource_Factory.obj \
 	$(OBJDIR)\Resume_Handle.obj \
-	$(OBJDIR)\RequestInfo_Util.obj \
 	$(OBJDIR)\Sequence.obj \
 	$(OBJDIR)\Server_Strategy_Factory.obj \
-	$(OBJDIR)\Services.obj \
-	$(OBJDIR)\Services_Activate.obj \
 	$(OBJDIR)\Service_Callbacks.obj \
 	$(OBJDIR)\Service_Context.obj \
-	$(OBJDIR)\Single_Reactor.obj \
-	$(OBJDIR)\skip.obj \
+	$(OBJDIR)\Services.obj \
+	$(OBJDIR)\Services_Activate.obj \
+	$(OBJDIR)\StringSeqC.obj \
 	$(OBJDIR)\Stub.obj \
 	$(OBJDIR)\Stub_Factory.obj \
 	$(OBJDIR)\Sync_Strategies.obj \
 	$(OBJDIR)\Synch_Queued_Message.obj \
 	$(OBJDIR)\Synch_Reply_Dispatcher.obj \
-	$(OBJDIR)\Tagged_Components.obj \
-	$(OBJDIR)\Tagged_Profile.obj \
+	$(OBJDIR)\TAOC.obj \
 	$(OBJDIR)\TAO_Internal.obj \
 	$(OBJDIR)\TAO_Server_Request.obj \
 	$(OBJDIR)\TAO_Singleton_Manager.obj \
-	$(OBJDIR)\TAOC.obj \
-	$(OBJDIR)\target_specification.obj \
+	$(OBJDIR)\Tagged_Components.obj \
+	$(OBJDIR)\Tagged_Profile.obj \
+	$(OBJDIR)\Thread_Lane_Resources.obj \
+	$(OBJDIR)\Thread_Lane_Resources_Manager.obj \
 	$(OBJDIR)\TimeBaseC.obj \
-	$(OBJDIR)\TimeBaseS.obj \
+	$(OBJDIR)\Transport.obj \
+	$(OBJDIR)\Transport_Cache_Manager.obj \
+	$(OBJDIR)\Transport_Descriptor_Interface.obj \
 	$(OBJDIR)\Transport_Mux_Strategy.obj \
+	$(OBJDIR)\Transport_Timer.obj \
+	$(OBJDIR)\TypeCodeFactory_Adapter.obj \
 	$(OBJDIR)\Typecode.obj \
 	$(OBJDIR)\Typecode_Constants.obj \
-	$(OBJDIR)\TypeCodeFactory_Adapter.obj \
-	$(OBJDIR)\Base_Transport_Property.obj \
 	$(OBJDIR)\ValueBase.obj \
 	$(OBJDIR)\ValueFactory.obj \
 	$(OBJDIR)\ValueFactory_Map.obj \
@@ -207,7 +196,19 @@ OBJFILES = \
 	$(OBJDIR)\Wait_On_Reactor.obj \
 	$(OBJDIR)\Wait_On_Read.obj \
 	$(OBJDIR)\Wait_Strategy.obj \
-	$(OBJDIR)\WrongTransactionC.obj
+	$(OBJDIR)\WrongTransactionC.obj \
+	$(OBJDIR)\append.obj \
+	$(OBJDIR)\corbafwd.obj \
+	$(OBJDIR)\debug.obj \
+	$(OBJDIR)\default_client.obj \
+	$(OBJDIR)\default_resource.obj \
+	$(OBJDIR)\default_server.obj \
+	$(OBJDIR)\iiop_endpoints.obj \
+	$(OBJDIR)\operation_details.obj \
+	$(OBJDIR)\operation_details.obj \
+	$(OBJDIR)\params.obj \
+	$(OBJDIR)\skip.obj \
+	$(OBJDIR)\target_specification.obj
 
 RESOURCE = $(OBJDIR)\tao.res
 
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
new file mode 100644
index 00000000000..f168abb1e14
--- /dev/null
+++ b/TAO/tao/New_Leader_Generator.h
@@ -0,0 +1,40 @@
+//=============================================================================
+/**
+ *  @file    New_Leader_Generator.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_NEW_LEADER_GENERATOR_H
+#define TAO_NEW_LEADER_GENERATOR_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_RT_New_Leader_Generator
+ *
+ * @brief Class for creating dynamic threads.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_New_Leader_Generator
+{
+public:
+
+  /// Leader/Follower class uses this method to notify the system that
+  /// we are out of leaders.
+  virtual void no_leaders_available (void) = 0;
+};
+
+#include "ace/post.h"
+
+#endif /* TAO_NEW_LEADER_GENERATOR_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 24c6c9143c0..5aed5d1328d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-
-
 #include "ORB.h"
 #include "ORB_Table.h"
 #include "Connector_Registry.h"
@@ -67,12 +65,8 @@ using std::set_unexpected;
 # include "ORB.i"
 #endif /* ! __ACE_INLINE__ */
 
-
-
 ACE_RCSID(tao, ORB, "$Id$")
 
-
-
 static const char ior_prefix [] = "IOR:";
 
 // = Static initialization.
@@ -972,7 +966,7 @@ CORBA_ORB::resolve_service (MCAST_SERVICEID mcast_service_id,
    this->string_to_object (service_ior.c_str (),
                            ACE_TRY_ENV);
  ACE_CHECK_RETURN (CORBA_Object::_nil ());
- 
+
  // Return ior.
  return return_value._retn ();
 }
@@ -1074,23 +1068,6 @@ CORBA_ORB::list_initial_services (CORBA::Environment &ACE_TRY_ENV)
   return this->orb_core ()->list_initial_references (ACE_TRY_ENV);
 }
 
-TAO_Stub *
-CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
-                               const char *type_id,
-                               CORBA::PolicyList *policy_list,
-                               TAO_Acceptor_Filter *filter,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  this->check_shutdown (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return this->orb_core_->create_stub_object (key,
-                                              type_id,
-                                              policy_list,
-                                              filter,
-                                              ACE_TRY_ENV);
-}
-
 void
 CORBA_ORB::check_shutdown (CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1264,7 +1241,7 @@ CORBA::ORB_init (int &argc,
                  const char *orbid,
                  CORBA_Environment &ACE_TRY_ENV)
 {
-  
+
   // Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
   // from being called within a static object CTOR.
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
@@ -1747,7 +1724,6 @@ CORBA_ORB::url_ior_string_to_object (const char* str,
   // Now make the TAO_Stub.
   TAO_Stub *data = this->orb_core_->create_stub ((char *) 0,
                                                  mprofile,
-                                                 this->orb_core_,
                                                  ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 953ce94aca5..e7d5831da9e 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -484,13 +484,6 @@ public:
   /// Resolve the POA.
   CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV);
 
-  /// Delegates on the ORB_Core to create a TAO_Stub.
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
-                                const char *type_id,
-                                CORBA::PolicyList *policy_list,
-                                TAO_Acceptor_Filter *acceptor_filter,
-                                CORBA_Environment &ACE_TRY_ENV);
-
   /// Initialize the ORB globals correctly, i.e., only when they
   /// haven't been initialized yet.
   static void init_orb_globals (CORBA_Environment &ACE_TRY_ENV =
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index c3f9eee9a41..27c233dfa41 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -11,9 +11,7 @@
 #include "debug.h"
 #include "MProfile.h"
 #include "Stub.h"
-#include "Reactor_Registry.h"
 #include "Leader_Follower.h"
-#include "Transport_Cache_Manager.h"
 #include "Connector_Registry.h"
 #include "Acceptor_Registry.h"
 
@@ -27,16 +25,15 @@
 #include "Invocation.h"
 #include "BiDir_Adapter.h"
 
-#include "Default_Stub_Factory.h"
-#include "Default_Endpoint_Selector_Factory.h"
-#include "Default_Protocols_Hooks.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "tao/Collocation_Resolver.h"
+#include "tao/Stub_Factory.h"
 
 #include "IORInfo.h"
 
 #include "Flushing_Strategy.h"
 
-#include "POA_Extension_Initializer.h"
-
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 # include "Buffering_Constraint_Policy.h"
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
@@ -73,6 +70,10 @@ TAO_ORB_Core::Sync_Scope_Hook TAO_ORB_Core::sync_scope_hook_ = 0;
 
 const char * TAO_ORB_Core::endpoint_selector_factory_name_ =
   "Default_Endpoint_Selector_Factory";
+const char * TAO_ORB_Core::thread_lane_resources_manager_factory_name_ =
+  "Default_Thread_Lane_Resources_Manager_Factory";
+const char * TAO_ORB_Core::collocation_resolver_name_ =
+  "Default_Collocation_Resolver";
 const char * TAO_ORB_Core::stub_factory_name_ =
   "Default_Stub_Factory";
 const char * TAO_ORB_Core::resource_factory_name_ =
@@ -91,11 +92,11 @@ const char * TAO_ORB_Core::poa_factory_directive_ =
   "dynamic TAO_POA Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory()";
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
-  : poa_extension_initializer_ (0),
-    protocols_hooks_ (0),
+  : protocols_hooks_ (0),
     lock_ (),
     connector_registry_ (0),
-    acceptor_registry_ (0),
+    thread_lane_resources_manager_ (0),
+    collocation_resolver_ (0),
     stub_factory_ (0),
     protocol_factories_ (0),
     implrepo_service_ (CORBA::Object::_nil ()),
@@ -114,17 +115,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     message_block_dblock_allocator_ (0),
     message_block_buffer_allocator_ (0),
     message_block_msgblock_allocator_ (0),
-    resource_factory_from_service_config_ (0),
-    // @@ This is not needed since the default resource factory, fredk
-    //    is statically added to the service configurator.
     client_factory_ (0),
-    client_factory_from_service_config_ (0),
-    // @@ This is not needed since the default client factory, fredk
-    //    is statically added to the service configurator.
     server_factory_ (0),
-    server_factory_from_service_config_ (0),
-    // @@ This is not needed since the default server factory, fredk
-    //    is statically added to the service configurator.
     opt_for_collocation_ (1),
     use_global_collocation_ (1),
     collocation_strategy_ (THRU_POA),
@@ -149,12 +141,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     use_tss_resources_ (0),
     tss_resources_ (),
     orb_resources_ (),
-    reactor_registry_ (0),
-    reactor_ (0),
     has_shutdown_ (1),
     thread_per_connection_use_timeout_ (1),
-    open_lock_ (),
-    open_called_ (0),
     endpoint_selector_factory_ (0),
     // Start the ORB in a  "shutdown" state.  Only after
     // CORBA::ORB_init() is called will the ORB no longer be shutdown.
@@ -173,11 +161,9 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     ior_interceptors_ (),
     parser_registry_ (),
-    transport_cache_ (0),
     bidir_adapter_ (0),
     bidir_giop_policy_ (0),
-    flushing_strategy_ (0),
-    corba_priority_normalizer_ (0)
+    flushing_strategy_ (0)
 {
 #if defined(ACE_MVS)
   ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859);
@@ -209,15 +195,13 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 
   ACE_NEW (this->transport_sync_strategy_,
            TAO_Transport_Sync_Strategy);
-
-  ACE_NEW (this->corba_priority_normalizer_,
-           TAO_CORBA_Priority_Normalizer);
 }
 
 TAO_ORB_Core::~TAO_ORB_Core (void)
 {
+  delete this->thread_lane_resources_manager_;
+
   delete this->flushing_strategy_;
-  delete this->transport_cache_;
 
   ACE_OS::free (this->orbid_);
 
@@ -240,10 +224,6 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
   delete this->transport_sync_strategy_;
-
-  delete this->poa_extension_initializer_;
-
-  delete this->corba_priority_normalizer_;
 }
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -909,10 +889,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   else
     this->use_tss_resources_ = use_tss_resources;
 
-  this->reactor_registry_ =
-    trf->get_reactor_registry ();
-  this->reactor_registry_->open (this);
-
   // @@ ????
   // Make sure the reactor is initialized...
   ACE_Reactor *reactor = this->reactor ();
@@ -1030,11 +1006,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   // Initialize the flushing strategy
   this->flushing_strategy_ = trf->create_flushing_strategy ();
 
-  // Create the purging strategy
-  ACE_NEW_RETURN(this->transport_cache_,
-                 TAO_Transport_Cache_Manager(trf),
-                 -1);
-
   // Now that we have a complete list of available protocols and their
   // related factory objects, set default policies and initialize the
   // registries!
@@ -1054,19 +1025,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
                         CORBA::COMPLETED_NO),
                       -1);
 
-  // Open the Transport Cache
-  // @@ This seems to be a nice place to configure the transport
-  // cache for the number of allowed entries
-  if (this->transport_cache_->open (this) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
   // Initialize the connector registry and create a connector for each
   // configured protocol.
   if (this->connector_registry ()->open (this) != 0)
@@ -1083,7 +1041,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
             this,
             this->orb_params ()->preconnects ());
 
-
   // Look for BiDirectional library here. If the user has svc.conf
   // file, load the library at this point.
   int ret = this->bidirectional_giop_init (ACE_TRY_ENV);
@@ -1153,56 +1110,11 @@ TAO_ORB_Core::fini (void)
       delete this->connector_registry_;
     }
 
-  // Ask the registry to close all registered acceptors.
-  if (this->acceptor_registry_ != 0)
-    {
-      this->acceptor_registry_->close_all ();
-      delete this->acceptor_registry_;
-    }
-
-  // Set of file descriptors corresponding to open connections.  This
-  // handle set is used to explicitly deregister the connection event
-  // handlers from the Reactor.  This is particularly important for
-  // dynamically loaded ORBs where an application level reactor, such
-  // as the Singleton reactor, is used instead of an ORB created one.
-
-  ACE_Handle_Set handle_set;
-  TAO_EventHandlerSet unregistered;
-
-  // Close the transport cache and return the handle set that needs
-  // to be de-registered from the reactor.
-  if (this->transport_cache_ != 0)
-    {
-      this->transport_cache_->close (handle_set, unregistered);
-    }
-
-  // Shutdown all open connections that are registered with the ORB
-  // Core.  Note that the ACE_Event_Handler::DONT_CALL mask is NOT
-  // used here since the reactor should invoke each handle's
-  // corresponding ACE_Event_Handler::handle_close() method to ensure
-  // that the connection is shutdown gracefully prior to destroying
-  // the ORB Core.
-  if (handle_set.num_set () > 0)
-    (void) this->reactor ()->remove_handler (handle_set,
-                                             ACE_Event_Handler::ALL_EVENTS_MASK);
-  if (!unregistered.is_empty ())
-    {
-      ACE_Event_Handler** eh;
-      for (TAO_EventHandlerSetIterator iter(unregistered);
-           iter.next (eh); iter.advance())
-        {
-          (*eh)->handle_close (ACE_INVALID_HANDLE,
-                               ACE_Event_Handler::ALL_EVENTS_MASK);
-        }
-    }
-  // Pass reactor back to the resource factory.
-  if (this->resource_factory_ != 0)
-    this->resource_factory_->reclaim_reactor (this->reactor_);
+  // Finalize lane resources.
+  this->thread_lane_resources_manager ().finalize ();
 
   (void) TAO_Internal::close_services ();
 
-  delete this->reactor_registry_;
-
   if (this->message_block_dblock_allocator_)
     this->message_block_dblock_allocator_->remove ();
   delete this->message_block_dblock_allocator_;
@@ -1215,58 +1127,31 @@ TAO_ORB_Core::fini (void)
     this->message_block_msgblock_allocator_->remove ();
   delete this->message_block_msgblock_allocator_;
 
-  // @@ This is not needed since the default resource factory
-  //    is statically added to the service configurator, fredk
-  if (!this->resource_factory_from_service_config_)
-    delete resource_factory_;
-
-  // @@ This is not needed since the default client factory
-  //    is statically added to the service configurator, fredk
-  if (!this->client_factory_from_service_config_)
-    delete client_factory_;
-
-  // @@ This is not needed since the default server factory
-  //    is statically added to the service configurator, fredk
-  if (!this->server_factory_from_service_config_)
-    delete server_factory_;
-
   delete this;
 
   return 0;
 }
 
-TAO_CORBA_Priority_Normalizer::~TAO_CORBA_Priority_Normalizer (void)
-{
-}
-
-CORBA::Boolean
-TAO_CORBA_Priority_Normalizer::normalize (CORBA::Short corba_priority,
-                                          CORBA::Short &normalized_corba_priority)
-{
-  normalized_corba_priority = corba_priority;
-  return 1;
-}
-
-TAO_CORBA_Priority_Normalizer *
-TAO_ORB_Core::corba_priority_normalizer (void) const
+void
+TAO_ORB_Core::set_thread_lane_resources_manager_factory (const char *thread_lane_resources_manager_factory_name)
 {
-  return this->corba_priority_normalizer_;
+  TAO_ORB_Core::thread_lane_resources_manager_factory_name_ =
+    thread_lane_resources_manager_factory_name;
 }
 
 void
-TAO_ORB_Core::corba_priority_normalizer (TAO_CORBA_Priority_Normalizer *new_normalizer)
+TAO_ORB_Core::set_collocation_resolver (const char *collocation_resolver_name)
 {
-  delete this->corba_priority_normalizer_;
-  this->corba_priority_normalizer_ = new_normalizer;
+  TAO_ORB_Core::collocation_resolver_name_ =
+    collocation_resolver_name;
 }
 
 void
-TAO_ORB_Core::set_stub_factory(const char *stub_factory_name)
+TAO_ORB_Core::set_stub_factory (const char *stub_factory_name)
 {
   TAO_ORB_Core::stub_factory_name_ = stub_factory_name;
 }
 
-
 void
 TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 {
@@ -1312,47 +1197,51 @@ TAO_ORB_Core::typecodefactory_adapter_name (void)
 TAO_Resource_Factory *
 TAO_ORB_Core::resource_factory (void)
 {
-  if (this->resource_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->resource_factory_ =
-        ACE_Dynamic_Service<TAO_Resource_Factory>::instance
-        (TAO_ORB_Core::resource_factory_name_);
-      // @@ Not needed!
-      this->resource_factory_from_service_config_ = 1;
-    }
+  // Check if there is a cached reference.
+  if (this->resource_factory_ != 0)
+    return this->resource_factory_;
 
-  //@@ None of this stuff is needed since the default resource factory
-  //   is statically adde to the Service Configurator!
-  if (this->resource_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("(%P|%t) WARNING - No Resource Factory found ")
-                    ACE_TEXT ("in Service Repository.\n")
-                    ACE_TEXT ("  Using default instance with GLOBAL resource ")
-                    ACE_TEXT ("source specifier.\n")));
-
-      TAO_Default_Resource_Factory *default_factory;
-      ACE_NEW_RETURN (default_factory,
-                      TAO_Default_Resource_Factory,
-                      0);
-
-      // @@ Not needed.
-      this->resource_factory_from_service_config_ = 0;
-      this->resource_factory_ = default_factory;
-
-      // @@ At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
+  // Look in the service repository for an instance.
+  this->resource_factory_ =
+    ACE_Dynamic_Service<TAO_Resource_Factory>::instance
+    (TAO_ORB_Core::resource_factory_name_);
 
   return this->resource_factory_;
 }
 
+TAO_Thread_Lane_Resources_Manager &
+TAO_ORB_Core::thread_lane_resources_manager (void)
+{
+  // Check if there is a cached reference.
+  if (this->thread_lane_resources_manager_ != 0)
+    return *this->thread_lane_resources_manager_;
+
+  // If not, lookup the corresponding factory and ask it to make one.
+  TAO_Thread_Lane_Resources_Manager_Factory *factory =
+    ACE_Dynamic_Service<TAO_Thread_Lane_Resources_Manager_Factory>::instance
+    (TAO_ORB_Core::thread_lane_resources_manager_factory_name_);
+
+  this->thread_lane_resources_manager_ =
+    factory->create_thread_lane_resources_manager (*this);
+
+  return *this->thread_lane_resources_manager_;
+}
+
+TAO_Collocation_Resolver &
+TAO_ORB_Core::collocation_resolver (void)
+{
+  // Check if there is a cached reference.
+  if (this->collocation_resolver_ != 0)
+    return *this->collocation_resolver_;
+
+  // If not, lookup it up.
+  this->collocation_resolver_ =
+    ACE_Dynamic_Service<TAO_Collocation_Resolver>::instance
+    (TAO_ORB_Core::collocation_resolver_name_);
+
+  return *this->collocation_resolver_;
+}
+
 TAO_Stub_Factory *
 TAO_ORB_Core::stub_factory (void)
 {
@@ -1365,38 +1254,12 @@ TAO_ORB_Core::stub_factory (void)
     ACE_Dynamic_Service<TAO_Stub_Factory>::instance
     (TAO_ORB_Core::stub_factory_name_);
 
-  // If there still isn't a reference, allocate the default.
-  if (this->stub_factory_ == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("(%P|%t) WARNING - No Stub Factory found ")
-                    ACE_TEXT ("in Service Repository.\n")
-                    ACE_TEXT ("  Using default instance with GLOBAL resource ")
-                    ACE_TEXT ("source specifier.\n")));
-
-      // @@ RTCORBA Subsetting: The following comment probably should say
-      //    this if this doesn't work, a segmentation fault will be quickly
-      //    generated...
-
-      // This will throw an exception if it fails on exception-throwing
-      // platforms.
-      TAO_Stub_Factory *stub_factory;
-      ACE_NEW_RETURN (stub_factory,
-                      TAO_Default_Stub_Factory,
-                      0);
-
-      // Store a copy for later use.
-      this->stub_factory_ = stub_factory;
-    }
-
   return this->stub_factory_;
 }
 
 void
-TAO_ORB_Core::set_poa_factory (
-                    const char *poa_factory_name,
-                    const char *poa_factory_directive)
+TAO_ORB_Core::set_poa_factory (const char *poa_factory_name,
+                               const char *poa_factory_directive)
 {
   TAO_ORB_Core::poa_factory_name_ = poa_factory_name;
   TAO_ORB_Core::poa_factory_directive_ = poa_factory_directive;
@@ -1404,8 +1267,7 @@ TAO_ORB_Core::set_poa_factory (
 
 
 void
-TAO_ORB_Core::set_endpoint_selector_factory (
-                    const char *endpoint_selector_factory_name)
+TAO_ORB_Core::set_endpoint_selector_factory (const char *endpoint_selector_factory_name)
 {
   TAO_ORB_Core::endpoint_selector_factory_name_ =
     endpoint_selector_factory_name;
@@ -1423,31 +1285,6 @@ TAO_ORB_Core::endpoint_selector_factory (void)
     ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory>::instance
     (TAO_ORB_Core::endpoint_selector_factory_name_);
 
-  // If there still isn't a reference, allocate the default.
-  if (this->endpoint_selector_factory_ == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("(%P|%t) WARNING - No Endpoint Selector Factory found ")
-                    ACE_TEXT ("in Service Repository.\n")
-                    ACE_TEXT ("  Using default instance with GLOBAL resource ")
-                    ACE_TEXT ("source specifier.\n")));
-
-      // @@ RTCORBA Subsetting: The following comment probably should say
-      //    this if this doesn't work, a segmentation fault will be quickly
-      //    generated...
-
-      // This will throw an exception if it fails on exception-throwing
-      // platforms.
-      TAO_Endpoint_Selector_Factory *selector_factory;
-      ACE_NEW_RETURN (selector_factory,
-                      TAO_Default_Endpoint_Selector_Factory,
-                      0);
-
-      // Store a copy for later use.
-      this->endpoint_selector_factory_ = selector_factory;
-    }
-
   return this->endpoint_selector_factory_;
 }
 
@@ -1469,28 +1306,6 @@ TAO_ORB_Core::get_protocols_hooks (CORBA::Environment &ACE_TRY_ENV)
     ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance
     (TAO_ORB_Core::protocols_hooks_name_);
 
-  //@@ None of this stuff is needed since the default client factory
-  //   is statically added to the Service Configurator, fredk
-  // If there still isn't a reference, allocate the default.
-  if (this->protocols_hooks_ == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("(%P|%t) WARNING - No Protocols Hooks found ")
-                    ACE_TEXT ("in Service Repository.\n")
-                    ACE_TEXT ("  Using default instance with GLOBAL resource ")
-                    ACE_TEXT ("source specifier.\n")));
-
-      TAO_Protocols_Hooks *protocols_hooks;
-      ACE_NEW_THROW_EX (protocols_hooks,
-                        TAO_Default_Protocols_Hooks,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      // Store a copy for later use.
-      this->protocols_hooks_ = protocols_hooks;
-    }
-
   // Initialize the protocols hooks instance.
   this->protocols_hooks_->init_hooks (this,
                                       ACE_TRY_ENV);
@@ -1504,14 +1319,14 @@ TAO_ORB_Core::bidirectional_giop_init (CORBA::Environment &ACE_TRY_ENV)
   if (this->bidir_adapter_ == 0)
     {
       this->bidir_adapter_ =
-      ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance ("BiDirGIOP_Loader");
+        ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance ("BiDirGIOP_Loader");
     }
 
   if (this->bidir_adapter_)
-      return this->bidir_adapter_->activate (this->orb_.in (),
-                                             0,
-                                             0,
-                                             ACE_TRY_ENV);
+    return this->bidir_adapter_->activate (this->orb_.in (),
+                                           0,
+                                           0,
+                                           ACE_TRY_ENV);
   else
     return 0;
 }
@@ -1622,34 +1437,9 @@ TAO_ORB_Core::client_factory (void)
     {
       // Look in the service repository for an instance.
       this->client_factory_ =
-        ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance (
-                                                                    "Client_Strategy_Factory");
-      // @@ Not needed!
-      this->client_factory_from_service_config_ = 1;
+        ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ("Client_Strategy_Factory");
     }
 
-  //@@ None of this stuff is needed since the default client factory
-  //   is statically added to the Service Configurator, fredk
-  if (this->client_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("(%P|%t) WARNING - No Client Strategy Factory found ")
-                    ACE_TEXT ("in Service Repository.\n")
-                    ACE_TEXT ("  Using default instance.\n")));
-
-      ACE_NEW_RETURN (this->client_factory_,
-                      TAO_Default_Client_Strategy_Factory,
-                      0);
-
-      this->client_factory_from_service_config_ = 0;
-      // At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
   return this->client_factory_;
 }
 
@@ -1660,35 +1450,7 @@ TAO_ORB_Core::server_factory (void)
     {
       // Look in the service repository for an instance.
       this->server_factory_ =
-        ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance (
-                                                                    "Server_Strategy_Factory");
-      // @@ Not needed!
-      this->server_factory_from_service_config_ = 1;
-    }
-
-  //@@ None of this stuff is needed since the default server factory
-  //   is statically added to the Service Configurator, fredk
-
-  // If the <server_factory_> isn't found it's usually because the ORB
-  // hasn't been intialized correctly...
-  if (this->server_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_WARNING,
-                    ACE_TEXT ("(%P|%t) WARNING - No %s found in Service Repository.")
-                    ACE_TEXT ("  Using default instance.\n"),
-                    ACE_TEXT ("Server Strategy Factory")));
-
-      ACE_NEW_RETURN (this->server_factory_,
-                      TAO_Default_Server_Strategy_Factory,
-                      0);
-
-      // @@ Not needed!
-      this->server_factory_from_service_config_ = 0;
-      // At this point we need to register this with the
-      // <Service_Repository> to get it cleaned up properly.  But, for
-      // now we let it leak.
+        ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ("Server_Strategy_Factory");
     }
 
   return this->server_factory_;
@@ -1709,30 +1471,6 @@ TAO_ORB_Core::inherit_from_parent_thread (
 
   if (tss_resources == 0)
     return -1;
-#if 0
-  if (tss_resources->reactor_ != 0)
-    {
-      // We'll use the spawning thread's reactor.
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss->reactor_ != 0 && TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) non nil reactor on thread startup!\n"));
-
-          if (tss == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%P|%t) %p\n",
-                               "TAO_ORB_Core::inherit_from_parent_thread"
-                               " (); no more TSS keys"),
-                              -1);
-
-          if (/* tss->owns_resources_ != 0 && */ !tss->inherited_reactor_)
-            delete tss->reactor_;
-        }
-      tss->reactor_ = tss_resources->reactor_;
-      tss->inherited_reactor_ = 1;
-    }
-#endif /* 0 */
   return 0;
 }
 
@@ -1788,15 +1526,14 @@ TAO_ORB_Core::poa_adapter (void)
 }
 
 TAO_Stub *
-TAO_ORB_Core::create_stub(const char *repository_id,
-                          const TAO_MProfile &profiles,
-                          TAO_ORB_Core *orb_core,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::create_stub (const char *repository_id,
+                           const TAO_MProfile &profiles,
+                           CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Stub *retval =
     this->stub_factory ()->create_stub (repository_id,
                                         profiles,
-                                        orb_core,
+                                        this,
                                         ACE_TRY_ENV);
   ACE_CHECK_RETURN(0);
   return retval;
@@ -1804,60 +1541,27 @@ TAO_ORB_Core::create_stub(const char *repository_id,
 
 
 TAO_Stub *
-TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key,
+TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
                                   const char *type_id,
                                   CORBA::PolicyList *policy_list,
-                                  TAO_Acceptor_Filter *filter,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  (void) this->open (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  TAO_Stub *stub = 0;
-
-  // Create a profile container and have Acceptor_Registry populate it
-  // with profiles as appropriate.
-  TAO_MProfile mp (0);
-  if (this->acceptor_registry ()->make_mprofile (key, mp, filter) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_MPROFILE_CREATION_ERROR,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  // Make sure we have at least one profile.  <mp> may end up being
-  // empty if none of the acceptor endpoints have the right priority
-  // for this object, for example.
-  if (mp.profile_count () == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_MPROFILE_CREATION_ERROR,
-                            0 ),
-                          CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  //  Add the Polices contained in "policy_list" to each profile
-  //  so that those policies will be exposed to the client in the IOR.
-  //  In particular each CORBA::Policy has to be converted in to
-  //  Messaging::PolicyValue, and then all the Messaging::PolicyValue
-  //  should be embedded inside a Messaging::PolicyValueSeq which became
-  //  in turns the "body" of the IOP::TaggedComponent. This conversion
-  //  is a responsability of the CORBA::Profile class.
-  //  (See orbos\98-05-05.pdf Section 5.4)
-
+  // Add the Polices contained in "policy_list" to each profile so
+  // that those policies will be exposed to the client in the IOR.  In
+  // particular each CORBA::Policy has to be converted in to
+  // Messaging::PolicyValue, and then all the Messaging::PolicyValue
+  // should be embedded inside a Messaging::PolicyValueSeq which
+  // became in turns the "body" of the IOP::TaggedComponent. This
+  // conversion is a responsability of the CORBA::Profile class.  (See
+  // orbos\98-05-05.pdf Section 5.4)
   if (policy_list->length () != 0)
     {
       TAO_Profile * profile;
 
-      for (CORBA::ULong i = 0; i < mp.profile_count (); ++i)
+      for (CORBA::ULong i = 0; i < mprofile.profile_count (); ++i)
         {
           // Get the ith profile
-          profile = mp.get_profile (i);
+          profile = mprofile.get_profile (i);
           profile->policies (policy_list, ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
         }
@@ -1866,11 +1570,11 @@ TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key,
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
   // for this servant.
-  this->establish_components (mp, policy_list, ACE_TRY_ENV);
+  this->establish_components (mprofile, policy_list, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   // Done creating profiles.  Initialize a TAO_Stub object with them.
-  stub = this->create_stub (type_id, mp, this, ACE_TRY_ENV);
+  TAO_Stub *stub = this->create_stub (type_id, mprofile, ACE_TRY_ENV);
   ACE_CHECK_RETURN (stub);
 
   stub->base_profiles ().policy_list (policy_list);
@@ -2012,9 +1716,6 @@ TAO_ORB_Core::create_collocated_object (TAO_Stub *stub,
 int
 TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
 {
-  if (this->acceptor_registry_ == 0)
-    return 0;
-
   // @@ Lots of issues arise when dealing with collocation.  What about
   //    forwarding or what if this is a multi-profile IOR where the order is
   //    significant and only one of the profiles is collocated.  For example
@@ -2026,7 +1727,7 @@ TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
   //    address (ORB Host) but not the object_key.  This should be checked
   //    also.
 
-  return this->acceptor_registry_->is_collocated (mprofile);
+  return this->thread_lane_resources_manager ().is_collocated (mprofile);
 }
 
 // ****************************************************************
@@ -2034,33 +1735,24 @@ TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
 TAO_Leader_Follower &
 TAO_ORB_Core::leader_follower (void)
 {
-  return this->reactor_registry_->leader_follower ();
+  return this->lane_resources ().leader_follower ();
 }
 
 TAO_LF_Strategy &
 TAO_ORB_Core::lf_strategy (void)
 {
-  return this->reactor_registry_->lf_strategy ();
+  return this->thread_lane_resources_manager ().lf_strategy ();
 }
 
 int
 TAO_ORB_Core::run (ACE_Time_Value *tv,
                    int perform_work,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   CORBA::Environment &)
 {
   if (TAO_debug_level >= 3)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO (%P|%t) - start of run/perform_work\n")));
 
-  // This method should only be called by servers, so now we set up
-  // for listening!
-
-  int ret = this->open (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (ret == -1)
-    return -1;
-
   // Fetch the Reactor
   ACE_Reactor *r = this->reactor ();
 
@@ -2158,14 +1850,17 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
     {
       this->adapter_registry_.check_close (wait_for_completion,
                                            ACE_TRY_ENV);
+      ACE_CHECK;
+
       this->adapter_registry_.close (wait_for_completion,
                                      ACE_TRY_ENV);
+      ACE_CHECK;
 
       // Set the shutdown flag
       this->has_shutdown_ = 1;
 
-      // Shutdown all the reactors....
-      this->reactor_registry_->shutdown_all ();
+      // Shutdown reactor.
+      this->thread_lane_resources_manager ().shutdown_reactor ();
 
       // Grab the thread manager
       ACE_Thread_Manager *tm = this->thr_mgr ();
@@ -2260,31 +1955,10 @@ TAO_ORB_Core::destroy_interceptors (CORBA::Environment &ACE_TRY_ENV)
     }
 }
 
-// Set up listening endpoints.
-int
-TAO_ORB_Core::open (CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Lane_Resources &
+TAO_ORB_Core::lane_resources (void)
 {
-  // Double check pattern
-  if (this->open_called_ == 1)
-    return 1;
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, tao_mon, this->open_lock_, -1);
-
-  if (this->open_called_ == 1)
-    return 1;
-
-  TAO_Acceptor_Registry *ar = this->acceptor_registry ();
-  // get a reference to the acceptor_registry!
-
-  int ret = ar->open (this, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (ret == -1)
-    return -1;
-
-  this->open_called_ = 1;
-
-  return 0;
+  return this->thread_lane_resources_manager ().lane_resources ();
 }
 
 void
@@ -2861,40 +2535,7 @@ TAO_ORB_Core::create_data_block_i (size_t size,
 ACE_Reactor *
 TAO_ORB_Core::reactor (void)
 {
-  if (this->reactor_registry_ != 0)
-    return this->reactor_registry_->reactor ();
-
-  if (this->reactor_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->reactor_ == 0)
-        {
-          this->reactor_ =
-            this->resource_factory ()->get_reactor ();
-        }
-    }
-  return this->reactor_;
-}
-
-ACE_Reactor *
-TAO_ORB_Core::reactor (TAO_Acceptor *acceptor)
-{
-  if (this->reactor_registry_ != 0)
-    return this->reactor_registry_->reactor (acceptor);
-
-  // @@ ????
-  if (this->reactor_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->reactor_ == 0)
-        {
-          this->reactor_ =
-            this->resource_factory ()->get_reactor ();
-        }
-    }
-  return this->reactor_;
+  return this->leader_follower ().reactor ();
 }
 
 CORBA::Object_ptr
@@ -3079,16 +2720,6 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type)
 
 #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */
 
-void
-TAO_ORB_Core::add_poa_extension_initializer (TAO_POA_Extension_Initializer *initializer)
-{
-  if (this->poa_extension_initializer_)
-    this->poa_extension_initializer_->add_initializer (initializer);
-  else
-    this->poa_extension_initializer_ = initializer;
-}
-
-
 // ****************************************************************
 
 TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
@@ -3097,11 +2728,9 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
     output_cdr_msgblock_allocator_ (0),
     input_cdr_dblock_allocator_ (0),
     input_cdr_buffer_allocator_ (0),
-    transport_cache_ (0),
     event_loop_thread_ (0),
     client_leader_thread_ (0),
-    reactor_registry_ (0),
-    reactor_registry_cookie_ (0),
+    lane_ (0),
     ts_objects_ (),
     orb_core_ (0)
 {
@@ -3129,13 +2758,6 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
     this->input_cdr_buffer_allocator_->remove ();
   delete this->input_cdr_buffer_allocator_;
 
-  // UNIMPLEMENTED delete this->transport_cache__;
-  this->transport_cache_ = 0;
-
-  if (this->reactor_registry_ != 0)
-    this->reactor_registry_->destroy_tss_cookie (
-      this->reactor_registry_cookie_);
-
   //@@ This is broken on platforms that use TSS emulation since this
   //   destructor is invoked after the ORB.  Since we're under
   //   pressure to release a beta, we'll have to leak the TSS objects
@@ -3213,29 +2835,40 @@ TAO_ORB_Core_instance (void)
 
 
 int
-TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object)
+TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object,
+                                    CORBA::Environment &ACE_TRY_ENV)
 {
 
   TAO_Stub *stub = object->_stubobj ();
   if (!CORBA::is_nil (stub->servant_orb_var ().in ()) &&
-      stub->servant_orb_var ()->orb_core () != 0 &&
-      object->_is_collocated () == 1)
+      stub->servant_orb_var ()->orb_core () != 0)
     {
-      switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+      TAO_ORB_Core *orb_core =
+        stub->servant_orb_var ()->orb_core ();
+
+      int collocated =
+        orb_core->collocation_resolver ().is_collocated (object,
+                                                         ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+
+      if (collocated)
         {
-        case THRU_POA:
-          return TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY;
-
-        case DIRECT:
-          {
-            /////////////////////////////////////////////////////////////
-            // If the servant is null and you are collocated this means
-            // that the POA policy NON-RETAIN is set, and with that policy
-            // using the DIRECT collocation strategy is just insane.
-            /////////////////////////////////////////////////////////////
-            ACE_ASSERT (object->_servant () != 0);
-            return TAO_Collocation_Strategies::CS_DIRECT_STRATEGY;
-          }
+          switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+            {
+            case THRU_POA:
+              return TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY;
+
+            case DIRECT:
+              {
+                /////////////////////////////////////////////////////////////
+                // If the servant is null and you are collocated this means
+                // that the POA policy NON-RETAIN is set, and with that policy
+                // using the DIRECT collocation strategy is just insane.
+                /////////////////////////////////////////////////////////////
+                ACE_ASSERT (object->_servant () != 0);
+                return TAO_Collocation_Strategies::CS_DIRECT_STRATEGY;
+              }
+            }
         }
     }
 
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 0eedb77f8fb..5fafafb8263 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -48,7 +48,6 @@
 // Forward declarations
 class TAO_Acceptor;
 class TAO_Connector;
-class TAO_Acceptor_Registry;
 class TAO_Connector_Registry;
 
 class TAO_Resource_Factory;
@@ -57,7 +56,6 @@ class TAO_Server_Strategy_Factory;
 class TAO_Transport_Cache_Manager;
 
 class TAO_TSS_Resources;
-class TAO_Reactor_Registry;
 class TAO_Leader_Follower;
 class TAO_LF_Strategy;
 class TAO_RT_ORB;
@@ -74,10 +72,14 @@ class TAO_BiDir_Adapter;
 
 class TAO_Flushing_Strategy;
 
+class TAO_Thread_Lane_Resources_Manager;
+class TAO_Collocation_Resolver;
+class TAO_Thread_Lane_Resources;
 class TAO_Stub_Factory;
 class TAO_Endpoint_Selector_Factory;
 class TAO_Service_Context;
 
+
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
 class TAO_Buffering_Constraint_Policy;
@@ -89,8 +91,6 @@ class TAO_Delayed_Buffering_Sync_Strategy;
 class TAO_Transport_Sync_Strategy;
 class TAO_Sync_Strategy;
 
-class TAO_POA_Extension_Initializer;
-
 // ****************************************************************
 
 /**
@@ -139,11 +139,6 @@ public:
   ACE_Allocator *input_cdr_msgblock_allocator_;
   //@}
 
-  /// This is is just a place holder, in the future the transport
-  /// cache will be separated from the connectors and it will be a
-  /// (potentially) TSS object.
-  TAO_Transport_Cache_Manager *transport_cache_;
-
   /// Counter for how (nested) calls this thread has made to run the
   /// event loop.
   int event_loop_thread_;
@@ -152,12 +147,8 @@ public:
   /// leader.
   int client_leader_thread_;
 
-  /// The Reactor Holder that we should callback when destroying the
-  /// cookie.
-  TAO_Reactor_Registry *reactor_registry_;
-
-  /// A TSS magic cookie used by the Reactor_Registry
-  void *reactor_registry_cookie_;
+  /// Lane for this thread.
+  void *lane_;
 
   /// Generic container for thread-specific objects.
   ACE_Array_Base<void *> ts_objects_;
@@ -171,25 +162,6 @@ public:
 // ****************************************************************
 
 /**
- * @class TAO_CORBA_Priority_Normalizer
- *
- * @brief Used to keep Strategy library separate from the RT library.
- **/
-class TAO_Export TAO_CORBA_Priority_Normalizer
-{
-public:
-
-  /// Virtual destructor
-  virtual ~TAO_CORBA_Priority_Normalizer (void);
-
-  /// Normalize CORBA Priority
-  virtual CORBA::Boolean normalize (CORBA::Short corba_priority,
-                                    CORBA::Short &normalized_corba_priority);
-};
-
-// ****************************************************************
-
-/**
  * @class TAO_ORB_Core
  *
  * @brief Encapsulates the state of an ORB.
@@ -241,9 +213,6 @@ public:
   ///Get the connector registry
   TAO_Connector_Registry *connector_registry (void);
 
-  ///Get the acceptor registry
-  TAO_Acceptor_Registry  *acceptor_registry  (void);
-
   ///Get the IOR parser registry
   TAO_Parser_Registry *parser_registry (void);
 
@@ -259,7 +228,6 @@ public:
 
   /// Wrappers that forward the request to the concurrency strategy.
   ACE_Reactor *reactor (void);
-  ACE_Reactor *reactor (TAO_Acceptor *acceptor);
 
   /// Get the ACE_Thread_Manager
   ACE_Thread_Manager *thr_mgr (void);
@@ -270,20 +238,6 @@ public:
   /// Get the adapter registry
   TAO_Adapter_Registry *adapter_registry (void);
 
-  /// Add a POA extension initializer.  The ORB Core takes ownership of
-  /// the passed in instance.
-  void add_poa_extension_initializer (TAO_POA_Extension_Initializer *initializer);
-
-  /// Get the POA extension initializers.
-  TAO_POA_Extension_Initializer *poa_extension_initializer (void);
-
-  /// Get the priority normalizer.
-  TAO_CORBA_Priority_Normalizer *corba_priority_normalizer (void) const;
-
-  /// Set the priority normalizer.  Takes over the memory management
-  //of <new_normalizer>: <new_normalizer> will be deleted.
-  void corba_priority_normalizer (TAO_CORBA_Priority_Normalizer *new_normalizer);
-
   /// @name Collocation Strategies
   //@{
   enum
@@ -306,8 +260,8 @@ public:
    * @note
    * No-Collocation is a special case of collocation.
    */
-  static int collocation_strategy (
-    CORBA::Object_ptr object);
+  static int collocation_strategy (CORBA::Object_ptr object,
+                                   CORBA::Environment &ACE_TRY_ENV);
   //@}
 
   /**
@@ -397,13 +351,26 @@ public:
   /// Returns pointer to the Protocol_Hooks.
   TAO_Protocols_Hooks *protocols_hooks (void);
 
+  /// Returns a pointer to the Thread Lane Resources Manager.
+  TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (void);
+
+  /// Returns a pointer to the Collocation Resolver.
+  TAO_Collocation_Resolver &collocation_resolver (void);
+
   /// Returns a pointer to the Stub factory.
   TAO_Stub_Factory *stub_factory (void);
 
   /// Returns a pointer to the endpoint selector factory.
   TAO_Endpoint_Selector_Factory *endpoint_selector_factory (void);
+
   //@}
 
+  /// Sets the value of TAO_ORB_Core::thread_lane_resources_manager_factory_name_
+  static void set_thread_lane_resources_manager_factory (const char *thread_lane_resources_manager_factory_name);
+
+  /// Sets the value of TAO_ORB_Core::collocation_resolver_name_
+  static void set_collocation_resolver (const char *collocation_resolver_name);
+
   /// Sets the value of TAO_ORB_Core::stub_factory_name_
   static void set_stub_factory (const char *stub_factory_name);
 
@@ -606,9 +573,6 @@ public:
   /// This strategy will sync with the transport.
   TAO_Transport_Sync_Strategy &transport_sync_strategy (void);
 
-  /// Pointer to chain of POA extension initializers.
-  TAO_POA_Extension_Initializer *poa_extension_initializer_;
-
   /// Handle to the factory for protocols_hooks_..
   TAO_Protocols_Hooks *protocols_hooks_;
 
@@ -643,6 +607,9 @@ public:
   /// Get access to the leader follower strategy.
   TAO_LF_Strategy &lf_strategy (void);
 
+  /// Get access to the thread lane resources.
+  TAO_Thread_Lane_Resources &lane_resources (void);
+
   /// Run the event loop.
   int run (ACE_Time_Value *tv,
            int perform_work,
@@ -668,10 +635,9 @@ public:
 
   /// Makes sure that the ORB is open and then creates a TAO_Stub
   /// based on the endpoint.
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
+  TAO_Stub *create_stub_object (TAO_MProfile &mprofile,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
-                                TAO_Acceptor_Filter *filter,
                                 CORBA::Environment &ACE_TRY_ENV);
 
   /// Factory method that create the "right" Stub depending on
@@ -680,7 +646,6 @@ public:
   /// on the fact that RTCORBA is being used or not.
   TAO_Stub *create_stub (const char *repository_id,
                          const TAO_MProfile &profiles,
-                         TAO_ORB_Core *orb_core,
                          CORBA::Environment &ACE_TRY_ENV);
 
 
@@ -860,14 +825,6 @@ public:
   TAO_IORInterceptor_List::TYPE & ior_interceptors (void);
   //@}
 
-  /// Set up the ORB Core's acceptor to listen on the
-  /// previously-specified port for requests.  Returns -1 on failure,
-  /// otherwise 0.
-  int open (CORBA::Environment &ACE_TRY_ENV);
-
-  /// Return the underlying transport cache
-  TAO_Transport_Cache_Manager *transport_cache (void);
-
   /// Call the bidir_giop library to parse the policy.
   int parse_bidir_policy (CORBA::Policy_ptr policy,
                           CORBA::Environment &ACE_TRY_ENV);
@@ -972,9 +929,9 @@ protected:
   /// themselves with.
   TAO_Connector_Registry *connector_registry_;
 
-  /// The registry which maintains a list of acceptor factories for
-  /// each loaded protocol.
-  TAO_Acceptor_Registry *acceptor_registry_;
+  TAO_Thread_Lane_Resources_Manager *thread_lane_resources_manager_;
+
+  TAO_Collocation_Resolver *collocation_resolver_;
 
   TAO_Stub_Factory *stub_factory_;
 
@@ -1051,6 +1008,20 @@ protected:
   // called to set the value to be "RT_Endpoint_Selector_Factory".
   static const char *endpoint_selector_factory_name_;
 
+  // Name of the thread lane resources manager that needs to be
+  // instantiated.  The default value is
+  // "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA
+  // is linked, the set_thread_lane_resources_manager will be called
+  // to set the value to be
+  // "RT_Thread_Lane_Resources_Manager_Factory".
+  static const char *thread_lane_resources_manager_factory_name_;
+
+  // Name of the collocation resolver that needs to be instantiated.
+  // The default value is "Default_Collocation_Resolver". If
+  // TAO_RTCORBA is linked, the set_collocation_resolver will be
+  // called to set the value to be "RT_Collocation_Resolver".
+  static const char *collocation_resolver_name_;
+
   // Name of the stub factory that needs to be instantiated.
   // The default value is "Default_Stub_Factory". If TAO_RTCORBA is
   // linked, the set_stub_factory will be called to set the value
@@ -1092,30 +1063,12 @@ protected:
   // poa_factory_name_ dynamically.
   static const char *poa_factory_directive_;
 
-  // @@ This is not needed since the default resource factory
-  //    is staticaly added to the service configurator.
-  /// TRUE if <resource_factory_> was obtained from the Service
-  /// Configurator.
-  CORBA::Boolean resource_factory_from_service_config_;
-
   /// Handle to the factory for Client-side strategies.
   TAO_Client_Strategy_Factory *client_factory_;
 
-  // @@ This is not needed since the client facotry factory
-  //    is staticaly added to the service configurator.
-  /// TRUE if <client_factory_> was obtained from the Service
-  /// Configurator.
-  CORBA::Boolean client_factory_from_service_config_;
-
   /// Handle to the factory for Server-side strategies.
   TAO_Server_Strategy_Factory *server_factory_;
 
-  // @@ This is not needed since the server factory factory
-  //    is staticaly added to the service configurator.
-  /// TRUE if <server_factory_> was obtained from the Service
-  /// Configurator.
-  CORBA::Boolean server_factory_from_service_config_;
-
   /**
    * @name Service Level Hooks
    */
@@ -1195,13 +1148,6 @@ protected:
   /// then they are stored here...
   TAO_ORB_Core_TSS_Resources orb_resources_;
 
-  /// The server concurrency strategy.
-  TAO_Reactor_Registry *reactor_registry_;
-
-  /// The reactor used for pure-clients, otherwise it comes from the
-  /// reactor_registry.
-  ACE_Reactor *reactor_;
-
   /// Flag which denotes that the ORB has been shutdown.
   int has_shutdown_;
 
@@ -1211,13 +1157,6 @@ protected:
   ACE_Time_Value thread_per_connection_timeout_;
   //@}
 
-
-  /// Mutual exclusion for calling open.
-  TAO_SYNCH_MUTEX open_lock_;
-
-  /// Flag which denotes that the open method was called.
-  int open_called_;
-
   TAO_Endpoint_Selector_Factory *endpoint_selector_factory_;
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -1251,9 +1190,6 @@ protected:
   /// The IOR parser registry.
   TAO_Parser_Registry parser_registry_;
 
-  /// TAO's connection cache
-  TAO_Transport_Cache_Manager* transport_cache_;
-
   /// BiDirectional GIOP factory
   TAO_BiDir_Adapter *bidir_adapter_;
 
@@ -1262,9 +1198,6 @@ protected:
 
   /// Hold the flushing strategy
   TAO_Flushing_Strategy *flushing_strategy_;
-
-  /// CORBA Priority Normalizer.
-  TAO_CORBA_Priority_Normalizer *corba_priority_normalizer_;
 };
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 90e3ec6918a..d78bfc23eb1 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -31,12 +31,6 @@ TAO_ORB_Core::locking_strategy (void)
   return 0;
 }
 
-ACE_INLINE TAO_Transport_Cache_Manager *
-TAO_ORB_Core::transport_cache (void)
-{
-  return this->transport_cache_;
-}
-
 ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::bidir_giop_policy (void)
 {
@@ -61,12 +55,6 @@ TAO_ORB_Core::flushing_strategy (void)
   return this->flushing_strategy_;
 }
 
-ACE_INLINE TAO_POA_Extension_Initializer *
-TAO_ORB_Core::poa_extension_initializer (void)
-{
-  return this->poa_extension_initializer_;
-}
-
 ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::service_profile_selection (TAO_MProfile &mprofile,
                                          TAO_Profile  *&profile)
@@ -234,12 +222,6 @@ TAO_ORB_Core::connector_registry (void)
   return TAO_OC_RETRIEVE (connector_registry);
 }
 
-ACE_INLINE TAO_Acceptor_Registry *
-TAO_ORB_Core::acceptor_registry (void)
-{
-  return TAO_OC_RETRIEVE (acceptor_registry);
-}
-
 ACE_INLINE TAO_Parser_Registry *
 TAO_ORB_Core::parser_registry (void)
 {
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index ccd29b6c2ba..c4bc05bad4c 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -597,7 +597,6 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
     {
       objdata = orb_core->create_stub (type_hint.in (),
                                        mp,
-                                       orb_core,
                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
@@ -610,7 +609,6 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
                              ACE_TEXT ("reference.\n"));
 
       return 0;
-
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/POA_Extension_Initializer.cpp b/TAO/tao/POA_Extension_Initializer.cpp
deleted file mode 100644
index fcfc5440c8d..00000000000
--- a/TAO/tao/POA_Extension_Initializer.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-#include "POA_Extension_Initializer.h"
-#include "Environment.h"
-
-ACE_RCSID(tao, TAO_POA_Extension_Initializer, "$Id$")
-
-TAO_POA_Extension_Initializer::TAO_POA_Extension_Initializer (void)
-  : next_ (0)
-{
-  // No-Op.
-}
-
-TAO_POA_Extension_Initializer::~TAO_POA_Extension_Initializer (void)
-{
-  delete this->next_;
-}
-
-void
-TAO_POA_Extension_Initializer::add_initializer (TAO_POA_Extension_Initializer *initializer)
-{
-  if (this->next_ == 0)
-    this->next_ = initializer;
-  else
-    {
-      initializer->next_ = this->next_;
-      this->next_ = initializer;
-    }
-}
-
-void
-TAO_POA_Extension_Initializer::register_hooks (TAO_Object_Adapter &object_adapter,
-                                           CORBA::Environment &ACE_TRY_ENV)
-{
-  this->register_hooks_impl (object_adapter, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->next_ != 0)
-    {
-      this->next_->register_hooks (object_adapter, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
diff --git a/TAO/tao/POA_Extension_Initializer.h b/TAO/tao/POA_Extension_Initializer.h
deleted file mode 100644
index ee926c917c0..00000000000
--- a/TAO/tao/POA_Extension_Initializer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   POA_Extension_Initializer.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- *  @author Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_POA_EXTENSION_INITIALIZER_H
-#define TAO_POA_EXTENSION_INITIALIZER_H
-#include "ace/pre.h"
-
-#include "corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward reference.
-class TAO_Object_Adapter;
-
-class TAO_Export TAO_POA_Extension_Initializer
-{
-public:
-  /// Constructor.
-  TAO_POA_Extension_Initializer (void);
-
-  /// Destructor.
-  virtual ~TAO_POA_Extension_Initializer (void);
-
-  /**
-   * Called at POA initialization for libraries to register their
-   * POA extensions with the POA.
-   */
-  void register_hooks (TAO_Object_Adapter &object_adapter,
-                       CORBA::Environment &ACE_TRY_ENV);
-
-  /**
-   * Adds an initializer to the "chain of initializers". This is used
-   * to reduce the footprint of the ORB core that would have been needed
-   * to store a variable length list of POA extension initializers.
-   */
-  void add_initializer (TAO_POA_Extension_Initializer *initializer);
-
-protected:
-
-  virtual void register_hooks_impl (TAO_Object_Adapter &object_adapter,
-                                    CORBA::Environment &ACE_TRY_ENV) = 0;
-
-private:
-  TAO_POA_Extension_Initializer *next_;
-};
-
-#include "ace/post.h"
-#endif /* TAO_POA_EXTENSION_INITIALIZER_H */
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 36b84e84057..a4fe66973b7 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -209,8 +209,7 @@ TAO_Connector::make_mprofile (const char *string,
 
 // Acceptor
 TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
-  :  priority_ (-1),
-     tag_ (tag)
+  : tag_ (tag)
 {
 }
 
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index d7eacd6fc0e..4d9228cd64f 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -8,7 +8,6 @@
  *
  *   Interface for the TAO pluggable protocol framework.
  *
- *
  *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
 //=============================================================================
@@ -71,11 +70,9 @@ public:
   /// The tag, each concrete class will have a specific tag value.
   CORBA::ULong tag (void) const;
 
-  /// The priority for this endpoint.
-  CORBA::Short priority (void) const;
-
   /// Method to initialize acceptor for address.
   virtual int open (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     int version_major,
                     int version_minor,
                     const char *address,
@@ -90,6 +87,7 @@ public:
    *    removed in the near future.
    */
   virtual int open_default (TAO_ORB_Core *,
+                            ACE_Reactor *reactor,
                             int version_major,
                             int version_minor,
                             const char *options = 0) = 0;
@@ -103,9 +101,9 @@ public:
    * in the mprofile that is of the same type.  Currently, this
    * is used when RT CORBA is enabled.
    */
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile,
-                               CORBA::Boolean share_profile) = 0;
+  virtual int create_profile (const TAO_ObjectKey &object_key,
+                              TAO_MProfile &mprofile,
+                              CORBA::Short priority) = 0;
 
   /// Return 1 if the <endpoint> has the same address as the acceptor.
   virtual int is_collocated (const TAO_Endpoint* endpoint) = 0;
@@ -127,10 +125,6 @@ public:
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO_ObjectKey &key) = 0;
 
-protected:
-  /// The priority for this endpoint
-  CORBA::Short priority_;
-
 private:
   /// IOP protocol tag.
   CORBA::ULong tag_;
diff --git a/TAO/tao/Pluggable.i b/TAO/tao/Pluggable.i
index 47443ee705f..a3fe15fa9a1 100644
--- a/TAO/tao/Pluggable.i
+++ b/TAO/tao/Pluggable.i
@@ -27,9 +27,3 @@ TAO_Acceptor::tag (void) const
 {
   return this->tag_;
 }
-
-ACE_INLINE CORBA::Short
-TAO_Acceptor::priority (void) const
-{
-  return this->priority_;
-}
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 21f4cfd3249..69d8f66b320 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -10,21 +10,30 @@ TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 }
 
 int
-TAO_Default_Acceptor_Filter::fill_mprofile (const TAO_ObjectKey &object_key,
-                                            TAO_MProfile &mprofile,
-                                            TAO_Acceptor **acceptors_begin,
-                                            TAO_Acceptor **acceptors_end)
+TAO_Default_Acceptor_Filter::fill_profile (const TAO_ObjectKey &object_key,
+                                           TAO_MProfile &mprofile,
+                                           TAO_Acceptor **acceptors_begin,
+                                           TAO_Acceptor **acceptors_end,
+                                           CORBA::Short priority)
 {
+  // Go through all the acceptors.
   for (TAO_Acceptor** acceptor = acceptors_begin;
        acceptor != acceptors_end;
        ++acceptor)
     {
-      if ((*acceptor)->create_mprofile (object_key,
-                                        mprofile,
-                                        0 /* one endpoint per profile */)
-          == -1)
+      // Ask each acceptor to make a profile.
+      if ((*acceptor)->create_profile (object_key,
+                                       mprofile,
+                                       priority) == -1)
         return -1;
     }
 
   return 0;
 }
+
+int
+TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &)
+{
+  // No encoding required.
+  return 0;
+}
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index 5e8f772022e..61b16aa9077 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -52,11 +52,16 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Accepto
 public:
   TAO_Default_Acceptor_Filter (void);
 
-  virtual int fill_mprofile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             TAO_Acceptor **acceptors_begin,
-                             TAO_Acceptor **acceptors_end);
-  // Populate <mprofile> with all available endpoints.
+  /// Populate <mprofile> with all available endpoints.
+  int fill_profile (const TAO_ObjectKey &object_key,
+                    TAO_MProfile &mprofile,
+                    TAO_Acceptor **acceptors_begin,
+                    TAO_Acceptor **acceptors_end,
+                    CORBA::Short priority = TAO_INVALID_PRIORITY);
+
+  /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
+  /// tag component of profiles.
+  int encode_endpoints (TAO_MProfile &mprofile);
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index c60a04fe2aa..b53222baed7 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -7,10 +7,14 @@
 ACE_RCSID(tao, POA, "$Id$")
 
 
-TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void)
+TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core)
+  : TAO_POA_Policy_Validator (orb_core)
 {
 }
 
+TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void)
+{
+}
 
 void
 TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
@@ -52,7 +56,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS);
   PortableServer::IdUniquenessPolicy_var iup =
     PortableServer::IdUniquenessPolicy::_narrow (policy.in (),
-                                                      ACE_TRY_ENV);
+                                                 ACE_TRY_ENV);
   ACE_CHECK;
   PortableServer::IdUniquenessPolicyValue id_uniqueness =
     iup->value (ACE_TRY_ENV);
@@ -71,7 +75,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT);
   PortableServer::IdAssignmentPolicy_var idap =
     PortableServer::IdAssignmentPolicy::_narrow (policy.in (),
-                                                       ACE_TRY_ENV);
+                                                 ACE_TRY_ENV);
   ACE_CHECK;
   PortableServer::IdAssignmentPolicyValue id_assignment =
     idap->value (ACE_TRY_ENV);
@@ -106,3 +110,9 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
           type == PortableServer::SERVANT_RETENTION_POLICY_ID ||
           type == PortableServer::REQUEST_PROCESSING_POLICY_ID);
 }
+
+void
+TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set &,
+                                                       CORBA::Environment &)
+{
+}
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index ef1a260b7ce..19191498ed2 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -26,6 +26,10 @@ class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator
   : public TAO_POA_Policy_Validator
 {
 public:
+
+  /// Constructor.
+  TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core);
+
   /// Destructor.
   ~TAO_POA_Default_Policy_Validator (void);
 
@@ -35,8 +39,12 @@ protected:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  virtual void validate_impl (TAO_Policy_Set &policies,
-                              CORBA::Environment &ACE_TRY_ENV);
+  void validate_impl (TAO_Policy_Set &policies,
+                      CORBA::Environment &ACE_TRY_ENV);
+
+  /// Add/merge policies.
+  void merge_policies_impl (TAO_Policy_Set &policies,
+                            CORBA::Environment &ACE_TRY_ENV);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -50,5 +58,3 @@ protected:
 
 #include "ace/post.h"
 #endif /* TAO_DEFAULT_POLICY_VALIDATOR_H_ */
-
-
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 50d726e2af9..fb6efdcf9ab 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -161,7 +161,7 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
     ,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -170,36 +170,36 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
-  
+
 private:
   POA_ImplementationRepository::ServerObject *_tao_impl;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
@@ -220,7 +220,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (COR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -232,12 +232,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CO
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -246,7 +246,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -275,7 +275,7 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
     ,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -284,36 +284,36 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-  
+
 private:
   POA_ImplementationRepository::ServerObject *_tao_impl;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
@@ -334,7 +334,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -346,12 +346,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -360,7 +360,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CO
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -416,7 +416,8 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
@@ -489,13 +490,13 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer));
 
 
@@ -643,37 +644,37 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 {
   POA_ImplementationRepository::ServerObject *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::ServerObject *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->ping (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -687,11 +688,11 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -699,12 +700,12 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -718,37 +719,37 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 {
   POA_ImplementationRepository::ServerObject *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::ServerObject *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->shutdown (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -762,11 +763,11 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -774,18 +775,18 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
@@ -918,20 +919,20 @@ POA_ImplementationRepository::ServerObject::_this (CORBA_Environment &ACE_TRY_EN
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
-  
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-  
+
   CORBA::Object_var obj = tmp;
-  
+
   (void) safe_stub.release ();
-  
+
   return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
 }
 
@@ -1015,23 +1016,23 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"find", 	&POA_ImplementationRepository::Administration::find_skel},
+      {"find",  &POA_ImplementationRepository::Administration::find_skel},
       {"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_ImplementationRepository::Administration::_is_a_skel},
       {"_interface",  &POA_ImplementationRepository::Administration::_interface_skel},
       {"",0},{"",0},
-      {"remove_server", 	&POA_ImplementationRepository::Administration::remove_server_skel},
-      {"list", 	&POA_ImplementationRepository::Administration::list_skel},
-      {"register_server", 	&POA_ImplementationRepository::Administration::register_server_skel},
+      {"remove_server",         &POA_ImplementationRepository::Administration::remove_server_skel},
+      {"list",  &POA_ImplementationRepository::Administration::list_skel},
+      {"register_server",       &POA_ImplementationRepository::Administration::register_server_skel},
       {"",0},
-      {"reregister_server", 	&POA_ImplementationRepository::Administration::reregister_server_skel},
+      {"reregister_server",     &POA_ImplementationRepository::Administration::reregister_server_skel},
       {"_non_existent",  &POA_ImplementationRepository::Administration::_non_existent_skel},
-      {"activate_server", 	&POA_ImplementationRepository::Administration::activate_server_skel},
-      {"shutdown_server", 	&POA_ImplementationRepository::Administration::shutdown_server_skel},
+      {"activate_server",       &POA_ImplementationRepository::Administration::activate_server_skel},
+      {"shutdown_server",       &POA_ImplementationRepository::Administration::shutdown_server_skel},
       {"",0},
-      {"server_is_running", 	&POA_ImplementationRepository::Administration::server_is_running_skel},
+      {"server_is_running",     &POA_ImplementationRepository::Administration::server_is_running_skel},
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"server_is_shutting_down", 	&POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
+      {"server_is_shutting_down",       &POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1060,7 +1061,7 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1069,37 +1070,37 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
@@ -1122,16 +1123,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1143,15 +1144,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound,
     ImplementationRepository::Administration::_tc_CannotActivate
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -1164,7 +1165,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1173,7 +1174,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1204,7 +1205,7 @@ public:
     ,
     const char * server,
     const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1213,38 +1214,38 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
@@ -1269,19 +1270,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
     (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1293,14 +1294,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_AlreadyRegistered
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1313,7 +1314,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1322,7 +1323,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1353,7 +1354,7 @@ public:
     ,
     const char * server,
     const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1362,38 +1363,38 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
@@ -1418,19 +1419,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
     (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1442,12 +1443,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1456,7 +1457,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1486,7 +1487,7 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1495,37 +1496,37 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
@@ -1548,16 +1549,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1569,14 +1570,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1589,7 +1590,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1598,7 +1599,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1628,7 +1629,7 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1637,37 +1638,37 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
@@ -1690,16 +1691,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1711,14 +1712,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1731,7 +1732,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1740,7 +1741,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1772,7 +1773,7 @@ public:
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1781,23 +1782,23 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
@@ -1808,7 +1809,7 @@ public:
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
@@ -1841,12 +1842,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -1856,7 +1857,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
     (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1868,14 +1869,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1888,7 +1889,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1897,11 +1898,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -1923,7 +1924,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
 {
   // Update the result.
@@ -1938,7 +1939,7 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -1947,37 +1948,37 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
@@ -2000,16 +2001,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2021,14 +2022,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2041,7 +2042,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2050,7 +2051,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2080,7 +2081,7 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -2089,37 +2090,37 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const char * server_;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
@@ -2142,16 +2143,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (C
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2163,14 +2164,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2183,7 +2184,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2192,7 +2193,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORB
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2221,9 +2222,9 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
-    const CORBA::ULong & how_many    
+    const CORBA::ULong & how_many
 ,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -2232,37 +2233,37 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
   const CORBA::ULong & how_many_;
-    
+
 
 };
 
@@ -2270,13 +2271,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const CORBA::ULong & how_many    
+    const CORBA::ULong & how_many
 ,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
-    how_many_ (how_many)  
+    how_many_ (how_many)
 
 {}
 
@@ -2288,16 +2289,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (C
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    
+
 
   return safe_parameter_list._retn ();
 }
@@ -2310,12 +2311,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2324,7 +2325,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORB
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2363,14 +2364,14 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
-  
+
 }
 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
-  
+
 }
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
@@ -2380,26 +2381,27 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
-  
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
-  
+
   this->create_proxy (strategy, ACE_TRY_ENV);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-  
+
   return *this->proxy_cache_[strategy];
-  
+
 }
 
-void 
+void
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-  
+
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -2412,7 +2414,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-          
+
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -2421,7 +2423,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-          
+
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -2431,9 +2433,9 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-        
+
       }
-    
+
   }
 }
 
@@ -2453,13 +2455,13 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB
 int
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long)
 {
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
-static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer));
 
 
@@ -2813,7 +2815,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
           server,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server  (
@@ -2835,7 +2837,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
           options,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server  (
@@ -2856,7 +2858,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
           options,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server  (
@@ -2876,7 +2878,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
           server,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server  (
@@ -2896,7 +2898,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo
           server,
           ACE_TRY_ENV
         );
-  
+
 }
 
 char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running  (
@@ -2920,7 +2922,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
           server_object,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down  (
@@ -2940,7 +2942,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
           server,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find  (
@@ -2962,7 +2964,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
           info,
           ACE_TRY_ENV
         );
-  
+
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list  (
@@ -2985,7 +2987,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
           server_iterator,
           ACE_TRY_ENV
         );
-  
+
 }
 
 
@@ -3018,7 +3020,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -3030,12 +3032,12 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri (
       _tao_server_request,
       _tao_upcall,
@@ -3043,20 +3045,20 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
       server.in (),
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->activate_server (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3070,11 +3072,11 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3082,12 +3084,12 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3102,7 +3104,7 @@ void POA_ImplementationRepository::Administration::register_server_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
@@ -3116,12 +3118,12 @@ void POA_ImplementationRepository::Administration::register_server_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri (
       _tao_server_request,
       _tao_upcall,
@@ -3130,21 +3132,21 @@ void POA_ImplementationRepository::Administration::register_server_skel (
       options,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->register_server (
           server.in (),
           options,
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3158,11 +3160,11 @@ void POA_ImplementationRepository::Administration::register_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3170,12 +3172,12 @@ void POA_ImplementationRepository::Administration::register_server_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3190,7 +3192,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
@@ -3204,12 +3206,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri (
       _tao_server_request,
       _tao_upcall,
@@ -3218,21 +3220,21 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
       options,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->reregister_server (
           server.in (),
           options,
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3246,11 +3248,11 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3258,12 +3260,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3278,7 +3280,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -3290,12 +3292,12 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri (
       _tao_server_request,
       _tao_upcall,
@@ -3303,20 +3305,20 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
       server.in (),
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->remove_server (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3330,11 +3332,11 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3342,12 +3344,12 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3362,7 +3364,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -3374,12 +3376,12 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
       _tao_server_request,
       _tao_upcall,
@@ -3387,20 +3389,20 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
       server.in (),
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->shutdown_server (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3414,11 +3416,11 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3426,12 +3428,12 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3446,7 +3448,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
     CORBA::String_var _tao_retval;
   CORBA::String_var server;
   CORBA::String_var addr;
@@ -3462,12 +3464,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri (
       _tao_server_request,
       _tao_upcall,
@@ -3477,14 +3479,14 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       server_object.in (),
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
+      _tao_retval =
       _tao_impl->server_is_running (
           server.in (),
           addr.in (),
@@ -3492,7 +3494,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       char * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
@@ -3509,11 +3511,11 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3521,11 +3523,11 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
@@ -3533,7 +3535,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3548,7 +3550,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -3560,12 +3562,12 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
       _tao_server_request,
       _tao_upcall,
@@ -3573,20 +3575,20 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
       server.in (),
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->server_is_shutting_down (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3600,11 +3602,11 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3612,12 +3614,12 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3632,7 +3634,7 @@ void POA_ImplementationRepository::Administration::find_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
     CORBA::String_var server;
   ImplementationRepository::ServerInformation_var info;
   if (!(
@@ -3644,12 +3646,12 @@ void POA_ImplementationRepository::Administration::find_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri (
       _tao_server_request,
       _tao_upcall,
@@ -3657,21 +3659,21 @@ void POA_ImplementationRepository::Administration::find_skel (
       server.in (),
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->find (
           server.in (),
           info.out (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3685,11 +3687,11 @@ void POA_ImplementationRepository::Administration::find_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3697,11 +3699,11 @@ void POA_ImplementationRepository::Administration::find_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << info.in ())
     ))
@@ -3709,7 +3711,7 @@ void POA_ImplementationRepository::Administration::find_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3724,7 +3726,7 @@ void POA_ImplementationRepository::Administration::list_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
-  
+
     CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
     ImplementationRepository::ServerInformationIterator_var server_iterator;
@@ -3737,28 +3739,28 @@ void POA_ImplementationRepository::Administration::list_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      how_many      
+      how_many
 ,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->list (
           how_many,
           server_list.out (),
@@ -3766,7 +3768,7 @@ void POA_ImplementationRepository::Administration::list_skel (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -3780,11 +3782,11 @@ void POA_ImplementationRepository::Administration::list_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -3792,11 +3794,11 @@ void POA_ImplementationRepository::Administration::list_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << server_list.in ()) &&
       (_tao_out << server_iterator.in ())
@@ -3805,13 +3807,13 @@ void POA_ImplementationRepository::Administration::list_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
@@ -3823,10 +3825,10 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -3834,7 +3836,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 }
 
 void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
@@ -3843,7 +3845,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -3851,7 +3853,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 }
 
 void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
@@ -3860,26 +3862,26 @@ void POA_ImplementationRepository::Administration::_interface_skel (
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
   CORBA_InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-  
+
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   ACE_TRY
     {
       _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       _tao_server_request.init_reply ();
-      
+
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-      
+
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -3891,7 +3893,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3905,7 +3907,7 @@ CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
 {
   const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
@@ -3944,20 +3946,20 @@ POA_ImplementationRepository::Administration::_this (CORBA_Environment &ACE_TRY_
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
-  
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-  
+
   CORBA::Object_var obj = tmp;
-  
+
   (void) safe_stub.release ();
-  
+
   return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ());
 }
 
@@ -4042,8 +4044,8 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel},
-      {"next_n", 	&POA_ImplementationRepository::ServerInformationIterator::next_n_skel},
-      {"destroy", 	&POA_ImplementationRepository::ServerInformationIterator::destroy_skel},
+      {"next_n",        &POA_ImplementationRepository::ServerInformationIterator::next_n_skel},
+      {"destroy",       &POA_ImplementationRepository::ServerInformationIterator::destroy_skel},
       {"",0},{"",0},
       {"_interface",  &POA_ImplementationRepository::ServerInformationIterator::_interface_skel},
       {"",0},{"",0},
@@ -4076,7 +4078,7 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
     ,
     const CORBA::ULong & how_many,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -4085,23 +4087,23 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
@@ -4112,7 +4114,7 @@ public:
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-  
+
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
   const CORBA::ULong & how_many_;
@@ -4139,16 +4141,16 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -4160,12 +4162,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4174,11 +4176,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
+
   return safe_result_any._retn ();
 }
 
@@ -4200,7 +4202,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -4214,7 +4216,7 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
     ,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -4223,36 +4225,36 @@ public:
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
   void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-  
+
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-  
+
 };
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
@@ -4285,12 +4287,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4355,7 +4357,8 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
@@ -4428,13 +4431,13 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun
 int
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long)
 {
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer));
 
 
@@ -4592,7 +4595,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference);
-  
+
   CORBA::Boolean _tao_retval = 0;
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
@@ -4605,12 +4608,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
       _tao_server_request,
       _tao_upcall,
@@ -4618,21 +4621,21 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       how_many,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
+      _tao_retval =
       _tao_impl->next_n (
           how_many,
           server_list.out (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
@@ -4648,11 +4651,11 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -4673,7 +4676,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -4687,37 +4690,37 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 {
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference);
-  
+
   _tao_server_request.argument_flag (0);
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->destroy (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
@@ -4731,11 +4734,11 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         ri.reply_status (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -4743,18 +4746,18 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-  
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
@@ -4887,20 +4890,20 @@ POA_ImplementationRepository::ServerInformationIterator::_this (CORBA_Environmen
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
-  
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-  
+
   CORBA::Object_var obj = tmp;
-  
+
   (void) safe_stub.release ();
-  
+
   return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ());
 }
 
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index 972cbd1649e..31a50448a0a 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -761,8 +761,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
   POA.i \
-  ImplRepoS.h \
-  ImplRepoC.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoC.h \
   $(TAO_ROOT)/tao/ClientRequestInfo.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
@@ -798,20 +798,20 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/ClientRequestInfo.inl \
-  portableserver_export.h \
-  ImplRepoC.i \
-  PortableServer.h \
-  PortableServerC.h \
-  Servant_Base.h \
-  Collocated_Object.h \
-  Collocated_Object.i \
-  ThruPOA_Object_Proxy_Impl.h \
-  Direct_Object_Proxy_Impl.h \
-  ImplRepoS_T.h \
-  ImplRepoS_T.i \
-  ImplRepoS_T.cpp \
-  ImplRepoS.i \
-  ImplRepo_i.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.i \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS.i \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepo_i.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
   $(TAO_ROOT)/tao/Services.i \
@@ -847,6 +847,10 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/Profile.h \
@@ -1296,7 +1300,10 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
-  $(TAO_ROOT)/tao/POA_Extension_Initializer.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h
 
@@ -3464,24 +3471,24 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.i \
-  PortableServer.h \
-  portableserver_export.h \
-  PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/Typecode.h \
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  PortableServerC.i \
-  Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  Servant_Base.i \
-  Collocated_Object.h \
-  Collocated_Object.i \
-  ThruPOA_Object_Proxy_Impl.h \
-  Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
   PolicyS_T.h PolicyS_T.i PolicyS_T.cpp PolicyS.i \
-  Object_Adapter.h \
-  Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
   $(ACE_ROOT)/ace/Map.h \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair.h \
@@ -3529,25 +3536,25 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Map_T.i \
   $(ACE_ROOT)/ace/Map_T.cpp \
-  Key_Adapters.i \
-  poa_macros.h \
-  Active_Object_Map.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  Active_Object_Map.i \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  Default_Policy_Validator.h \
-  Policy_Validator.h \
-  POA_Policy_Set.h \
-  POA_Policies.h \
-  POA_Policies.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  POA_Policy_Set.i \
-  Object_Adapter.i \
-  Operation_Table.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(TAO_ROOT)/tao/TAO_Singleton.inl \
   $(TAO_ROOT)/tao/TAO_Singleton.cpp \
@@ -3647,12 +3654,12 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
-  ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  ServerRequestInfo.inl \
-  ServerInterceptorAdapter.h \
-  ServerInterceptorAdapter.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -3822,9 +3829,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  ImplRepo_i.h \
-  ImplRepoS.h \
-  ImplRepoC.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepo_i.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3964,22 +3971,22 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/ClientRequestInfo.inl \
-  portableserver_export.h \
-  ImplRepoC.i \
-  PortableServer.h \
-  PortableServerC.h \
-  PortableServerC.i \
-  Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  Servant_Base.i \
-  Collocated_Object.h \
-  Collocated_Object.i \
-  ThruPOA_Object_Proxy_Impl.h \
-  Direct_Object_Proxy_Impl.h \
-  ImplRepoS_T.h \
-  ImplRepoS_T.i \
-  ImplRepoS_T.cpp \
-  ImplRepoS.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.h \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.i \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/ImplRepoS.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
   $(TAO_ROOT)/tao/Services.i \
@@ -5491,7 +5498,148 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/corbafwd.i \
   portableserver_export.h \
   $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Default_Policy_Validator.o .obj/Default_Policy_Validator.so .shobj/Default_Policy_Validator.o .shobj/Default_Policy_Validator.so: Default_Policy_Validator.cpp \
   Default_Policy_Validator.h \
@@ -6078,20 +6226,20 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/ClientRequestInfo.inl \
   portableserver_export.h ImplRepoC.i \
-  PortableServer.h \
-  portableserver_export.h \
-  PortableServerC.h \
-  PortableServerC.i \
-  Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  Servant_Base.i \
-  Collocated_Object.h \
-  Collocated_Object.i \
-  ThruPOA_Object_Proxy_Impl.h \
-  Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
   ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \
-  Object_Adapter.h \
-  Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
   $(ACE_ROOT)/ace/Map.h \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair.h \
@@ -6139,23 +6287,23 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Map_T.i \
   $(ACE_ROOT)/ace/Map_T.cpp \
-  Key_Adapters.i \
-  poa_macros.h \
-  Active_Object_Map.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  Active_Object_Map.i \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
-  Default_Policy_Validator.h \
-  Policy_Validator.h \
-  POA_Policy_Set.h \
-  POA_Policies.h \
-  POA_Policies.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  POA_Policy_Set.i \
-  Object_Adapter.i \
-  Operation_Table.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/GIOPC.h \
@@ -6224,10 +6372,10 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
-  ServerRequestInfo.h \
-  ServerRequestInfo.inl \
-  ServerInterceptorAdapter.h \
-  ServerInterceptorAdapter.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -6391,20 +6539,20 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/PollableC.h \
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
-  PortableServer.h \
-  portableserver_export.h \
-  PortableServerC.h \
-  PortableServerC.i \
-  Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  Servant_Base.i \
-  Collocated_Object.h \
-  Collocated_Object.i \
-  ThruPOA_Object_Proxy_Impl.h \
-  Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
   MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \
-  Object_Adapter.h \
-  Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
   $(ACE_ROOT)/ace/Map.h \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair.h \
@@ -6452,25 +6600,25 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Map_T.i \
   $(ACE_ROOT)/ace/Map_T.cpp \
-  Key_Adapters.i \
-  poa_macros.h \
-  Active_Object_Map.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  Active_Object_Map.i \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  Default_Policy_Validator.h \
-  Policy_Validator.h \
-  POA_Policy_Set.h \
-  POA_Policies.h \
-  POA_Policies.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  POA_Policy_Set.i \
-  Object_Adapter.i \
-  Operation_Table.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/GIOPC.h \
@@ -6545,12 +6693,12 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
-  ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  ServerRequestInfo.inl \
-  ServerInterceptorAdapter.h \
-  ServerInterceptorAdapter.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp
index 94fd4a20ffb..9191214934a 100644
--- a/TAO/tao/PortableServer/MessagingS.cpp
+++ b/TAO/tao/PortableServer/MessagingS.cpp
@@ -190,7 +190,8 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy (
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 415886c435f..8caa5ce59b2 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -20,7 +20,8 @@
 #include "tao/MProfile.h"
 #include "tao/debug.h"
 #include "tao/PortableInterceptor.h"
-#include "tao/POA_Extension_Initializer.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Object_Adapter.i"
@@ -123,6 +124,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
     non_servant_upcall_in_progress_ (0),
     non_servant_upcall_thread_ (ACE_OS::NULL_thread),
     root_ (0),
+    default_validator_ (orb_core),
     default_poa_policies_ ()
 {
   TAO_Object_Adapter::set_transient_poa_name_size (creation_parameters);
@@ -553,15 +555,6 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
                                ACE_TRY_ENV);
   ACE_CHECK;
 
-  // Call the POA Extension initializers so that they can register their hooks.
-  TAO_POA_Extension_Initializer *extensions =
-      this->orb_core_.poa_extension_initializer ();
-  if (extensions != 0)
-    {
-      extensions->register_hooks (*this, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
   // If a POA extension hasn't changed the servant dispatcher, initialize the
   // default one.
   if (this->servant_dispatcher_ == 0)
@@ -578,18 +571,15 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
 
   PortableServer::POAManager_var safe_poa_manager = poa_manager;
 
-#if 0
-  TAO_POA_Policy_Set root_poa_policies (this->default_poa_policies ());
+  // This makes sure that the default resources are open when the Root
+  // POA is created.
+  this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_TRY_ENV);
+  ACE_CHECK;
 
-  if (policies == 0)
-    {
-      // RootPOA policies defined in spec
-      root_poa_policies.implicit_activation (
-           PortableServer::IMPLICIT_ACTIVATION);
+  // Set the default Server Protocol Policy.
+  this->set_default_server_protocol_policy (ACE_TRY_ENV);
+  ACE_CHECK;
 
-      policies = &root_poa_policies;
-    }
-#else
   TAO_POA_Policy_Set policies (this->default_poa_policies ());
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -598,25 +588,30 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
   // takes a const reference and makes its own copy of the
   // policy.  (Otherwise, we'd have to allocate the policy
   // on the heap.)
-  TAO_Implicit_Activation_Policy implicit_activation_policy (
-                                      PortableServer::IMPLICIT_ACTIVATION);
+  TAO_Implicit_Activation_Policy
+    implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
+
   policies.merge_policy (&implicit_activation_policy,
                          ACE_TRY_ENV);
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-#endif /* 0 */
+  // Merge policies from the ORB level.
+  this->validator ().merge_policies (policies.policies (),
+                                     ACE_TRY_ENV);
+  ACE_CHECK;
 
   // Construct a new POA
   TAO_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
-  this->root_ = this->servant_dispatcher_->create_POA (root_poa_name,
-                                                       *poa_manager,
-                                                       policies,
-                                                       0,
-                                                       this->lock (),
-                                                       this->thread_lock (),
-                                                       this->orb_core_,
-                                                       this,
-                                                       ACE_TRY_ENV);
+  this->root_ =
+    this->servant_dispatcher_->create_POA (root_poa_name,
+                                           *poa_manager,
+                                           policies,
+                                           0,
+                                           this->lock (),
+                                           this->thread_lock (),
+                                           this->orb_core_,
+                                           this,
+                                           ACE_TRY_ENV);
   ACE_CHECK;
 
   // The Object_Adapter will keep a reference to the Root POA so that
@@ -630,6 +625,23 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
   (void) safe_poa_manager._retn ();
 }
 
+void
+TAO_Object_Adapter::set_default_server_protocol_policy (CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_Thread_Lane_Resources &default_lane_resources =
+    this->orb_core_.thread_lane_resources_manager ().default_lane_resources ();
+
+  TAO_Acceptor_Registry &acceptor_registry =
+    default_lane_resources.acceptor_registry ();
+
+  TAO_Protocols_Hooks *protocols_hooks =
+    this->orb_core_.get_protocols_hooks (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  protocols_hooks->set_default_server_protocol_policy (acceptor_registry,
+                                                       ACE_TRY_ENV);
+  ACE_CHECK;
+}
 
 void
 TAO_Object_Adapter::close (int wait_for_completion,
@@ -1257,6 +1269,37 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   return TAO_Adapter::DS_OK;
 }
 
+TAO_POA *
+TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key,
+                                                CORBA::Environment &ACE_TRY_ENV)
+{
+  // Acquire the object adapter lock first.
+  int result = this->object_adapter_->lock ().acquire ();
+  if (result == -1)
+    // Locking error.
+    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                      0);
+
+  // We have acquired the object adapater lock.  Record this for later
+  // use.
+  this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
+
+  // Check if a non-servant upcall is in progress.  If a non-servant
+  // upcall is in progress, wait for it to complete.  Unless of
+  // course, the thread making the non-servant upcall is this thread.
+  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  // Locate the POA.
+  this->object_adapter_->locate_poa (key,
+                                     this->system_id_,
+                                     this->poa_,
+                                     ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  return this->poa_;
+}
+
 TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
 {
   switch (this->state_)
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 0005ad5594d..32301fdbdf5 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -356,6 +356,8 @@ protected:
   int unbind_persistent_poa (const poa_name &folded_name,
                              const poa_name &system_name);
 
+  void set_default_server_protocol_policy (CORBA::Environment &ACE_TRY_ENV);
+
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
 
@@ -620,6 +622,7 @@ public:
   public:
 
     friend class TAO_POA;
+    friend class TAO_RT_Collocation_Resolver;
 
     // @@ PPOA: Servant_Upcall (TAO_Object_Adapter &object_adapter);
     Servant_Upcall (TAO_ORB_Core *orb_core);
@@ -634,6 +637,10 @@ public:
                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
     // Locate POA and servant.
 
+    TAO_POA *lookup_POA (const TAO_ObjectKey &key,
+                         CORBA::Environment &ACE_TRY_ENV);
+    // Locate POA.
+
     TAO_POA &poa (void) const;
     // POA accessor.
 
@@ -676,6 +683,9 @@ public:
     void using_servant_locator (void);
     // We are using the servant locator for this upcall.
 
+    CORBA::Short priority (void) const;
+    // Get the priority for the current upcall.
+
   protected:
 
     void servant_locator_cleanup (void);
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index d47e33b69f1..5c9803645a0 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -313,3 +313,9 @@ TAO_POA_Current_Impl::priority (void) const
 {
   return this->priority_;
 }
+
+ACE_INLINE CORBA::Short
+TAO_Object_Adapter::Servant_Upcall::priority (void) const
+{
+  return this->current_context_.priority ();
+}
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 8604f49107b..33363685215 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -14,6 +14,8 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/Environment.h"
 #include "tao/Exception.h"
 #include "tao/Stub.h"
@@ -378,12 +380,16 @@ TAO_POA::create_POA_i (const char *adapter_name,
   // default POA policies.
   TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ());
 
+  // Merge policies from the ORB level.
+  this->object_adapter ().validator ().merge_policies (tao_policies.policies (),
+                                                       ACE_TRY_ENV);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
   // Merge in any policies that the user may have specified.
   tao_policies.merge_policies (policies,
                                ACE_TRY_ENV);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
   // if any of the specified policy objects require prior
@@ -1109,9 +1115,9 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   // active in this POA (there is a servant bound to it in the Active
   // Object Map), the ObjectAlreadyActive exception is raised.
   int priorities_match = 1;
-  if (is_user_id_in_map (id,
-                         priority,
-                         priorities_match))
+  if (this->is_user_id_in_map (id,
+                               priority,
+                               priorities_match))
     {
       ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
     }
@@ -1706,7 +1712,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
       // object map.
       PortableServer::ObjectId_var user_id;
       if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                             TAO_INVALID_PRIORITY,
+                                                                             this->cached_policies_.server_priority (),
                                                                              user_id.out ()) != 0)
         {
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
@@ -1869,7 +1875,8 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant,
   // reference. The real requirement here is that a reference is
   // produced that will behave appropriately (that is, yield a
   // consistent Object Id value when asked politely).
-  CORBA::Short priority = TAO_INVALID_PRIORITY;
+  CORBA::Short priority =
+    this->cached_policies_.server_priority ();
   PortableServer::ObjectId_var id = this->servant_to_system_id (servant,
                                                                 priority,
                                                                 ACE_TRY_ENV);
@@ -3236,16 +3243,86 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
   ACE_CHECK_RETURN (0);
 
   TAO_Default_Acceptor_Filter filter;
-  TAO_Stub *data = this->orb_core_.create_stub_object (key,
-                                                       type_id,
-                                                       client_exposed_policies._retn (),
-                                                       &filter,
-                                                       ACE_TRY_ENV);
+  TAO_Stub *data =
+    this->create_stub_object (key,
+                              type_id,
+                              client_exposed_policies._retn (),
+                              &filter,
+                              this->orb_core_.lane_resources ().acceptor_registry (),
+                              ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   return data;
 }
 
+TAO_Stub *
+TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
+                             const char *type_id,
+                             CORBA::PolicyList *policy_list,
+                             TAO_Acceptor_Filter *filter,
+                             TAO_Acceptor_Registry &acceptor_registry,
+                             CORBA::Environment &ACE_TRY_ENV)
+{
+  int error = 0;
+
+  // Count the number of endpoints.
+  size_t profile_count =
+    acceptor_registry.endpoint_count ();
+
+   // Create a profile container and have acceptor registries populate
+   // it with profiles as appropriate.
+  TAO_MProfile mprofile (0);
+
+  // Allocate space for storing the profiles.  There can never be more
+  // profiles than there are endpoints.  In some cases, there can be
+  // less profiles than endpoints.
+  int result =
+    mprofile.set (profile_count);
+  if (result == -1)
+    error = 1;
+
+  if (!error)
+    {
+      result =
+        filter->fill_profile (object_key,
+                              mprofile,
+                              acceptor_registry.begin (),
+                              acceptor_registry.end ());
+      if (result == -1)
+        error = 1;
+    }
+
+  if (!error)
+    result = filter->encode_endpoints (mprofile);
+  if (result == -1)
+    error = 1;
+
+  if (error)
+    ACE_THROW_RETURN (CORBA::INTERNAL (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_MPROFILE_CREATION_ERROR,
+                          0),
+                        CORBA::COMPLETED_NO),
+                      0);
+
+  // Make sure we have at least one profile.  <mp> may end up being
+  // empty if none of the acceptor endpoints have the right priority
+  // for this object, for example.
+  if (mprofile.profile_count () == 0)
+    ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_MPROFILE_CREATION_ERROR,
+                          0),
+                        CORBA::COMPLETED_NO),
+                      0);
+
+  return
+    this->orb_core_.create_stub_object (mprofile,
+                                        type_id,
+                                        policy_list,
+                                        ACE_TRY_ENV);
+}
+
 CORBA::PolicyList *
 TAO_POA::client_exposed_policies (CORBA::Short object_priority,
                                   CORBA_Environment &ACE_TRY_ENV)
@@ -3296,7 +3373,7 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
   // Activate the servant in the root poa.
   PortableServer::ObjectId_var id =
     root_poa->activate_object_i (this->server_object_,
-                                 TAO_INVALID_PRIORITY,
+                                 this->cached_policies_.server_priority (),
                                  ACE_TRY_ENV);
   ACE_CHECK;
 
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 9f25c5073c6..a72790868e3 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -68,6 +68,7 @@
 #endif /* _MSC_VER */
 
 class TAO_Acceptor_Filter;
+class TAO_Acceptor_Registry;
 class TAO_Temporary_Creation_Time;
 
 class TAO_Creation_Time
@@ -137,9 +138,10 @@ public:
   friend class TAO_Object_Adapter::Non_Servant_Upcall;
   friend class TAO_POA_Current_Impl;
   friend class TAO_POA_Manager;
+  friend class TAO_RT_Collocation_Resolver;
 
   typedef ACE_CString String;
-  
+
   /**
    * This method is used to downcast safely an instance of PortableServer::POA
    * to an instance of TAO_POA when RTTI is not enabled.
@@ -389,6 +391,8 @@ public:
   /// Accessor for the current thread policy of this POA.
   PortableServer::ThreadPolicyValue thread_policy (void) const;
 
+  virtual void *thread_pool (void) const;
+
 protected:
 
   const ACE_CString &name (void) const;
@@ -487,6 +491,13 @@ protected:
                                    CORBA_Environment &ACE_TRY_ENV);
   // Like key_to_stub() but assume that the ORB is not shutting down.
 
+  TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
+                                const char *type_id,
+                                CORBA::PolicyList *policy_list,
+                                TAO_Acceptor_Filter *filter,
+                                TAO_Acceptor_Registry &acceptor_registry,
+                                CORBA::Environment &ACE_TRY_ENV);
+
   int is_servant_in_map (PortableServer::Servant servant);
 
   int is_user_id_in_map (const PortableServer::ObjectId &user_id,
diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i
index e5d7c02ddc8..e6fb4fd073b 100644
--- a/TAO/tao/PortableServer/POA.i
+++ b/TAO/tao/PortableServer/POA.i
@@ -611,3 +611,8 @@ TAO_POA::cached_policies (void)
   return this->cached_policies_;
 }
 
+ACE_INLINE void *
+TAO_POA::thread_pool (void) const
+{
+  return 0;
+}
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 542aa912b9b..716b1eef0f9 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -12,15 +12,15 @@ ACE_RCSID(tao, POA, "$Id$")
 
 
 TAO_POA_Cached_Policies::TAO_POA_Cached_Policies ()
-  :  thread_ (PortableServer::ORB_CTRL_MODEL),
-     lifespan_ (PortableServer::TRANSIENT),
-     id_uniqueness_ (PortableServer::UNIQUE_ID),
-     id_assignment_ (PortableServer::SYSTEM_ID),
-     implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
-     servant_retention_ (PortableServer::RETAIN),
-     request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
-     priority_model_ (TAO_POA_Cached_Policies::CLIENT_PROPAGATED),
-     server_priority_ (TAO_INVALID_PRIORITY)
+  : thread_ (PortableServer::ORB_CTRL_MODEL),
+    lifespan_ (PortableServer::TRANSIENT),
+    id_uniqueness_ (PortableServer::UNIQUE_ID),
+    id_assignment_ (PortableServer::SYSTEM_ID),
+    implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
+    servant_retention_ (PortableServer::RETAIN),
+    request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
+    priority_model_ (TAO_POA_Cached_Policies::NOT_SPECIFIED),
+    server_priority_ (TAO_INVALID_PRIORITY)
 {
 }
 
@@ -147,4 +147,3 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy,
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
-
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 7c48a443c0b..b4e1c4713b3 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -46,7 +46,8 @@ public:
   enum PriorityModel
   {
     CLIENT_PROPAGATED,
-    SERVER_DECLARED
+    SERVER_DECLARED,
+    NOT_SPECIFIED
   };
 
   TAO_POA_Cached_Policies ();
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 82f477a93db..6cc40c0a6bf 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -71,6 +71,8 @@ public:
   void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies,
                                           CORBA::Environment &ACE_TRY_ENV);
 
+  TAO_Policy_Set &policies (void);
+
 protected:
   TAO_Policy_Set impl_;
 };
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index e033967f5d4..94d39143949 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -37,3 +37,8 @@ TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy,
   ACE_CHECK;
 }
 
+ACE_INLINE TAO_Policy_Set &
+TAO_POA_Policy_Set::policies (void)
+{
+  return this->impl_;
+}
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 0199f0e709f..871d5b5ca21 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -125,16 +125,16 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"copy", 	&POA_CORBA_Policy::copy_skel},
+      {"copy",  &POA_CORBA_Policy::copy_skel},
       {"_is_a",  &POA_CORBA_Policy::_is_a_skel},
       {"",0},
-      {"destroy", 	&POA_CORBA_Policy::destroy_skel},
+      {"destroy",       &POA_CORBA_Policy::destroy_skel},
       {"",0},{"",0},
       {"_interface",  &POA_CORBA_Policy::_interface_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA_Policy::_non_existent_skel},
       {"",0},{"",0},
-      {"_get_policy_type", 	&POA_CORBA_Policy::_get_policy_type_skel},
+      {"_get_policy_type",      &POA_CORBA_Policy::_get_policy_type_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -552,7 +552,8 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
diff --git a/TAO/tao/PortableServer/Policy_Validator.cpp b/TAO/tao/PortableServer/Policy_Validator.cpp
index 6b64139659e..b6a0e90ea2d 100644
--- a/TAO/tao/PortableServer/Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Policy_Validator.cpp
@@ -2,13 +2,15 @@
 
 #include "Policy_Validator.h"
 #include "tao/Environment.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID(tao, POA, "$Id$")
 
 TAO_POA_Policy_Validator *TAO_POA_Policy_Validator::last_ = 0;
 
-TAO_POA_Policy_Validator::TAO_POA_Policy_Validator (void)
-  : next_ (0)
+TAO_POA_Policy_Validator::TAO_POA_Policy_Validator (TAO_ORB_Core &orb_core)
+  : orb_core_ (orb_core),
+    next_ (0)
 {
   // No-Op.
 }
@@ -22,7 +24,7 @@ void
 TAO_POA_Policy_Validator::add_validator (TAO_POA_Policy_Validator *validator)
 {
   if (this->last_ == 0)
-      this->last_ = this->next_ = validator;
+    this->last_ = this->next_ = validator;
   else
     this->last_ = this->last_->next_ = validator;
 }
@@ -30,7 +32,7 @@ TAO_POA_Policy_Validator::add_validator (TAO_POA_Policy_Validator *validator)
 
 void
 TAO_POA_Policy_Validator::validate (TAO_Policy_Set &policies,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &ACE_TRY_ENV)
 {
   this->validate_impl (policies, ACE_TRY_ENV);
   ACE_CHECK;
@@ -42,11 +44,23 @@ TAO_POA_Policy_Validator::validate (TAO_Policy_Set &policies,
     }
 }
 
+void
+TAO_POA_Policy_Validator::merge_policies (TAO_Policy_Set &policies,
+                                          CORBA::Environment &ACE_TRY_ENV)
+{
+  this->merge_policies_impl (policies, ACE_TRY_ENV);
+  ACE_CHECK;
+
+  if (this->next_ != 0)
+    {
+      this->next_->merge_policies (policies, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+}
+
 CORBA::Boolean
 TAO_POA_Policy_Validator::legal_policy (CORBA::PolicyType type)
 {
   return (this->legal_policy_impl (type) ||
           ((this->next_ != 0) && this->next_->legal_policy_impl (type)));
 }
-
-
diff --git a/TAO/tao/PortableServer/Policy_Validator.h b/TAO/tao/PortableServer/Policy_Validator.h
index 328dc251cc9..f9d94ef0630 100644
--- a/TAO/tao/PortableServer/Policy_Validator.h
+++ b/TAO/tao/PortableServer/Policy_Validator.h
@@ -26,12 +26,13 @@
 
 // Forward declarations.
 class TAO_Policy_Set;
+class TAO_ORB_Core;
 
 class TAO_PortableServer_Export TAO_POA_Policy_Validator
 {
 public:
   /// Constructor.
-  TAO_POA_Policy_Validator (void);
+  TAO_POA_Policy_Validator (TAO_ORB_Core &orb_core);
 
   /// Destructor.
   virtual ~TAO_POA_Policy_Validator (void);
@@ -45,6 +46,12 @@ public:
                  CORBA::Environment &ACE_TRY_ENV);
 
   /**
+   * Add/merge policies.
+   **/
+  void merge_policies (TAO_Policy_Set &policies,
+                       CORBA::Environment &ACE_TRY_ENV);
+
+  /**
    * Return whether the specified policy type is legal for the
    * current configuration.  This is needed since the user can
    * potentially specify policies that are unknown to an
@@ -66,8 +73,13 @@ protected:
   virtual void validate_impl (TAO_Policy_Set &policies,
                               CORBA::Environment &ACE_TRY_ENV) = 0;
 
+  virtual void merge_policies_impl (TAO_Policy_Set &policies,
+                                    CORBA::Environment &ACE_TRY_ENV) = 0;
+
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0;
 
+  TAO_ORB_Core &orb_core_;
+
 private:
   TAO_POA_Policy_Validator *next_;
   static TAO_POA_Policy_Validator *last_;
@@ -75,5 +87,3 @@ private:
 
 #include "ace/post.h"
 #endif /* TAO_POLICY_VALIDATOR_H_ */
-
-
diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
index 7fc27e57e55..13192281737 100644
--- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
@@ -39,7 +39,8 @@ TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object,
                                                    CORBA::Environment &ACE_TRY_ENV)
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object);
+    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 9a7a97b45be..cec2e1a4e2e 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -7,7 +7,6 @@
  *  $Id$
  *
  *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- *
  */
 // ===================================================================
 
@@ -27,6 +26,7 @@ class TAO_ORB_Core;
 class TAO_GIOP_Invocation;
 class TAO_Resource_Factory;
 class TAO_Service_Context;
+class TAO_Acceptor_Registry;
 
 class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object
 {
@@ -64,12 +64,11 @@ public:
                                   &is_client_propagated,
                                   CORBA::Short &server_priority) = 0;
 
-  virtual void get_selector_bands_policy_hook (
-                           CORBA::Policy *bands_policy,
-                           CORBA::Short &min_priority,
-                           CORBA::Short &max_priority,
-                           CORBA::Short &p,
-                           int &in_range) = 0;
+  virtual void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
+                                               CORBA::Short &min_priority,
+                                               CORBA::Short &max_priority,
+                                               CORBA::Short &p,
+                                               int &in_range) = 0;
 
   /**
    * Accessor and modifier to the current thread priority, used to
@@ -98,9 +97,13 @@ public:
 
   /// Sets the default_policies for ORB.
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
-  /// default RTCORBA policies: ServerProtocolPolicy and
-  /// ClientProtocolPolicy.
+  /// default RTCORBA policies: ClientProtocolPolicy.
   virtual int set_default_policies (CORBA::Environment &ACE_TRY_ENV) = 0;
+
+  /// Sets the default ServerProtocolPolicy.
+  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
+                                                  CORBA::Environment &ACE_TRY_ENV) = 0;
+
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
new file mode 100644
index 00000000000..fe50a6d7e4d
--- /dev/null
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -0,0 +1,130 @@
+// $Id$
+
+#include "Continuous_Priority_Mapping.h"
+#include "ace/Sched_Params.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Continuous_Priority_Mapping.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id: ")
+
+TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
+  :  policy_ (policy)
+{
+  this->min_ =
+    ACE_Sched_Params::priority_min (this->policy_);
+
+  this->max_ =
+    ACE_Sched_Params::priority_max (this->policy_);
+}
+
+TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping (void)
+{
+}
+
+CORBA::Boolean
+TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
+                                            RTCORBA::NativePriority &native_priority)
+{
+  if (corba_priority < 0)
+    return 0;
+
+#if defined (ACE_WIN32)
+
+  int current_native_priority = this->min_;
+  int next_native_priority;
+  for (int i = 1; i <= corba_priority; ++i)
+    {
+      next_native_priority =
+        ACE_Sched_Params::next_priority (this->policy_,
+                                         current_native_priority);
+
+      if (next_native_priority == current_native_priority)
+        return 0;
+
+      current_native_priority = next_native_priority;
+    }
+
+  native_priority = current_native_priority;
+  return 1;
+
+#else
+
+  if (this->min_ < this->max_)
+    {
+      native_priority = corba_priority + this->min_;
+      if (native_priority > this->max_)
+        return 0;
+    }
+  else if (this->min_ > this->max_)
+    {
+      native_priority = this->min_ - corba_priority;
+      if (native_priority < this->max_)
+        return 0;
+    }
+  else
+    {
+      // There is only one native priority.
+      if (corba_priority != 0)
+        return 0;
+
+      native_priority = this->min_;
+    }
+
+  return 1;
+
+#endif /* ACE_WIN32 */
+
+}
+
+CORBA::Boolean
+TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
+                                           RTCORBA::Priority &corba_priority)
+{
+
+#if defined (ACE_WIN32)
+
+  int current_native_priority = this->min_;
+  for (corba_priority = 0; ; ++corba_priority)
+    {
+      if (current_native_priority == native_priority)
+        return 1;
+
+      else if (current_native_priority == this->max_)
+        return 0;
+
+      else
+        current_native_priority =
+          ACE_Sched_Params::next_priority (this->policy_,
+                                           current_native_priority);
+    }
+
+#else
+
+  if (this->min_ < this->max_)
+    {
+      if (native_priority < this->min_
+          || native_priority > this->max_)
+        return 0;
+      corba_priority = native_priority - this->min_;
+    }
+  else if (this->min_ > this->max_)
+    {
+      if (native_priority > this->min_
+          || native_priority < this->max_)
+        return 0;
+      corba_priority = this->min_ - native_priority;
+    }
+  else if (this->min_ == this->max_)
+    {
+      if (native_priority != this->min_)
+        return 0;
+      corba_priority = 0;
+    }
+
+  return 1;
+
+#endif /* ACE_WIN32 */
+
+}
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
new file mode 100644
index 00000000000..820df1379fb
--- /dev/null
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -0,0 +1,75 @@
+//=============================================================================
+/**
+ *  @file    Continuous_Priority_Mapping.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_CONTINUOUS_PRIORITY_MAPPING_H
+#define TAO_CONTINUOUS_PRIORITY_MAPPING_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "rtcorba_export.h"
+#include "Priority_Mapping.h"
+
+/**
+ * @class TAO_Continuous_Priority_Mapping
+ *
+ * @brief Maps the first n CORBA priorities to the range of native
+ * priorities, where n is the number of native priorities.
+ *
+ * The lowest native priority is mapped to CORBA priority 0, next
+ * higher native priority is mapped to CORBA priority 1, and so
+ * on. Since in all the operating systems where TAO is supported the
+ * native priority set contains less than 32767 priorities, part of
+ * the CORBA priority range is left unused.  Consider NT as an
+ * example. NT native priorities -15 -2 -1 0 1 2 15 are mapped to
+ * CORBA priorities 0 1 2 3 4 5 6, respectively, and the rest of the
+ * CORBA priority range is not used.
+ *
+ * This class was previously called Direct_Priority_Mapping.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping
+  : public TAO_Priority_Mapping
+{
+public:
+
+  /// Constructor.
+  TAO_Continuous_Priority_Mapping (int policy = ACE_SCHED_OTHER);
+
+  /// Destructor.
+  ~TAO_Continuous_Priority_Mapping (void);
+
+  /// Convert CORBA priority to native priority.
+  CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
+                            RTCORBA::NativePriority &native_priority);
+
+  /// Convert native priority to CORBA priority.
+  CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority,
+                           RTCORBA::Priority &corba_priority);
+
+private:
+  int policy_;
+  int min_;
+  int max_;
+};
+
+#if defined (__ACE_INLINE__)
+# include "Continuous_Priority_Mapping.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_CONTINUOUS_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.i b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index 4018aecbf04..1e7d75265d1 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -11,62 +11,8 @@
 
 ACE_RCSID(Strategies, Direct_Priority_Mapping, "$Id$")
 
-TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (int policy)
-  :  policy_ (policy)
+TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
 {
-  // We have special behavior for SUNs.  This is because the results
-  // from ACE_Sched_Params::priority_min() and
-  // ACE_Sched_Params::priority_max() are not correct.
-
-#if defined (sun)
-
-  ACE_utsname name;
-  ACE_OS::uname (&name);
-
-  // If we are on Solaris 5.7.
-  if (ACE_OS::strcmp (name.release, "5.7") == 0)
-    {
-      if (policy == ACE_SCHED_OTHER)
-        {
-          this->min_ = 0;
-          this->max_ = 127;
-        }
-      else
-        {
-          this->min_ = 0;
-          this->max_ = 59;
-        }
-    }
-  // If we are on Solaris 5.8.
-  else if (ACE_OS::strcmp (name.release, "5.8") == 0)
-    {
-      if (policy == ACE_SCHED_OTHER)
-        {
-          this->min_ = -20;
-          this->max_ = 127;
-        }
-      else
-        {
-          this->min_ = 0;
-          this->max_ = 59;
-        }
-    }
-  // Not sure about the other SUN releases.  Therefore, lets stick to
-  // the default behavior.
-  else
-    {
-      this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-      this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-    }
-
-#else /* sun */
-
-  // Other platforms should be ok.
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-
-#endif /* sun */
-
 }
 
 TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping (void)
@@ -77,99 +23,14 @@ CORBA::Boolean
 TAO_Direct_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                         RTCORBA::NativePriority &native_priority)
 {
-  if (corba_priority < 0)
-    return 0;
-
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  int next_native_priority;
-  for (int i = 1; i <= corba_priority; ++i)
-    {
-      next_native_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_native_priority);
-
-      if (next_native_priority == current_native_priority)
-        return 0;
-
-      current_native_priority = next_native_priority;
-    }
-
-  native_priority = current_native_priority;
+  native_priority = corba_priority;
   return 1;
-
-#else
-
-  if (this->min_ < this->max_)
-    {
-      native_priority = corba_priority + this->min_;
-      if (native_priority > this->max_)
-        return 0;
-    }
-  else if (this->min_ > this->max_)
-    {
-      native_priority = this->min_ - corba_priority;
-      if (native_priority < this->max_)
-        return 0;
-    }
-  else
-    {
-      // There is only one native priority.
-      if (corba_priority != 0)
-        return 0;
-
-      native_priority = this->min_;
-    }
-
-  return 1;
-#endif /* ACE_WIN32 */
 }
 
 CORBA::Boolean
 TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
                                        RTCORBA::Priority &corba_priority)
 {
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  for (corba_priority = 0; ; ++corba_priority)
-    {
-      if (current_native_priority == native_priority)
-        return 1;
-
-      else if (current_native_priority == this->max_)
-        return 0;
-
-      else
-        current_native_priority =
-          ACE_Sched_Params::next_priority (this->policy_,
-                                           current_native_priority);
-    }
-
-#else
-  if (this->min_ < this->max_)
-    {
-      if (native_priority < this->min_
-          || native_priority > this->max_)
-        return 0;
-      corba_priority = native_priority - this->min_;
-    }
-  else if (this->min_ > this->max_)
-    {
-      if (native_priority > this->min_
-          || native_priority < this->max_)
-        return 0;
-      corba_priority = this->min_ - native_priority;
-    }
-  else if (this->min_ == this->max_)
-    {
-      if (native_priority != this->min_)
-        return 0;
-      corba_priority = 0;
-    }
-
+  corba_priority = native_priority;
   return 1;
-
-#endif /* ACE_WIN32 */
 }
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index 91e7d635e02..640f9435927 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -23,7 +23,6 @@
 
 #include "tao/orbconf.h"
 
-#include "rtcorba_export.h"
 #include "Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -32,18 +31,13 @@
 
 class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping
 {
-  //
   // = TITLE
   //   A simple implementation of the Priority_Mapping interface
   //
   // = DESCRIPTION
-  //   This implementation uses direct mapping between the range of
-  //   priorities for a given scheduling class (ACE_SCHED_OTHER,
-  //   ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
-  //   priorities (0...32767)
-  //
+  //   This implementation uses direct mapping.
 public:
-  TAO_Direct_Priority_Mapping (int policy = ACE_SCHED_OTHER);
+  TAO_Direct_Priority_Mapping (long);
   // Default constructor
 
   virtual ~TAO_Direct_Priority_Mapping (void);
@@ -57,12 +51,6 @@ public:
                 RTCORBA::Priority &corba_priority);
 
 private:
-  int policy_;
-  // The scheduling policy
-
-  int min_;
-  int max_;
-  // The range
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index e6fe6ff9eb6..f45c7ae3ea0 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -12,62 +12,11 @@
 
 ACE_RCSID(Strategies, Linear_Priority_Mapping, "$Id$")
 
-TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (int policy)
-  :  policy_ (policy)
+TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
+  : policy_ (policy)
 {
-  // We have special behavior for SUNs.  This is because the results
-  // from ACE_Sched_Params::priority_min() and
-  // ACE_Sched_Params::priority_max() are not correct.
-
-#if defined (sun)
-
-  ACE_utsname name;
-  ACE_OS::uname (&name);
-
-  // If we are on Solaris 5.7.
-  if (ACE_OS::strcmp (name.release, "5.7") == 0)
-    {
-      if (policy == ACE_SCHED_OTHER)
-        {
-          this->min_ = 0;
-          this->max_ = 127;
-        }
-      else
-        {
-          this->min_ = 0;
-          this->max_ = 59;
-        }
-    }
-  // If we are on Solaris 5.8.
-  else if (ACE_OS::strcmp (name.release, "5.8") == 0)
-    {
-      if (policy == ACE_SCHED_OTHER)
-        {
-          this->min_ = -20;
-          this->max_ = 127;
-        }
-      else
-        {
-          this->min_ = 0;
-          this->max_ = 59;
-        }
-    }
-  // Not sure about the other SUN releases.  Therefore, lets stick to
-  // the default behavior.
-  else
-    {
-      this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-      this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-    }
-
-#else /* sun */
-
-  // Other platforms should be ok.
   this->min_ = ACE_Sched_Params::priority_min (this->policy_);
   this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-
-#endif /* sun */
-
 }
 
 TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
@@ -78,7 +27,8 @@ CORBA::Boolean
 TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                         RTCORBA::NativePriority &native_priority)
 {
-  if (corba_priority < 0 || corba_priority > RTCORBA::maxPriority)
+  if (corba_priority < RTCORBA::minPriority ||
+      corba_priority > RTCORBA::maxPriority)
     return 0;
 
 #if defined (ACE_WIN32)
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index 9428f7af1fe..059c2534560 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -43,7 +43,7 @@ class TAO_RTCORBA_Export TAO_Linear_Priority_Mapping : public TAO_Priority_Mappi
   //   priorities (0...32767)
   //
 public:
-  TAO_Linear_Priority_Mapping (int policy = ACE_SCHED_OTHER);
+  TAO_Linear_Priority_Mapping (long policy);
   // Default constructor
 
   virtual ~TAO_Linear_Priority_Mapping (void);
@@ -57,7 +57,7 @@ public:
                 RTCORBA::Priority &corba_priority);
 
 private:
-  int policy_;
+  long policy_;
   // The scheduling policy
 
   int min_;
diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile
index 6da92e6a08e..a7ecb4e2694 100644
--- a/TAO/tao/RTCORBA/Makefile
+++ b/TAO/tao/RTCORBA/Makefile
@@ -25,9 +25,10 @@ ifeq ($(corba_messaging),1)
 
 
 CPP_SRCS += \
+  Continuous_Priority_Mapping \
   Direct_Priority_Mapping \
   Linear_Priority_Mapping \
-  Pool_Per_Endpoint \
+  RT_Thread_Lane_Resources_Manager \
   Priority_Mapping \
   Priority_Mapping_Manager \
   Private_Transport_Descriptor \
@@ -84,6 +85,157 @@ endif # corba_messaging
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
+.obj/Continuous_Priority_Mapping.o .obj/Continuous_Priority_Mapping.so .shobj/Continuous_Priority_Mapping.o .shobj/Continuous_Priority_Mapping.so: Continuous_Priority_Mapping.cpp \
+  Continuous_Priority_Mapping.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  rtcorba_export.h Priority_Mapping.h RTCORBAC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  RTCORBAC.i Priority_Mapping.i Continuous_Priority_Mapping.i \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
+
 .obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.so .shobj/Direct_Priority_Mapping.o .shobj/Direct_Priority_Mapping.so: Direct_Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -110,8 +262,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  Direct_Priority_Mapping.h rtcorba_export.h Priority_Mapping.h \
-  RTCORBAC.h \
+  Direct_Priority_Mapping.h Priority_Mapping.h RTCORBAC.h \
+  rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/Any.h \
@@ -387,9 +539,11 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/Pool_Per_Endpoint.o .obj/Pool_Per_Endpoint.so .shobj/Pool_Per_Endpoint.o .shobj/Pool_Per_Endpoint.so: Pool_Per_Endpoint.cpp Pool_Per_Endpoint.h \
+.obj/RT_Thread_Lane_Resources_Manager.o .obj/RT_Thread_Lane_Resources_Manager.so .shobj/RT_Thread_Lane_Resources_Manager.o .shobj/RT_Thread_Lane_Resources_Manager.so: RT_Thread_Lane_Resources_Manager.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
-  rtcorba_export.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -398,14 +552,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -416,8 +562,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -481,14 +635,39 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/try_macros.h \
-  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Services.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -518,88 +697,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Pool_Per_Endpoint.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
@@ -624,6 +721,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(TAO_ROOT)/tao/TAO_Singleton.inl \
   $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -654,18 +756,84 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/Acceptor_Registry.h \
   $(TAO_ROOT)/tao/Acceptor_Registry.i \
-  Priority_Mapping_Manager.h Priority_Mapping.h RTCORBAC.h RTCORBAC.i \
-  Priority_Mapping.i Priority_Mapping_Manager.i \
-  $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.h \
+  $(ACE_ROOT)/ace/Intrusive_List.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.cpp \
+  $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/Priority_Mapping.o .obj/Priority_Mapping.so .shobj/Priority_Mapping.o .shobj/Priority_Mapping.so: Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
@@ -1220,12 +1388,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.i \
   RTCORBAC.i RT_ORB_Loader.h \
-  $(TAO_ROOT)/tao/Object_Loader.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -1243,13 +1409,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  RT_Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  Priority_Mapping_Manager.h Priority_Mapping.h Priority_Mapping.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  Priority_Mapping_Manager.i RT_Protocols_Hooks.i
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 
 .obj/RTCORBAC.o .obj/RTCORBAC.so .shobj/RTCORBAC.o .shobj/RTCORBAC.so: RTCORBAC.cpp RTCORBAC.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -1558,8 +1718,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i RTCORBA.h \
+  $(ACE_ROOT)/ace/OS.i RTCORBAC.h \
   rtcorba_export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1629,12 +1793,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
@@ -2620,7 +2779,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
   $(TAO_ROOT)/tao/Invocation.i \
-  RT_Policy_i.h RTCORBA.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i \
+  RT_Policy_i.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.i \
   RT_Stub.h Private_Transport_Descriptor.h \
@@ -2658,8 +2817,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i RTCORBA.h \
+  $(ACE_ROOT)/ace/OS.i RTCORBAC.h \
   rtcorba_export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2729,12 +2892,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
@@ -2783,38 +2941,23 @@ endif # corba_messaging
   RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  RT_ORB.h Thread_Pool.h \
-  $(ACE_ROOT)/ace/Task.h \
+  RT_ORB.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2829,43 +2972,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ORB.i \
-  Thread_Pool.i RT_ORB.i
+  RT_ORB.i
 
 .obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -2892,8 +2999,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i RTCORBA.h \
+  $(ACE_ROOT)/ace/OS.i RTCORBAC.h \
   rtcorba_export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2963,12 +3074,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
@@ -3017,38 +3123,22 @@ endif # corba_messaging
   RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  Thread_Pool.h \
-  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
@@ -3063,46 +3153,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  RT_ORB.i RT_Policy_i.h RT_Policy_i.i RT_Mutex.h \
+  Priority_Mapping_Manager.h Priority_Mapping.h Priority_Mapping.i \
+  Priority_Mapping_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
   $(TAO_ROOT)/tao/Services.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
   $(TAO_ROOT)/tao/ORB.i \
-  Thread_Pool.i RT_ORB.i RT_Policy_i.h RT_Policy_i.i RT_Mutex.h \
-  Priority_Mapping_Manager.h Priority_Mapping.h Priority_Mapping.i \
-  Priority_Mapping_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
@@ -3139,12 +3199,68 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/ORB_Core.i
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i
 
 .obj/RT_ORBInitializer.o .obj/RT_ORBInitializer.so .shobj/RT_ORBInitializer.o .shobj/RT_ORBInitializer.so: RT_ORBInitializer.cpp RT_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3306,8 +3422,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  RT_PolicyFactory.h RTCORBA.h RTCORBAC.h RTCORBAC.i RT_Policy_i.h \
-  RT_Policy_i.i RT_Protocols_Hooks.h \
+  RT_PolicyFactory.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  RT_Policy_i.h RTCORBAC.h RT_Policy_i.i RT_Protocols_Hooks.h \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -3396,48 +3515,21 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ORBInitInfo.inl \
-  RT_ORB_Loader.h \
-  $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  RT_Stub_Factory.h \
+  RT_ORB_Loader.h RT_Stub_Factory.h \
   $(TAO_ROOT)/tao/Stub_Factory.h \
   RT_Endpoint_Selector_Factory.h \
   $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
+  Continuous_Priority_Mapping.h Continuous_Priority_Mapping.i \
   Linear_Priority_Mapping.h Linear_Priority_Mapping.i \
-  Direct_Priority_Mapping.h Direct_Priority_Mapping.i RT_ORB.h \
-  Thread_Pool.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  Direct_Priority_Mapping.h Direct_Priority_Mapping.i RT_ORB.h RT_ORB.i \
+  RT_Current.h RT_Current.i RT_Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i \
   $(ACE_ROOT)/ace/Service_Repository.h \
   $(ACE_ROOT)/ace/Service_Types.h \
   $(ACE_ROOT)/ace/Service_Types.i \
   $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Thread_Pool.i RT_ORB.i RT_Current.h RT_Current.i \
   $(ACE_ROOT)/ace/Svc_Conf.h \
   $(ACE_ROOT)/ace/Obstack.h \
   $(ACE_ROOT)/ace/Obstack_T.h \
@@ -3460,13 +3552,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
@@ -3479,6 +3566,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -3492,15 +3581,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Record.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Log_Record.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Signal.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -3508,35 +3594,64 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Atomic_Op.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
   $(ACE_ROOT)/ace/Free_List.h \
   $(ACE_ROOT)/ace/Free_List.i \
   $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  RT_ORBInitializer.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
   $(ACE_ROOT)/ace/Mem_Map.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -3549,33 +3664,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  RT_ORBInitializer.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/Any.h \
@@ -3590,6 +3678,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -3857,7 +3947,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  RT_Policy_i.h RTCORBA.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i
+  RT_Policy_i.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i
 
 .obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp RT_Policy_i.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3884,8 +3974,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i RTCORBA.h \
+  $(ACE_ROOT)/ace/OS.i RTCORBAC.h \
   rtcorba_export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3955,12 +4049,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
@@ -4278,7 +4367,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  RT_Protocols_Hooks.i RT_Policy_i.h RTCORBA.h RT_Policy_i.i \
+  RT_Protocols_Hooks.i RT_Policy_i.h RT_Policy_i.i \
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/Pluggable.h \
@@ -4380,6 +4469,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   RT_Stub.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
@@ -4638,8 +4731,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/Stub.i \
-  rtcorba_export.h RT_Policy_i.h RTCORBA.h RTCORBAC.h RTCORBAC.i \
-  RT_Policy_i.i
+  rtcorba_export.h RT_Policy_i.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i
 
 .obj/RT_Stub_Factory.o .obj/RT_Stub_Factory.so .shobj/RT_Stub_Factory.o .shobj/RT_Stub_Factory.so: RT_Stub_Factory.cpp RT_Stub_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -4922,10 +5014,15 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/OS.i RTCORBAC.h \
+  rtcorba_export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -4938,70 +5035,38 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Atomic_Op.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Record.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Log_Record.i \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
   $(ACE_ROOT)/ace/Free_List.i \
   $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Signal.h \
   $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
@@ -5010,77 +5075,21 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  RTCORBA.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/try_macros.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
@@ -5092,6 +5101,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Typecode.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
@@ -5109,6 +5120,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(TAO_ROOT)/tao/TAO_Singleton.inl \
   $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
@@ -5120,17 +5136,95 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.i \
   RTCORBAC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  Thread_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
   $(TAO_ROOT)/tao/Services.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
   $(TAO_ROOT)/tao/ORB.i \
-  Thread_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
@@ -5174,6 +5268,34 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
+  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
+  $(TAO_ROOT)/tao/Leader_Follower.h \
+  $(TAO_ROOT)/tao/LF_Follower.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
+  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
+  $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.h \
+  $(ACE_ROOT)/ace/Intrusive_List.inl \
+  $(ACE_ROOT)/ace/Intrusive_List.cpp \
+  $(TAO_ROOT)/tao/Leader_Follower.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/RTCORBA/Makefile.bor b/TAO/tao/RTCORBA/Makefile.bor
index 853e3096f4e..8cbfede95ce 100644
--- a/TAO/tao/RTCORBA/Makefile.bor
+++ b/TAO/tao/RTCORBA/Makefile.bor
@@ -5,9 +5,10 @@
 NAME = TAO_RTCORBA
 
 OBJFILES = \
+	$(OBJDIR)\Continuous_Priority_Mapping.obj \
 	$(OBJDIR)\Direct_Priority_Mapping.obj \
 	$(OBJDIR)\Linear_Priority_Mapping.obj \
-	$(OBJDIR)\Pool_Per_Endpoint.obj \
+	$(OBJDIR)\RT_Thread_Lane_Resources_Manager.obj \
 	$(OBJDIR)\Priority_Mapping.obj \
 	$(OBJDIR)\Priority_Mapping_Manager.obj \
 	$(OBJDIR)\Private_Transport_Descriptor.obj \
diff --git a/TAO/tao/RTCORBA/Pool_Per_Endpoint.cpp b/TAO/tao/RTCORBA/Pool_Per_Endpoint.cpp
deleted file mode 100644
index 5a926b83ed4..00000000000
--- a/TAO/tao/RTCORBA/Pool_Per_Endpoint.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-#include "Pool_Per_Endpoint.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Pluggable.h"
-#include "Priority_Mapping_Manager.h"
-#include "tao/debug.h"
-#include "ace/Sched_Params.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Pool_Per_Endpoint.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Pool_Per_Endpoint, "$Id$")
-
-TAO_Pool_Per_Endpoint::TAO_Pool_Per_Endpoint (CORBA::ORB_ptr orb,
-                                              int policy,
-                                              int poolsize,
-                                              int flags)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     policy_ (policy),
-     poolsize_ (poolsize),
-     flags_ (flags)
-{
-  this->thr_mgr (&this->thread_manager_);
-}
-
-TAO_Pool_Per_Endpoint::~TAO_Pool_Per_Endpoint (void)
-{
-}
-
-void
-TAO_Pool_Per_Endpoint::run (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var obj =
-    this->orb_->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER,
-                                            ACE_TRY_ENV);
-
-  TAO_Priority_Mapping_Manager_var mapping_manager =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RTCORBA::PriorityMapping *pm =
-    mapping_manager.in ()->mapping ();
-
-  TAO_Acceptor_Registry *ac =
-    this->orb_->orb_core ()->acceptor_registry ();
-
-  for (TAO_AcceptorSetIterator i = ac->begin (); i != ac->end (); ++i)
-    {
-      int priority =
-        ACE_Sched_Params::priority_min (this->policy_);
-
-      const CORBA::Short corba_priority = (*i)->priority ();
-      CORBA::Short native_priority;
-      if (pm->to_native (corba_priority, native_priority) == 1)
-        priority = native_priority;
-      else
-        ACE_THROW (CORBA::DATA_CONVERSION ());
-
-      if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - creating thread at ")
-                    ACE_TEXT ("priority %d:%d\n"),
-                    priority,
-                    corba_priority));
-
-      if (this->activate (this->flags_,
-                          this->poolsize_, /* number of threads */
-                          1, /* force active */
-                          priority) == -1)
-        {
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-    }
-  this->thread_manager_.wait ();
-}
-
-int
-TAO_Pool_Per_Endpoint::svc (void)
-{
-  if (TAO_debug_level > 3)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - TAO_Pool_Per_Endpoint::svc: ")
-                ACE_TEXT (" using reactor <%x> in this thread\n"),
-                this->orb_->orb_core ()->reactor ()));
-
-  this->orb_->run ();  // @@ Where's the error/exception check?
-
-  if (TAO_debug_level > 3)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - TAO_Pool_Per_Endpoint::svc: ")
-                ACE_TEXT (" ORB::run() finished\n")));
- return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/RTCORBA/Pool_Per_Endpoint.h b/TAO/tao/RTCORBA/Pool_Per_Endpoint.h
deleted file mode 100644
index 34478d5dae1..00000000000
--- a/TAO/tao/RTCORBA/Pool_Per_Endpoint.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   Pool_Per_Endpoint.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_POOL_PER_ENDPOINT_H
-#define TAO_POOL_PER_ENDPOINT_H
-#include "ace/pre.h"
-
-#include "rtcorba_export.h"
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Task.h"
-
-/**
- * @class TAO_Pool_Per_Endpoint
- *
- * @brief The Pool_Per_Endpoint concurrency strategy.
- *
- * This strategy creates a separate thread pool for each endpoint
- * in the system.  It is a helper class to manage and create the
- * required threads.
- * It should be used with the Reactor_Per_Endpoint registry
- * configured.
- */
-class TAO_RTCORBA_Export TAO_Pool_Per_Endpoint : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  TAO_Pool_Per_Endpoint (CORBA::ORB_ptr orb,
-                         int policy = ACE_SCHED_OTHER,
-                         int poolsize = 1,
-                         int flags =
-                             THR_BOUND|THR_NEW_LWP|THR_JOINABLE);
-
-  /// The destructor
-  virtual ~TAO_Pool_Per_Endpoint (void);
-
-  /// Run all the threads and wait until they finish
-  void run (CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ());
-
-  // = The Task_Base entry point
-  int svc (void);
-
-private:
-  /// The ORB.
-  CORBA::ORB_var orb_;
-
-  /// The scheduling policy to activate the threads.
-  int policy_;
-
-  /// The number of threads on each pool.
-  int poolsize_;
-
-  /// The flags used to create the threads
-  int flags_;
-
-  /// The thread manager.
-  ACE_Thread_Manager thread_manager_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Pool_Per_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif /* TAO_POOL_PER_ENDPOINT_H */
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index 0a1a0bc60da..ec3204eb284 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -2,19 +2,10 @@
 
 #include "RTCORBA.h"
 #include "RT_ORB_Loader.h"
-#include "RT_Protocols_Hooks.h"
 
 ACE_RCSID (RTCORBA, RTCORBA, "$Id$")
 
 TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
 {
-  TAO_RTCORBA_Initializer::init ();
-}
-
-int
-TAO_RTCORBA_Initializer::init (void)
-{
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_RT_ORB_Loader);
-  ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_RT_Protocols_Hooks);
-  return 0;
 }
diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
index c23226addc6..e0541e6c572 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -30,16 +30,13 @@ class TAO_RTCORBA_Export TAO_RTCORBA_Initializer
 public:
   // Constructor.
   TAO_RTCORBA_Initializer (void);
-
-  static int init (void);
-  // Used to force the initialization of the ORB code.
 };
 
+static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
+
 #define TAO_RTCORBA_SAFE_INCLUDE
 #include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
-static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
-
 #include "ace/post.h"
 #endif /* TAO_RTCORBA_H_ */
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 672125529b9..856e3d63706 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -17,7 +17,10 @@
 
 #include "tao/orbconf.h"
 
-#include "RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
 #include "tao/LocalObject.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index a87cff52a16..425c34bee14 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -27,8 +27,8 @@ RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
   ACE_NEW (this->bands_protocol_selector_,
            TAO_Bands_Protocol_Selector);
 
-  ACE_NEW (this->default_endpoint_selector_,
-           TAO_Default_Endpoint_Selector);
+  ACE_NEW (this->rt_default_endpoint_selector_,
+           TAO_RT_Default_Endpoint_Selector);
 }
 
 RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
@@ -38,7 +38,7 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
   delete this->protocol_endpoint_selector_;
   delete this->priority_protocol_selector_;
   delete this->bands_protocol_selector_;
-  delete this->default_endpoint_selector_;
+  delete this->rt_default_endpoint_selector_;
 }
 
 TAO_Invocation_Endpoint_Selector *
@@ -57,8 +57,8 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
 
       ACE_THROW_RETURN (CORBA::INTERNAL (
                            CORBA_SystemException::_tao_minor_code (
-                                                                   TAO_DEFAULT_MINOR_CODE,
-                                                                   EINVAL),
+                              TAO_DEFAULT_MINOR_CODE,
+                              EINVAL),
                            CORBA::COMPLETED_NO),
                         0);
     }
@@ -97,7 +97,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
         }
 
       if (client_protocol_policy.ptr () == 0)
-        return this->default_endpoint_selector_;
+        return this->rt_default_endpoint_selector_;
       else
         return this->protocol_endpoint_selector_;
     }
@@ -135,7 +135,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
     {
       // CASE 5: SERVER_DECLARED priority model, no bands.
       if (client_protocol_policy.ptr () == 0)
-        return this->default_endpoint_selector_;
+        return this->rt_default_endpoint_selector_;
       else
         return this->protocol_endpoint_selector_;
     }
@@ -183,4 +183,3 @@ ACE_STATIC_SVC_DEFINE (RT_Endpoint_Selector_Factory,
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
 ACE_FACTORY_DEFINE (TAO_RTCORBA, RT_Endpoint_Selector_Factory)
-
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index 43cf89279b2..9d73b7392a1 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -32,7 +32,7 @@ class TAO_Bands_Endpoint_Selector;
 class TAO_Protocol_Endpoint_Selector;
 class TAO_Priority_Protocol_Selector;
 class TAO_Bands_Protocol_Selector;
-class TAO_Default_Endpoint_Selector;
+class TAO_RT_Default_Endpoint_Selector;
 
 // ****************************************************************
 /**
@@ -85,7 +85,7 @@ private:
   /// The possible endpoint selector strategies that can be
   /// returned by this factory
 
-  TAO_Default_Endpoint_Selector *default_endpoint_selector_;
+  TAO_RT_Default_Endpoint_Selector *rt_default_endpoint_selector_;
   TAO_Priority_Endpoint_Selector *priority_endpoint_selector_;
   TAO_Bands_Endpoint_Selector *bands_endpoint_selector_;
   TAO_Protocol_Endpoint_Selector *protocol_endpoint_selector_;
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 70070e94104..544eab43d41 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -21,6 +21,54 @@ ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$")
 
 // ****************************************************************
 
+void
+TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation,
+                                                   CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_RT_Stub *rt_stub =
+    ACE_dynamic_cast (TAO_RT_Stub *,
+                      invocation->stub ());
+
+  do
+    {
+      invocation->profile (invocation->stub ()->profile_in_use ());
+      invocation->endpoint (invocation->profile ()->endpoint ());
+
+      // If known endpoint, select it.
+      if (invocation->endpoint () != 0)
+        {
+          int status;
+          if (rt_stub->private_connection ())
+            {
+              TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
+                                                             ACE_reinterpret_cast (long, invocation->stub ()));
+
+              status = invocation->perform_call (private_desc, ACE_TRY_ENV);
+              ACE_CHECK;
+            }
+          else
+            {
+              TAO_Base_Transport_Property default_desc (invocation->endpoint ());
+
+              status = invocation->perform_call (default_desc, ACE_TRY_ENV);
+              ACE_CHECK;
+            }
+
+          // Check if the invocation has completed.
+          if (status == 1)
+            return;
+        }
+    }
+  while (invocation->stub ()->next_profile_retry () != 0);
+
+  // If we get here, we completely failed to find an endpoint selector
+  // that we know how to use, so throw an exception.
+  ACE_THROW (CORBA::TRANSIENT (TAO_OMG_VMCID | 2,
+                               CORBA::COMPLETED_NO));
+}
+
+// ****************************************************************
+
 TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void)
 {
 }
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index ea1e1092a83..32dee2d0702 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -30,6 +30,25 @@
 #include "tao/Invocation_Endpoint_Selectors.h"
 
 /**
+ * @class TAO_RT_Default_Endpoint_Selector
+ *
+ * @brief TAO_RT_Default_Endpoint_Selector
+ *
+ * This strategy is used when the only policy that might be set is the
+ * private connection policy.
+ *
+ **/
+class TAO_RTCORBA_Export TAO_RT_Default_Endpoint_Selector :
+  public TAO_Default_Endpoint_Selector
+{
+public:
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
+                                CORBA::Environment &ACE_TRY_ENV);
+};
+
+// ****************************************************************
+
+/**
  * @class TAO_Priority_Endpoint_Selector
  *
  * @brief TAO_Priority_Endpoint_Selector
@@ -49,8 +68,7 @@ public:
   virtual ~TAO_Priority_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+                                CORBA::Environment &ACE_TRY_ENV);
 private:
   /// Helper for <select_endpoint>.
   int is_multihomed (TAO_Endpoint *endpoint);
@@ -78,8 +96,7 @@ public:
   virtual ~TAO_Bands_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+                                CORBA::Environment &ACE_TRY_ENV);
 };
 
 // ****************************************************************
@@ -105,15 +122,12 @@ public:
   virtual ~TAO_Protocol_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+                                CORBA::Environment &ACE_TRY_ENV);
   virtual void next (TAO_GIOP_Invocation *invocation,
-                     CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   virtual void forward (TAO_GIOP_Invocation *invocation,
                         const TAO_MProfile &mprofile,
-                        CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 };
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i
index f38e9b32fc6..916934eb0f3 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i
@@ -33,4 +33,3 @@ ACE_INLINE
 TAO_Bands_Protocol_Selector::TAO_Bands_Protocol_Selector (void)
 {
 }
-
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index c35317aade1..57e18ff2942 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -57,7 +57,9 @@ TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time,
 
   if (result == 0)
     return 1;
-  else if (result == -1 && errno == ETIME)
+  else if (result == -1 &&
+           (errno == ETIME ||
+            errno == EBUSY))
     return 0;
   else
     // Some really bad error.
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index efb30d24418..c16cb59a3b7 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -20,7 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 918570112b8..037fa0238ba 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -5,6 +5,8 @@
 #include "RT_Mutex.h"
 #include "Priority_Mapping_Manager.h"
 #include "tao/ORB_Core.h"
+#include "tao/RTCORBA/Thread_Pool.h"
+#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "RT_ORB.i"
@@ -12,85 +14,19 @@
 
 ACE_RCSID(TAO, RT_ORB, "$Id$")
 
-class TAO_RT_CORBA_Priority_Normalizer : public TAO_CORBA_Priority_Normalizer
-{
-public:
-  /// Constructor.
-  TAO_RT_CORBA_Priority_Normalizer (TAO_ORB_Core *orb_core);
-
-  /// Normalize CORBA Priority
-  CORBA::Boolean normalize (CORBA::Short corba_priority,
-                            CORBA::Short &normalized_corba_priority);
-
-private:
-  // Reference to the priority mapping.
-  RTCORBA::PriorityMapping *priority_mapping_;
-};
-
-TAO_RT_CORBA_Priority_Normalizer::TAO_RT_CORBA_Priority_Normalizer (TAO_ORB_Core *orb_core)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Save a reference to the priority mapping manager.
-      CORBA::Object_var obj =
-        orb_core->object_ref_table ().resolve_initial_references (
-          TAO_OBJID_PRIORITYMAPPINGMANAGER,
-          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      TAO_Priority_Mapping_Manager_var mapping_manager =
-        TAO_Priority_Mapping_Manager::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (mapping_manager.in ()))
-        ACE_TRY_THROW (CORBA::INTERNAL ());
-
-      this->priority_mapping_ =
-        mapping_manager->mapping ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) ERROR: Problem in CORBA Priority "
-                           "Normalizer constructor.\n");
-
-      return;
-    }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean
-TAO_RT_CORBA_Priority_Normalizer::normalize (CORBA::Short corba_priority,
-                                             CORBA::Short &normalized_corba_priority)
-{
-  CORBA::Short native_priority;
-
-  CORBA::Boolean result =
-    this->priority_mapping_->to_native (corba_priority,
-                                        native_priority);
-  if (result == 0)
-    return 0;
-
-  result =
-    this->priority_mapping_->to_CORBA (native_priority,
-                                       normalized_corba_priority);
-  if (result == 0)
-    return 0;
-
-  return 1;
-}
-
 TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
     mutex_mgr_ (),
-    tp_manager_ (orb_core)
+    tp_manager_ (0)
 {
-  TAO_RT_CORBA_Priority_Normalizer *corba_priority_normalizer = 0;
-  ACE_NEW (corba_priority_normalizer,
-           TAO_RT_CORBA_Priority_Normalizer (this->orb_core_));
-  this->orb_core_->corba_priority_normalizer (corba_priority_normalizer);
+  TAO_Thread_Lane_Resources_Manager *thread_lane_resources_manager =
+    &this->orb_core_->thread_lane_resources_manager ();
+
+  TAO_RT_Thread_Lane_Resources_Manager *rt_thread_lane_resources_manager =
+    (TAO_RT_Thread_Lane_Resources_Manager *) thread_lane_resources_manager;
+
+  this->tp_manager_ =
+    &rt_thread_lane_resources_manager->tp_manager ();
 }
 
 TAO_RT_ORB::~TAO_RT_ORB (void)
@@ -327,14 +263,14 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->tp_manager_.create_threadpool (stacksize,
-                                              static_threads,
-                                              dynamic_threads,
-                                              default_priority,
-                                              allow_request_buffering,
-                                              max_buffered_requests,
-                                              max_request_buffer_size,
-                                              ACE_TRY_ENV);
+  return this->tp_manager_->create_threadpool (stacksize,
+                                               static_threads,
+                                               dynamic_threads,
+                                               default_priority,
+                                               allow_request_buffering,
+                                               max_buffered_requests,
+                                               max_request_buffer_size,
+                                               ACE_TRY_ENV);
 }
 
 RTCORBA::ThreadpoolId
@@ -347,13 +283,13 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                           CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->tp_manager_.create_threadpool_with_lanes (stacksize,
-                                                         lanes,
-                                                         allow_borrowing,
-                                                         allow_request_buffering,
-                                                         max_buffered_requests,
-                                                         max_request_buffer_size,
-                                                         ACE_TRY_ENV);
+  return this->tp_manager_->create_threadpool_with_lanes (stacksize,
+                                                          lanes,
+                                                          allow_borrowing,
+                                                          allow_request_buffering,
+                                                          max_buffered_requests,
+                                                          max_request_buffer_size,
+                                                          ACE_TRY_ENV);
 }
 
 void
@@ -362,8 +298,8 @@ TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
-  this->tp_manager_.destroy_threadpool (threadpool,
-                                        ACE_TRY_ENV);
+  this->tp_manager_->destroy_threadpool (threadpool,
+                                         ACE_TRY_ENV);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
@@ -457,6 +393,12 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco
   return tmp;
 }
 
+TAO_Thread_Pool_Manager &
+TAO_RT_ORB::tp_manager (void)
+{
+  return *this->tp_manager_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 3b248d9f12e..55f7f5bd2b5 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -19,9 +19,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
 #include "tao/LocalObject.h"
-#include "Thread_Pool.h"
 #include "ace/Hash_Map_Manager_T.h"
 
 #if defined(_MSC_VER)
@@ -33,6 +35,7 @@
 
 // Forward reference for TAO_Named_RT_Mutex_Manager
 class TAO_RT_Mutex;
+class TAO_Thread_Pool_Manager;
 
 /**
  * @class TAO_Named_RT_Mutex_Manager
@@ -255,6 +258,9 @@ public:
                                  TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Get the Thread Pool Manager.
+  TAO_Thread_Pool_Manager &tp_manager (void);
+
 protected:
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
@@ -266,8 +272,8 @@ protected:
   /// mutex_mgr_ manages the names associated with named mutexes.
   TAO_Named_RT_Mutex_Manager mutex_mgr_;
 
-  /// Thread Pool Manager.
-  TAO_Thread_Pool_Manager tp_manager_;
+  /// Thread Pool Manager
+  TAO_Thread_Pool_Manager *tp_manager_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 81ecf82234d..c9e95c163db 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -6,7 +6,10 @@
 
 ACE_RCSID (TAO, RT_ORBInitializer, "$Id$")
 
-#include "RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "tao/RTCORBA/RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
 #include "RT_Policy_i.h"
 #include "RT_Protocols_Hooks.h"
 #include "Priority_Mapping_Manager.h"
@@ -16,10 +19,12 @@ ACE_RCSID (TAO, RT_ORBInitializer, "$Id$")
 #include "RT_ORB_Loader.h"
 #include "RT_Stub_Factory.h"
 #include "RT_Endpoint_Selector_Factory.h"
+#include "Continuous_Priority_Mapping.h"
 #include "Linear_Priority_Mapping.h"
 #include "Direct_Priority_Mapping.h"
 #include "RT_ORB.h"
 #include "RT_Current.h"
+#include "RT_Thread_Lane_Resources_Manager.h"
 
 #include "ace/Service_Repository.h"
 #include "ace/Svc_Conf.h"
@@ -28,9 +33,11 @@ static const char *rt_poa_factory_name = "TAO_RT_POA";
 static const char *rt_poa_factory_directive = "dynamic TAO_RT_POA Service_Object * TAO_RTPortableServer:_make_TAO_RT_Object_Adapter_Factory()";
 
 TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
-                                              int sched_policy)
+                                              long sched_policy,
+                                              long scope_policy)
   : priority_mapping_type_ (priority_mapping_type),
-    sched_policy_ (sched_policy)
+    sched_policy_ (sched_policy),
+    scope_policy_ (scope_policy)
 {
 }
 
@@ -42,27 +49,30 @@ TAO_RT_ORBInitializer::pre_init (
 {
   TAO_ENV_ARG_DEFN;
 
+  //
   // Register all of the RT related services.
+  //
+
+  // Set the name of the Protocol_Hooks to be RT_Protocols_Hooks.
+  TAO_ORB_Core::set_protocols_hooks ("RT_Protocols_Hooks");
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Protocols_Hooks);
+
+  // Set the name of the stub factory to be RT_Stub_Factory.
+  TAO_ORB_Core::set_stub_factory ("RT_Stub_Factory");
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Stub_Factory);
+
+  // Set the name of the stub factory to be RT_Stub_Factory.
+  TAO_ORB_Core::set_endpoint_selector_factory ("RT_Endpoint_Selector_Factory");
   ACE_Service_Config::process_directive (ace_svc_desc_RT_Endpoint_Selector_Factory);
 
+  // Set the name of the thread lane resources manager to be RT_Thread_Lane_Resources_Manager.
+  TAO_ORB_Core::set_thread_lane_resources_manager_factory ("RT_Thread_Lane_Resources_Manager_Factory");
+  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Thread_Lane_Resources_Manager_Factory);
+
   // If the application resolves the root POA, make sure we load the RT POA.
   TAO_ORB_Core::set_poa_factory (rt_poa_factory_name,
                                  rt_poa_factory_directive);
 
-//  @@ RTCORBA Subsetting: service gets automatically loaded now by using a static initializer.
-//  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader);
-
-  // Set the name of the Protocol_Hooks to be the RT_Protocols_Hooks.
-  TAO_ORB_Core::set_protocols_hooks ("RT_Protocols_Hooks");
-
-  // Set the name of the stub factory to be the RT_Stub_Factory.
-  TAO_ORB_Core::set_stub_factory ("RT_Stub_Factory");
-
-  // Set the name of the stub factory to be the RT_Stub_Factory.
-  TAO_ORB_Core::set_endpoint_selector_factory ("RT_Endpoint_Selector_Factory");
-
   // Sets the client_protocol policy.
   TAO_RT_Protocols_Hooks::set_client_protocols_hook
     (TAO_ClientProtocolPolicy::hook);
@@ -71,19 +81,29 @@ TAO_RT_ORBInitializer::pre_init (
   TAO_RT_Protocols_Hooks::set_server_protocols_hook
     (TAO_ServerProtocolPolicy::hook);
 
+  // Conversion.
+  long sched_policy = ACE_SCHED_OTHER;
+  if (this->sched_policy_ == THR_SCHED_FIFO)
+    sched_policy = ACE_SCHED_FIFO;
+  else if (this->sched_policy_ == THR_SCHED_RR)
+    sched_policy = ACE_SCHED_RR;
 
   // Create the initial priority mapping instance.
   TAO_Priority_Mapping *pm;
   switch (this->priority_mapping_type_)
     {
+    case TAO_PRIORITY_MAPPING_CONTINUOUS:
+      ACE_NEW (pm,
+               TAO_Continuous_Priority_Mapping (sched_policy));
+      break;
     case TAO_PRIORITY_MAPPING_LINEAR:
       ACE_NEW (pm,
-               TAO_Linear_Priority_Mapping (this->sched_policy_));
+               TAO_Linear_Priority_Mapping (sched_policy));
       break;
     default:
     case TAO_PRIORITY_MAPPING_DIRECT:
       ACE_NEW (pm,
-               TAO_Direct_Priority_Mapping (this->sched_policy_));
+               TAO_Direct_Priority_Mapping (sched_policy));
       break;
     }
 
@@ -137,7 +157,7 @@ TAO_RT_ORBInitializer::pre_init (
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
   CORBA::Object_var safe_rt_orb = rt_orb;
-  
+
   info->register_initial_reference (TAO_OBJID_RTORB,
                                     rt_orb,
                                     ACE_TRY_ENV);
@@ -159,6 +179,9 @@ TAO_RT_ORBInitializer::pre_init (
                                     current,
                                     ACE_TRY_ENV);
   ACE_CHECK;
+
+  tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_);
+  tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_);
 }
 
 void
@@ -209,4 +232,3 @@ TAO_RT_ORBInitializer::register_policy_factories (
                                  ACE_TRY_ENV);
   ACE_CHECK;
 }
-
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 88ec7c6fdf1..d119a26e52b 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -43,14 +43,16 @@ class TAO_RTCORBA_Export TAO_RT_ORBInitializer :
 {
 public:
   // Priority mapping types
-  enum 
+  enum
   {
+    TAO_PRIORITY_MAPPING_CONTINUOUS,
     TAO_PRIORITY_MAPPING_LINEAR,
     TAO_PRIORITY_MAPPING_DIRECT
   };
 
   TAO_RT_ORBInitializer (int priority_mapping_type,
-                         int sched_policy);
+                         long sched_policy,
+                         long scope_policy);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -74,11 +76,14 @@ private:
   /// a single instance between all ORBs.
   TAO_RT_PolicyFactory policy_factory_;
 
-  /// Initial priority mapping type.
+  /// Priority mapping type.
   int priority_mapping_type_;
 
-  /// Initial scheduling policy.
-  int sched_policy_;
+  /// Scheduling policy.
+  long sched_policy_;
+
+  /// Scope policy.
+  long scope_policy_;
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 087919e5c70..e32fd36fd83 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -9,15 +9,6 @@
 
 ACE_RCSID (TAO, RT_ORB_Loader, "$Id$")
 
-int
-TAO_RT_ORB_Loader::Initializer (void)
-{
-  ACE_Service_Config::static_svcs ()->
-    insert (&ace_svc_desc_TAO_RT_ORB_Loader);
-
-  return 0;
-}
-
 TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
 {
 }
@@ -26,16 +17,6 @@ TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
 {
 }
 
-CORBA::Object_ptr 
-TAO_RT_ORB_Loader::create_object (CORBA::ORB_ptr,
-                                  int,
-                                  char *[],
-                                  CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::Object::_nil ();
-}
-
 int
 TAO_RT_ORB_Loader::init (int argc,
                          char* argv[])
@@ -52,7 +33,8 @@ TAO_RT_ORB_Loader::init (int argc,
 
   // Set defaults.
   int priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
-  int sched_policy = ACE_SCHED_OTHER;
+  long sched_policy = THR_SCHED_DEFAULT;
+  long scope_policy = THR_SCOPE_PROCESS;
   int curarg = 0;
 
   // Parse any service configurator parameters.
@@ -66,7 +48,10 @@ TAO_RT_ORB_Loader::init (int argc,
             char *name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    "linear") == 0)
+                                    "continuous") == 0)
+              priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS;
+            else if (ACE_OS::strcasecmp (name,
+                                         "linear") == 0)
               priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR;
             else if (ACE_OS::strcasecmp (name,
                                          "direct") == 0)
@@ -87,19 +72,39 @@ TAO_RT_ORB_Loader::init (int argc,
 
             if (ACE_OS::strcasecmp (name,
                                     "SCHED_OTHER") == 0)
-              sched_policy = ACE_SCHED_OTHER;
+              sched_policy = THR_SCHED_DEFAULT;
             else if (ACE_OS::strcasecmp (name,
                                          "SCHED_FIFO") == 0)
-              sched_policy = ACE_SCHED_FIFO;
+              sched_policy = THR_SCHED_FIFO;
             else if (ACE_OS::strcasecmp (name,
                                          "SCHED_RR") == 0)
-              sched_policy = ACE_SCHED_RR;
+              sched_policy = THR_SCHED_RR;
             else
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("RT_ORB_Loader - unknown argument")
                           ACE_TEXT (" <%s> for -ORBSchedPolicy\n"), name));
           }
       }
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBScopePolicy") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name,
+                                    "SYSTEM") == 0)
+              scope_policy = THR_SCOPE_SYSTEM;
+            else if (ACE_OS::strcasecmp (name,
+                                         "PROCESS") == 0)
+              scope_policy = THR_SCOPE_PROCESS;
+            else
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("RT_ORB_Loader - unknown argument")
+                          ACE_TEXT (" <%s> for -ORBScopePolicy\n"), name));
+          }
+      }
     else
       {
         if (TAO_debug_level > 0)
@@ -121,7 +126,8 @@ TAO_RT_ORB_Loader::init (int argc,
       /// Register the RTCORBA ORBInitializer.
       ACE_NEW_THROW_EX (temp_orb_initializer,
                         TAO_RT_ORBInitializer (priority_mapping_type,
-                                               sched_policy),
+                                               sched_policy,
+                                               scope_policy),
                         CORBA::NO_MEMORY (
                           CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -145,10 +151,8 @@ TAO_RT_ORB_Loader::init (int argc,
   return 0;
 }
 
-
 /////////////////////////////////////////////////////////////////////
 
-
 ACE_FACTORY_DEFINE (TAO, TAO_RT_ORB_Loader)
 ACE_STATIC_SVC_DEFINE (TAO_RT_ORB_Loader,
                        ACE_TEXT ("RT_ORB_Loader"),
@@ -157,4 +161,3 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_ORB_Loader,
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
-
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
index 6312177b727..8c61838982b 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h
@@ -19,7 +19,7 @@
 
 #include "rtcorba_export.h"
 
-#include "tao/Object_Loader.h"
+#include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -28,7 +28,7 @@
 
 class TAO_ORB_Core;
 
-class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public TAO_Object_Loader
+class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
@@ -40,36 +40,10 @@ public:
   /// Initialize the RT ORB loader hooks.
   virtual int init (int argc,
                     char* []);
-
-  /// Create the object (unused)
-  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                         int argc,
-                                         char *argv [],
-                                         CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_ORB_Loader)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_ORB_Loader)
 
-
-// #if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-// typedef int (*TAO_Module_Initializer) (void);
-
-// static TAO_Module_Initializer
-// TAO_Requires_RTCORBA_Initializer = &TAO_RT_ORB_Loader::Initializer;
-
-// #else
-
-// static int
-// TAO_Requires_RTCORBA_Initializer = TAO_RT_ORB_Loader::Initializer ();
-
-// #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include "ace/post.h"
 #endif /* TAO_RT_ORB_LOADER_H */
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 39306126890..87420a3953a 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -66,4 +66,3 @@ TAO_RT_PolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
-
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 85fe4852b35..412ac3db2ec 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -20,7 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
 #include "tao/LocalObject.h"
 
 #include "ace/SString.h"
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 01fd723b174..5519c6003d8 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -6,6 +6,8 @@
 #include "tao/Invocation.h"
 #include "tao/Stub.h"
 #include "tao/MProfile.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "Priority_Mapping_Manager.h"
 #include "RT_Stub.h"
 
@@ -36,9 +38,8 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core,
 
   // Save a reference to the priority mapping manager.
   CORBA::Object_var obj =
-    orb_core->object_ref_table ().resolve_initial_references (
-      TAO_OBJID_PRIORITYMAPPINGMANAGER,
-      ACE_TRY_ENV);
+    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER,
+                                                              ACE_TRY_ENV);
   ACE_CHECK;
 
   this->mapping_manager_ =
@@ -48,11 +49,10 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core,
 }
 
 int
-TAO_RT_Protocols_Hooks::call_client_protocols_hook (
-                          int &send_buffer_size,
-                          int &recv_buffer_size,
-                          int &no_delay,
-                          const char *protocol_type)
+TAO_RT_Protocols_Hooks::call_client_protocols_hook (int &send_buffer_size,
+                                                    int &recv_buffer_size,
+                                                    int &no_delay,
+                                                    const char *protocol_type)
 {
   if (TAO_RT_Protocols_Hooks::client_protocols_hook_ == 0)
     return -1;
@@ -74,11 +74,10 @@ TAO_RT_Protocols_Hooks::set_client_protocols_hook (Client_Protocols_Hook hook)
 }
 
 int
-TAO_RT_Protocols_Hooks::call_server_protocols_hook (
-                          int &send_buffer_size,
-                          int &recv_buffer_size,
-                          int &no_delay,
-                          const char *protocol_type)
+TAO_RT_Protocols_Hooks::call_server_protocols_hook (int &send_buffer_size,
+                                                    int &recv_buffer_size,
+                                                    int &no_delay,
+                                                    const char *protocol_type)
 {
   if (TAO_RT_Protocols_Hooks::server_protocols_hook_ == 0)
     return -1;
@@ -180,9 +179,9 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &servic
 
 void
 TAO_RT_Protocols_Hooks::get_selector_hook (
-                           CORBA::Policy *model_policy,
-                           CORBA::Boolean &is_client_propagated,
-                           CORBA::Short &server_priority)
+                                           CORBA::Policy *model_policy,
+                                           CORBA::Boolean &is_client_propagated,
+                                           CORBA::Short &server_priority)
 {
 
   RTCORBA::PriorityModelPolicy_var model_policy_ptr =
@@ -204,11 +203,11 @@ TAO_RT_Protocols_Hooks::get_selector_hook (
 
 void
 TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
-                           CORBA::Policy *bands_policy,
-                           CORBA::Short &min_priority,
-                           CORBA::Short &max_priority,
-                           CORBA::Short &p,
-                           int &in_range)
+                                                        CORBA::Policy *bands_policy,
+                                                        CORBA::Short &min_priority,
+                                                        CORBA::Short &max_priority,
+                                                        CORBA::Short &p,
+                                                        int &in_range)
 {
   RTCORBA::PriorityBandedConnectionPolicy_var bands_policy_ptr =
     RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands_policy);
@@ -392,6 +391,59 @@ TAO_RT_Protocols_Hooks::set_default_policies (CORBA::Environment &ACE_TRY_ENV)
   return 0;
 }
 
+int
+TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
+                                                            CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ProtocolList protocols;
+
+  TAO_AcceptorSetIterator end =
+    acceptor_registry.end ();
+
+  for (TAO_AcceptorSetIterator acceptor =
+         acceptor_registry.begin ();
+       acceptor != end;
+       ++acceptor)
+    {
+      if (*acceptor == 0)
+        continue;
+
+      CORBA::ULong current_length =
+        protocols.length ();
+
+      protocols.length (current_length + 1);
+
+      protocols[current_length].protocol_type =
+        (*acceptor)->tag ();
+
+      protocols[current_length].orb_protocol_properties =
+        RTCORBA::ProtocolProperties::_nil ();
+
+      // @@ Later, we will likely migrate to using RTCORBA protocol
+      // policies for configuration of protocols in nonRT use cases.
+      // Then, the code below will change to each protocol factory
+      // being responsible for creation of its own default protocol
+      // properties.
+      protocols[current_length].transport_protocol_properties =
+        TAO_Protocol_Properties_Factory::create_transport_protocol_property ((*acceptor)->tag ());
+    }
+
+  // Set ServerProtocolPolicy.
+  TAO_ServerProtocolPolicy *server_protocol_policy = 0;
+  ACE_NEW_RETURN (server_protocol_policy,
+                  TAO_ServerProtocolPolicy (protocols),
+                  -1);
+
+  RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
+    server_protocol_policy;
+
+  this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy,
+                                                        ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  return 0;
+}
+
 ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks,
                        ACE_TEXT ("RT_Protocols_Hooks"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index 45515b5813e..7eb98ddb5ad 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -136,10 +136,12 @@ public:
   //@}
 
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
-  /// default RTCORBA policies: ServerProtocolPolicy and
-  /// ClientProtocolPolicy.
+  /// default RTCORBA policies: ClientProtocolPolicy.
   virtual int set_default_policies (CORBA::Environment &ACE_TRY_ENV);
 
+  int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
+                                          CORBA::Environment &ACE_TRY_ENV);
+
 protected:
   TAO_ORB_Core *orb_core_;
 
@@ -153,7 +155,6 @@ protected:
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
-ACE_STATIC_SVC_REQUIRE(TAO_RT_Protocols_Hooks)
 
 #include "ace/post.h"
 #endif /* TAO_RT_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
new file mode 100644
index 00000000000..0c0b75c99cd
--- /dev/null
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -0,0 +1,134 @@
+// $Id$
+
+#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
+
+ACE_RCSID(RTCORBA, RT_Thread_Lane_Resources_Manager, "$Id$")
+
+#include "tao/ORB_Core.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/RTCORBA/Thread_Pool.h"
+#include "tao/Leader_Follower.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
+  : TAO_Thread_Lane_Resources_Manager (orb_core),
+    default_lane_resources_ (0),
+    tp_manager_ (0)
+{
+  // Create the default resources.
+  ACE_NEW (this->default_lane_resources_,
+           TAO_Thread_Lane_Resources (orb_core));
+
+  // Create the thread-pool manager.
+  ACE_NEW (this->tp_manager_,
+           TAO_Thread_Pool_Manager (orb_core));
+
+}
+
+TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (void)
+{
+  // Delete the default resources.
+  delete this->default_lane_resources_;
+
+  // Delete the thread-pool manager.
+  delete this->tp_manager_;
+}
+
+int
+TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (CORBA_Environment &ACE_TRY_ENV)
+{
+  int result =
+    this->default_lane_resources_->open_acceptor_registry (0,
+                                                           ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  return result;
+}
+
+void
+TAO_RT_Thread_Lane_Resources_Manager::finalize (void)
+{
+  // Finalize default resources.
+  this->default_lane_resources_->finalize ();
+
+  // Finalize resources managed by the thread-pool manager.
+  this->tp_manager_->finalize ();
+}
+
+void
+TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+{
+  // Shutdown default reactors.
+  this->default_lane_resources_->shutdown_reactor ();
+
+  // Shutdown reactors managed by the thread-pool manager.
+  this->tp_manager_->shutdown_reactor ();
+}
+
+int
+TAO_RT_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofile)
+{
+  int result =
+    this->default_lane_resources_->is_collocated (mprofile);
+
+  if (result)
+    return result;
+
+  return this->tp_manager_->is_collocated (mprofile);
+}
+
+TAO_Thread_Lane_Resources &
+TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
+{
+  // Get the ORB_Core's TSS resources.
+  TAO_ORB_Core_TSS_Resources &tss =
+    *this->orb_core_->get_tss_resources ();
+
+  // Get the lane for this thread.
+  TAO_Thread_Lane *lane =
+    (TAO_Thread_Lane *) tss.lane_;
+
+  // If we have a valid lane, use that lane's resources.
+  if (lane)
+    return lane->resources ();
+  else
+    // Otherwise, return the default resources.
+    return *this->default_lane_resources_;
+}
+
+TAO_Thread_Lane_Resources &
+TAO_RT_Thread_Lane_Resources_Manager::default_lane_resources (void)
+{
+  return *this->default_lane_resources_;
+}
+
+TAO_Thread_Pool_Manager &
+TAO_RT_Thread_Lane_Resources_Manager::tp_manager (void)
+{
+  return *this->tp_manager_;
+}
+
+TAO_Thread_Lane_Resources_Manager *
+TAO_RT_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core)
+{
+  TAO_Thread_Lane_Resources_Manager *manager = 0;
+
+  /// Create the RT Thread Lane Resources Manager.
+  ACE_NEW_RETURN (manager,
+                  TAO_RT_Thread_Lane_Resources_Manager (core),
+                  0);
+
+  return manager;
+}
+
+ACE_STATIC_SVC_DEFINE (TAO_RT_Thread_Lane_Resources_Manager_Factory,
+                       ACE_TEXT ("RT_Thread_Lane_Resources_Manager_Factory"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_RT_Thread_Lane_Resources_Manager_Factory),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_FACTORY_DEFINE (TAO, TAO_RT_Thread_Lane_Resources_Manager_Factory)
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
new file mode 100644
index 00000000000..eff190fd84a
--- /dev/null
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -0,0 +1,105 @@
+//=============================================================================
+/**
+ *  @file    RT_Thread_Lane_Resources_Manager.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_RT_THREAD_LANE_RESOURCES_MANAGER_H
+#define TAO_RT_THREAD_LANE_RESOURCES_MANAGER_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/RTCORBA/rtcorba_export.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "ace/Service_Config.h"
+
+class TAO_Thread_Pool_Manager;
+
+/**
+ * @class TAO_RT_Thread_Lane_Resources_Manager
+ *
+ * @brief Manager for thread lane resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager :
+  public TAO_Thread_Lane_Resources_Manager
+{
+public:
+
+  /// Constructor.
+  TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
+
+  /// Destructor.
+  ~TAO_RT_Thread_Lane_Resources_Manager (void);
+
+  /// Finalize resources.
+  void finalize (void);
+
+  /// Open default resources.
+  int open_default_resources (CORBA_Environment &ACE_TRY_ENV);
+
+  /// Shutdown reactor.
+  void shutdown_reactor (void);
+
+  // Does <mprofile> belong to us?
+  int is_collocated (const TAO_MProfile &mprofile);
+
+  /// @name Accessors
+  // @{
+
+  TAO_Thread_Lane_Resources &lane_resources (void);
+
+  TAO_Thread_Lane_Resources &default_lane_resources (void);
+
+  TAO_Thread_Pool_Manager &tp_manager (void);
+
+  // @}
+
+protected:
+
+  /// Default lane resources.
+  TAO_Thread_Lane_Resources *default_lane_resources_;
+
+  /// Thread Pool Manager.
+  TAO_Thread_Pool_Manager *tp_manager_;
+};
+
+/**
+ * @class TAO_RT_Thread_Lane_Resources_Manager_Factory
+ *
+ * @brief This class is a factory for managers of thread resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager_Factory
+  : public TAO_Thread_Lane_Resources_Manager_Factory
+{
+public:
+
+  /// Factory method.
+  TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
+
+};
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
+ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
+
+#if defined (__ACE_INLINE__)
+# include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_RT_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.dsp b/TAO/tao/RTCORBA/TAO_RTCORBA.dsp
index 212051b0044..9d3671c9980 100644
--- a/TAO/tao/RTCORBA/TAO_RTCORBA.dsp
+++ b/TAO/tao/RTCORBA/TAO_RTCORBA.dsp
@@ -156,15 +156,15 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.cpp

+SOURCE=.\Continuous_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.cpp

+SOURCE=.\Direct_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pool_Per_Endpoint.cpp

+SOURCE=.\Linear_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

@@ -242,21 +242,25 @@ SOURCE=.\RTCORBAC.cpp
 

 SOURCE=.\Thread_Pool.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\RT_Thread_Lane_Resources_Manager.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.h

+SOURCE=.\Continuous_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.h

+SOURCE=.\Direct_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pool_Per_Endpoint.h

+SOURCE=.\Linear_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

@@ -338,21 +342,25 @@ SOURCE=.\RTCORBAC.h
 

 SOURCE=.\Thread_Pool.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\RT_Thread_Lane_Resources_Manager.h

+# End Source File

 # End Group

 # Begin Group "Inline Files"

 

 # PROP Default_Filter ".i"

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.i

+SOURCE=.\Continuous_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.i

+SOURCE=.\Direct_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pool_Per_Endpoint.i

+SOURCE=.\Linear_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

@@ -398,6 +406,10 @@ SOURCE=.\RTCORBAC.i
 

 SOURCE=.\Thread_Pool.i

 # End Source File

+# Begin Source File

+

+SOURCE=.\RT_Thread_Lane_Resources_Manager.i

+# End Source File

 # End Group

 # Begin Group "Template Files"

 

diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA_Static.dsp b/TAO/tao/RTCORBA/TAO_RTCORBA_Static.dsp
index ad1c282494f..49b7dd78a44 100644
--- a/TAO/tao/RTCORBA/TAO_RTCORBA_Static.dsp
+++ b/TAO/tao/RTCORBA/TAO_RTCORBA_Static.dsp
@@ -95,6 +95,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter "i,inl"

 # Begin Source File

 

+SOURCE=.\Continuous_Priority_Mapping.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Direct_Priority_Mapping.i

 # End Source File

 # Begin Source File

@@ -103,7 +107,7 @@ SOURCE=.\Linear_Priority_Mapping.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Pool_Per_Endpoint.i

+SOURCE=.\RT_Thread_Lane_Resources_Manager.i

 # End Source File

 # Begin Source File

 

@@ -155,6 +159,10 @@ SOURCE=.\Thread_Pool.i
 # PROP Default_Filter "h"

 # Begin Source File

 

+SOURCE=.\Continuous_Priority_Mapping.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Direct_Priority_Mapping.h

 # End Source File

 # Begin Source File

@@ -163,7 +171,7 @@ SOURCE=.\Linear_Priority_Mapping.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Pool_Per_Endpoint.h

+SOURCE=.\RT_Thread_Lane_Resources_Manager.h

 # End Source File

 # Begin Source File

 

@@ -251,6 +259,10 @@ SOURCE=.\Thread_Pool.h
 # PROP Default_Filter "cpp"

 # Begin Source File

 

+SOURCE=.\Continuous_Priority_Mapping.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Direct_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

@@ -259,7 +271,7 @@ SOURCE=.\Linear_Priority_Mapping.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Pool_Per_Endpoint.cpp

+SOURCE=.\RT_Thread_Lane_Resources_Manager.cpp

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index be3f4bf7f60..aba3f630f2d 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -7,14 +7,71 @@ ACE_RCSID(tao, Thread_Pool, "$Id$")
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/ORB_Core.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/debug.h"
+#include "tao/RTCORBA/Priority_Mapping_Manager.h"
+#include "tao/Leader_Follower.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Thread_Pool.i"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_Thread_Pool_Threads::TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane,
-                                                  ACE_Thread_Manager &tm)
-  : ACE_Task_Base (&tm),
+TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane)
+  : lane_ (lane)
+{
+}
+
+void
+TAO_RT_New_Leader_Generator::no_leaders_available (void)
+{
+  // Note that we are checking this condition below without the lock
+  // held.  The value of <static_threads> and <dynamic_threads> does
+  // not change, but <current_threads> increases when new dynamic
+  // threads are created.  Even if we catch <current_threads> in an
+  // inconsistent state, we will double check later with the lock
+  // held.  Therefore, this check should not cause any big problems.
+  if (this->lane_.current_threads () ==
+      this->lane_.static_threads () +
+      this->lane_.dynamic_threads ())
+    return;
+
+  TAO_Thread_Pool_Manager &manager =
+    this->lane_.pool ().manager ();
+
+  ACE_GUARD (ACE_SYNCH_MUTEX,
+             mon,
+             manager.lock ());
+
+  if (this->lane_.current_threads () <
+      (this->lane_.static_threads () +
+       this->lane_.dynamic_threads ()) &&
+      !manager.orb_core ().has_shutdown ())
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n")
+                    ACE_TEXT ("Current number of threads = %d; static threads = %d; dynamic threads = %d\n")
+                    ACE_TEXT ("No leaders available; creating new leader!\n"),
+                    this->lane_.pool ().id (),
+                    this->lane_.id (),
+                    this->lane_.current_threads (),
+                    this->lane_.static_threads (),
+                    this->lane_.dynamic_threads ()));
+
+      int result =
+        this->lane_.create_dynamic_threads (1);
+
+      if (result != 0)
+        ACE_ERROR ((LM_ERROR,
+                    "Pool %d Lane %d Thread %t: cannot create dynamic thread\n",
+                    this->lane_.pool ().id (),
+                    this->lane_.id ()));
+    }
+}
+
+TAO_Thread_Pool_Threads::TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane)
+  : ACE_Task_Base (lane.pool ().manager ().orb_core ().thr_mgr ()),
     lane_ (lane)
 {
 }
@@ -28,43 +85,167 @@ TAO_Thread_Pool_Threads::lane (void) const
 int
 TAO_Thread_Pool_Threads::svc (void)
 {
-  CORBA::ORB_var orb =
-    this->lane ().thread_pool ().orb ();
+  TAO_ORB_Core &orb_core =
+    this->lane ().pool ().manager ().orb_core ();
+
+  if (orb_core.has_shutdown ())
+    return 0;
+
+  // Set TSS resources for this thread.
+  TAO_Thread_Pool_Threads::set_tss_resources (orb_core,
+                                              this->lane_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  CORBA::ORB_ptr orb =
+    orb_core.orb ();
+
+  ACE_TRY_NEW_ENV
     {
+      // Run the ORB.
       orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
+      // No point propagating this exception.  Print it out.
       ACE_ERROR ((LM_ERROR,
                   "orb->run() raised exception for thread %t\n"));
+
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "");
     }
   ACE_ENDTRY;
 
   return 0;
 }
 
-TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &thread_pool,
+void
+TAO_Thread_Pool_Threads::set_tss_resources (TAO_ORB_Core &orb_core,
+                                            TAO_Thread_Lane &thread_lane)
+{
+  /// Get the ORB_Core's TSS resources.
+  TAO_ORB_Core_TSS_Resources &tss =
+    *orb_core.get_tss_resources ();
+
+  /// Set the lane attribute in TSS.
+  tss.lane_ = &thread_lane;
+}
+
+TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
                                   CORBA::ULong id,
                                   CORBA::Short lane_priority,
                                   CORBA::ULong static_threads,
-                                  CORBA::ULong dynamic_threads)
-  : thread_pool_ (thread_pool),
+                                  CORBA::ULong dynamic_threads,
+                                  CORBA::Environment &)
+  : pool_ (pool),
     id_ (id),
     lane_priority_ (lane_priority),
     static_threads_ (static_threads),
     dynamic_threads_ (dynamic_threads),
-    threads_ (*this,
-              thread_pool_.thread_manager_)
+    current_threads_ (0),
+    threads_ (*this),
+    new_thread_generator_ (*this),
+    resources_ (pool.manager ().orb_core (),
+                &new_thread_generator_),
+    native_priority_ (TAO_INVALID_PRIORITY)
+{
+}
+
+void
+TAO_Thread_Lane::validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV)
+{
+  // Check that the priority is in bounds.
+  if (this->lane_priority_ < RTCORBA::minPriority ||
+      this->lane_priority_ > RTCORBA::maxPriority)
+    ACE_THROW (CORBA::BAD_PARAM ());
+
+  CORBA::ORB_ptr orb =
+    this->pool_.manager ().orb_core ().orb ();
+
+  // Get the priority mapping manager.
+  CORBA::Object_var obj =
+    orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER,
+                                     ACE_TRY_ENV);
+  ACE_CHECK;
+
+  TAO_Priority_Mapping_Manager_var mapping_manager =
+    TAO_Priority_Mapping_Manager::_narrow (obj.in (),
+                                           ACE_TRY_ENV);
+  ACE_CHECK;
+
+  RTCORBA::PriorityMapping *pm =
+    mapping_manager.in ()->mapping ();
+
+  // Map CORBA priority to native priority.
+  CORBA::Boolean result =
+    pm->to_native (this->lane_priority_,
+                   this->native_priority_);
+
+  if (!result)
+    ACE_THROW (CORBA::DATA_CONVERSION ());
+
+  if (TAO_debug_level > 3)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("TAO (%P|%t) - creating thread at ")
+                ACE_TEXT ("(corba:native) priority %d:%d\n"),
+                this->lane_priority_,
+                this->native_priority_));
+}
+
+void
+TAO_Thread_Lane::open (CORBA::Environment &ACE_TRY_ENV)
+{
+  // Validate and map priority.
+  this->validate_and_map_priority (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // Open the acceptor registry.
+  int result = 0;
+  result =
+    this->resources_.open_acceptor_registry (1,
+                                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  if (result == -1)
+    ACE_THROW (CORBA::INTERNAL (
+                 CORBA_SystemException::_tao_minor_code (
+                   TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+                   0),
+                 CORBA::COMPLETED_NO));
+}
+
+TAO_Thread_Lane::~TAO_Thread_Lane (void)
+{
+}
+
+void
+TAO_Thread_Lane::finalize (void)
+{
+  // Finalize resources.
+  this->resources_.finalize ();
+}
+
+void
+TAO_Thread_Lane::shutdown_reactor (void)
+{
+  this->resources_.shutdown_reactor ();
+}
+
+void
+TAO_Thread_Lane::wait (void)
+{
+  this->threads_.wait ();
+}
+
+int
+TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile)
 {
+  return this->resources_.is_collocated (mprofile);
 }
 
 int
 TAO_Thread_Lane::create_static_threads (void)
 {
+  // Create static threads.
   return this->create_dynamic_threads (this->static_threads_);
 }
 
@@ -91,22 +272,40 @@ TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads)
   for (index = 0;
        index != number_of_threads;
        ++index)
-    stack_size_array[index] = this->thread_pool_.stack_size_;
+    stack_size_array[index] =
+      this->pool ().stack_size_;
 
   // Make sure the dynamically created stack size array is properly
   // deleted.
   ACE_Auto_Basic_Array_Ptr<size_t> auto_stack_size_array (stack_size_array);
 
+  TAO_ORB_Core &orb_core =
+    this->pool ().manager ().orb_core ();
+
+  long flags =
+    default_flags |
+    orb_core.orb_params ()->scope_policy () |
+    orb_core.orb_params ()->sched_policy ();
+
   // Activate the threads.
-  return this->threads_.activate (default_flags,
-                                  number_of_threads,
-                                  force_active,
-                                  this->lane_priority_,
-                                  default_grp_id,
-                                  default_task,
-                                  default_thread_handles,
-                                  default_stack,
-                                  stack_size_array);
+  int result =
+    this->threads_.activate (flags,
+                             number_of_threads,
+                             force_active,
+                             this->native_priority_,
+                             default_grp_id,
+                             default_task,
+                             default_thread_handles,
+                             default_stack,
+                             stack_size_array);
+
+  if (result != 0)
+    return result;
+
+  this->current_threads_ +=
+    number_of_threads;
+
+  return result;
 }
 
 CORBA::ULong
@@ -116,9 +315,9 @@ TAO_Thread_Lane::id (void) const
 }
 
 TAO_Thread_Pool &
-TAO_Thread_Lane::thread_pool (void) const
+TAO_Thread_Lane::pool (void) const
 {
-  return this->thread_pool_;
+  return this->pool_;
 }
 
 CORBA::Short
@@ -127,6 +326,12 @@ TAO_Thread_Lane::lane_priority (void) const
   return this->lane_priority_;
 }
 
+CORBA::Short
+TAO_Thread_Lane::native_priority (void) const
+{
+  return this->native_priority_;
+}
+
 CORBA::ULong
 TAO_Thread_Lane::static_threads (void) const
 {
@@ -139,13 +344,32 @@ TAO_Thread_Lane::dynamic_threads (void) const
   return this->dynamic_threads_;
 }
 
+CORBA::ULong
+TAO_Thread_Lane::current_threads (void) const
+{
+  return this->current_threads_;
+}
+
+void
+TAO_Thread_Lane::current_threads (CORBA::ULong current_threads)
+{
+  this->current_threads_ = current_threads;
+}
+
 TAO_Thread_Pool_Threads &
 TAO_Thread_Lane::threads (void)
 {
   return this->threads_;
 }
 
-TAO_Thread_Pool::TAO_Thread_Pool (CORBA::ULong id,
+TAO_Thread_Lane_Resources &
+TAO_Thread_Lane::resources (void)
+{
+  return this->resources_;
+}
+
+TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
+                                  CORBA::ULong id,
                                   CORBA::ULong stack_size,
                                   CORBA::ULong static_threads,
                                   CORBA::ULong dynamic_threads,
@@ -153,8 +377,9 @@ TAO_Thread_Pool::TAO_Thread_Pool (CORBA::ULong id,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
-                                  CORBA::ORB_ptr orb)
-  : id_ (id),
+                                  CORBA::Environment &ACE_TRY_ENV)
+  : manager_ (manager),
+    id_ (id),
     stack_size_ (stack_size),
     allow_borrowing_ (0),
     allow_request_buffering_ (allow_request_buffering),
@@ -162,26 +387,34 @@ TAO_Thread_Pool::TAO_Thread_Pool (CORBA::ULong id,
     max_request_buffer_size_ (max_request_buffer_size),
     lanes_ (0),
     number_of_lanes_ (1),
-    thread_manager_ (*orb->orb_core ()->thr_mgr ()),
-    orb_ (CORBA::ORB::_duplicate (orb))
+    with_lanes_ (0)
 {
+  // No support for buffering.
+  if (allow_request_buffering)
+    ACE_THROW (CORBA::NO_IMPLEMENT ());
+
+  // Create one lane.
   this->lanes_ = new TAO_Thread_Lane *[this->number_of_lanes_];
-  this->lanes_[0] = new TAO_Thread_Lane (*this,
-                                         0,
-                                         default_priority,
-                                         static_threads,
-                                         dynamic_threads);
+  this->lanes_[0] =
+    new TAO_Thread_Lane (*this,
+                         0,
+                         default_priority,
+                         static_threads,
+                         dynamic_threads,
+                         ACE_TRY_ENV);
 }
 
-TAO_Thread_Pool::TAO_Thread_Pool (CORBA::ULong id,
+TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
+                                  CORBA::ULong id,
                                   CORBA::ULong stack_size,
                                   const RTCORBA::ThreadpoolLanes &lanes,
                                   CORBA::Boolean allow_borrowing,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
-                                  CORBA::ORB_ptr orb)
-  : id_ (id),
+                                  CORBA::Environment &ACE_TRY_ENV)
+  : manager_ (manager),
+    id_ (id),
     stack_size_ (stack_size),
     allow_borrowing_ (allow_borrowing),
     allow_request_buffering_ (allow_request_buffering),
@@ -189,22 +422,43 @@ TAO_Thread_Pool::TAO_Thread_Pool (CORBA::ULong id,
     max_request_buffer_size_ (max_request_buffer_size),
     lanes_ (0),
     number_of_lanes_ (lanes.length ()),
-    thread_manager_ (*orb->orb_core ()->thr_mgr ()),
-    orb_ (CORBA::ORB::_duplicate (orb))
+    with_lanes_ (1)
 {
+  // No support for buffering or borrowing.
+  if (allow_borrowing ||
+      allow_request_buffering)
+    ACE_THROW (CORBA::NO_IMPLEMENT ());
+
+  // Create multiple lane.
   this->lanes_ = new TAO_Thread_Lane *[this->number_of_lanes_];
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
        ++i)
-    this->lanes_[i] = new TAO_Thread_Lane (*this,
-                                           i,
-                                           lanes[i].lane_priority,
-                                           lanes[i].static_threads,
-                                           lanes[i].dynamic_threads);
+    this->lanes_[i] =
+      new TAO_Thread_Lane (*this,
+                           i,
+                           lanes[i].lane_priority,
+                           lanes[i].static_threads,
+                           lanes[i].dynamic_threads,
+                           ACE_TRY_ENV);
+}
+
+void
+TAO_Thread_Pool::open (CORBA::Environment &ACE_TRY_ENV)
+{
+  // Open all the lanes.
+  for (CORBA::ULong i = 0;
+       i != this->number_of_lanes_;
+       ++i)
+    {
+      this->lanes_[i]->open (ACE_TRY_ENV);
+      ACE_CHECK;
+    }
 }
 
 TAO_Thread_Pool::~TAO_Thread_Pool (void)
 {
+  // Delete all the lanes.
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
        ++i)
@@ -213,6 +467,54 @@ TAO_Thread_Pool::~TAO_Thread_Pool (void)
   delete[] this->lanes_;
 }
 
+void
+TAO_Thread_Pool::finalize (void)
+{
+  // Finalize all the lanes.
+  for (CORBA::ULong i = 0;
+       i != this->number_of_lanes_;
+       ++i)
+    this->lanes_[i]->finalize ();
+}
+
+void
+TAO_Thread_Pool::shutdown_reactor (void)
+{
+  // Finalize all the lanes.
+  for (CORBA::ULong i = 0;
+       i != this->number_of_lanes_;
+       ++i)
+    this->lanes_[i]->shutdown_reactor ();
+}
+
+void
+TAO_Thread_Pool::wait (void)
+{
+  // Finalize all the lanes.
+  for (CORBA::ULong i = 0;
+       i != this->number_of_lanes_;
+       ++i)
+    this->lanes_[i]->wait ();
+}
+
+int
+TAO_Thread_Pool::is_collocated (const TAO_MProfile &mprofile)
+{
+  // Finalize all the lanes.
+  for (CORBA::ULong i = 0;
+       i != this->number_of_lanes_;
+       ++i)
+    {
+      int result =
+        this->lanes_[i]->is_collocated (mprofile);
+
+      if (result)
+        return result;
+    }
+
+  return 0;
+}
+
 int
 TAO_Thread_Pool::create_static_threads (void)
 {
@@ -232,6 +534,18 @@ TAO_Thread_Pool::create_static_threads (void)
   return 0;
 }
 
+int
+TAO_Thread_Pool::with_lanes (void) const
+{
+  return this->with_lanes_;
+}
+
+TAO_Thread_Pool_Manager &
+TAO_Thread_Pool::manager (void) const
+{
+  return this->manager_;
+}
+
 CORBA::ULong
 TAO_Thread_Pool::id (void) const
 {
@@ -280,18 +594,6 @@ TAO_Thread_Pool::number_of_lanes (void) const
   return this->number_of_lanes_;
 }
 
-ACE_Thread_Manager &
-TAO_Thread_Pool::thread_manager (void)
-{
-  return this->thread_manager_;
-}
-
-CORBA::ORB_ptr
-TAO_Thread_Pool::orb (void) const
-{
-  return CORBA::ORB::_duplicate (this->orb_.in ());
-}
-
 #define TAO_THREAD_POOL_MANAGER_GUARD \
   ACE_GUARD_THROW_EX ( \
     ACE_SYNCH_MUTEX, \
@@ -303,22 +605,71 @@ TAO_Thread_Pool::orb (void) const
         0), \
       CORBA::COMPLETED_NO));
 
-TAO_Thread_Pool_Manager::TAO_Thread_Pool_Manager (TAO_ORB_Core *orb_core)
+TAO_Thread_Pool_Manager::TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
     thread_pools_ (),
-    thread_pool_id_counter_ (0),
+    thread_pool_id_counter_ (1),
     lock_ ()
 {
 }
 
 TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager (void)
 {
+  // Delete all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
        iterator != this->thread_pools_.end ();
        ++iterator)
     delete (*iterator).int_id_;
 }
 
+void
+TAO_Thread_Pool_Manager::finalize (void)
+{
+  // Finalize all the pools.
+  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
+       iterator != this->thread_pools_.end ();
+       ++iterator)
+    (*iterator).int_id_->finalize ();
+}
+
+void
+TAO_Thread_Pool_Manager::shutdown_reactor (void)
+{
+  // Finalize all the pools.
+  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
+       iterator != this->thread_pools_.end ();
+       ++iterator)
+    (*iterator).int_id_->shutdown_reactor ();
+}
+
+void
+TAO_Thread_Pool_Manager::wait (void)
+{
+  // Finalize all the pools.
+  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
+       iterator != this->thread_pools_.end ();
+       ++iterator)
+    (*iterator).int_id_->wait ();
+}
+
+int
+TAO_Thread_Pool_Manager::is_collocated (const TAO_MProfile &mprofile)
+{
+  // Finalize all the pools.
+  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
+       iterator != this->thread_pools_.end ();
+       ++iterator)
+    {
+      int result =
+        (*iterator).int_id_->is_collocated (mprofile);
+
+      if (result)
+        return result;
+    }
+
+  return 0;
+}
+
 RTCORBA::ThreadpoolId
 TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                             CORBA::ULong static_threads,
@@ -393,7 +744,8 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
   TAO_Thread_Pool *thread_pool = 0;
 
   ACE_NEW_THROW_EX (thread_pool,
-                    TAO_Thread_Pool (this->thread_pool_id_counter_,
+                    TAO_Thread_Pool (*this,
+                                     this->thread_pool_id_counter_,
                                      stacksize,
                                      static_threads,
                                      dynamic_threads,
@@ -401,7 +753,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                      allow_request_buffering,
                                      max_buffered_requests,
                                      max_request_buffer_size,
-                                     this->orb_core_->orb ()),
+                                     ACE_TRY_ENV),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -423,14 +775,15 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
   TAO_Thread_Pool *thread_pool = 0;
 
   ACE_NEW_THROW_EX (thread_pool,
-                    TAO_Thread_Pool (this->thread_pool_id_counter_,
+                    TAO_Thread_Pool (*this,
+                                     this->thread_pool_id_counter_,
                                      stacksize,
                                      lanes,
                                      allow_borrowing,
                                      allow_request_buffering,
                                      max_buffered_requests,
                                      max_request_buffer_size,
-                                     this->orb_core_->orb ()),
+                                     ACE_TRY_ENV),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -446,11 +799,15 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool,
   // Make sure of safe deletion in case of errors.
   auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
 
+  // Open the pool.
+  thread_pool->open (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
   // Create the static threads.
   int result =
     thread_pool->create_static_threads ();
 
-  // Throw exceptin in case of errors.
+  // Throw exception in case of errors.
   if (result != 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       result);
@@ -493,10 +850,31 @@ TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool
   if (result != 0)
     ACE_THROW (RTCORBA::RTORB::InvalidThreadpool ());
 
+  // Shutdown reactor.
+  thread_pool->shutdown_reactor ();
+
+  // Wait for the threads.
+  thread_pool->wait ();
+
+  // Finalize resources.
+  thread_pool->finalize ();
+
   // Delete the thread pool.
   delete thread_pool;
 }
 
+TAO_ORB_Core &
+TAO_Thread_Pool_Manager::orb_core (void) const
+{
+  return this->orb_core_;
+}
+
+ACE_SYNCH_MUTEX &
+TAO_Thread_Pool_Manager::lock (void)
+{
+  return this->lock_;
+}
+
 TAO_Thread_Pool_Manager::THREAD_POOLS &
 TAO_Thread_Pool_Manager::thread_pools (void)
 {
@@ -529,4 +907,3 @@ template class ACE_Auto_Basic_Array_Ptr<size_t>;
 #pragma instantiate ACE_Auto_Basic_Array_Ptr<size_t>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index bce170bd27e..3f8bdeb4f80 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -18,14 +18,44 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Task.h"
-#include "RTCORBA.h"
-#include "tao/ORB.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
 #include "ace/Hash_Map_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/New_Leader_Generator.h"
+#include "ace/Task.h"
 
 class TAO_Thread_Lane;
 
 /**
+ * @class TAO_RT_New_Leader_Generator
+ *
+ * @brief Class for creating dynamic threads.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_RTCORBA_Export TAO_RT_New_Leader_Generator
+  : public TAO_New_Leader_Generator
+{
+public:
+
+  /// Constructor.
+  TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane);
+
+  /// Leader/Follower class uses this method to notify the system that
+  /// we are out of leaders.
+  void no_leaders_available (void);
+
+private:
+
+  /// Lane associated with this leader generator.
+  TAO_Thread_Lane &lane_;
+};
+
+/**
  * @class TAO_Thread_Pool_Threads
  *
  * @brief Class representing a thread running in a thread lane.
@@ -38,8 +68,7 @@ class TAO_RTCORBA_Export TAO_Thread_Pool_Threads : public ACE_Task_Base
 public:
 
   /// Constructor.
-  TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane,
-                           ACE_Thread_Manager &tm);
+  TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane);
 
   /// Method executed when a thread is spawned.
   int svc (void);
@@ -47,6 +76,10 @@ public:
   /// Accessor to the lane to which this thread belongs to.
   TAO_Thread_Lane &lane (void) const;
 
+  /// Set TSS resources for the current thread.
+  static void set_tss_resources (TAO_ORB_Core &orb_core,
+                                 TAO_Thread_Lane &thread_lane);
+
 private:
 
   /// Lane to which this thread belongs to.
@@ -72,7 +105,26 @@ public:
                    CORBA::ULong id,
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
-                   CORBA::ULong dynamic_threads);
+                   CORBA::ULong dynamic_threads,
+                   CORBA::Environment &ACE_TRY_ENV);
+
+  /// Destructor.
+  ~TAO_Thread_Lane (void);
+
+  /// Open the lane.
+  void open (CORBA::Environment &ACE_TRY_ENV);
+
+  /// Finalize the resources.
+  void finalize (void);
+
+  /// Shutdown the reactor.
+  void shutdown_reactor (void);
+
+  /// Wait for threads to exit.
+  void wait (void);
+
+  // Does <mprofile> belong to us?
+  int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
   int create_static_threads (void);
@@ -84,29 +136,49 @@ public:
   /// @name Accessors
   // @{
 
+  TAO_Thread_Pool &pool (void) const;
+  CORBA::ULong id (void) const;
+
   CORBA::Short lane_priority (void) const;
   CORBA::ULong static_threads (void) const;
   CORBA::ULong dynamic_threads (void) const;
 
-  CORBA::ULong id (void) const;
+  CORBA::ULong current_threads (void) const;
+  void current_threads (CORBA::ULong);
+
+  CORBA::Short native_priority (void) const;
 
-  TAO_Thread_Pool &thread_pool (void) const;
   TAO_Thread_Pool_Threads &threads (void);
 
+  TAO_Thread_Lane_Resources &resources (void);
+
   // @}
 
 private:
 
-  TAO_Thread_Pool &thread_pool_;
+  /// Validate lane's priority and map it to a native value.
+  void validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV);
+
+  TAO_Thread_Pool &pool_;
   CORBA::ULong id_;
 
   CORBA::Short lane_priority_;
   CORBA::ULong static_threads_;
   CORBA::ULong dynamic_threads_;
 
+  CORBA::ULong current_threads_;
+
   TAO_Thread_Pool_Threads threads_;
+
+  TAO_RT_New_Leader_Generator new_thread_generator_;
+
+  TAO_Thread_Lane_Resources resources_;
+
+  CORBA::Short native_priority_;
 };
 
+class TAO_Thread_Pool_Manager;
+
 /**
  * @class TAO_Thread_Pool
  *
@@ -123,7 +195,8 @@ class TAO_RTCORBA_Export TAO_Thread_Pool
 public:
 
   /// Constructor (for pools without lanes).
-  TAO_Thread_Pool (CORBA::ULong id,
+  TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
+                   CORBA::ULong id,
                    CORBA::ULong stack_size,
                    CORBA::ULong static_threads,
                    CORBA::ULong dynamic_threads,
@@ -131,27 +204,47 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
-                   CORBA::ORB_ptr orb);
+                   CORBA::Environment &ACE_TRY_ENV);
 
   /// Constructor (for pools with lanes).
-  TAO_Thread_Pool (CORBA::ULong id,
+  TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
+                   CORBA::ULong id,
                    CORBA::ULong stack_size,
                    const RTCORBA::ThreadpoolLanes &lanes,
                    CORBA::Boolean allow_borrowing,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
-                   CORBA::ORB_ptr orb);
+                   CORBA::Environment &ACE_TRY_ENV);
 
   /// Destructor.
   ~TAO_Thread_Pool (void);
 
+  /// Open the pool.
+  void open (CORBA::Environment &ACE_TRY_ENV);
+
+  /// Finalize the resources.
+  void finalize (void);
+
+  /// Shutdown the reactor.
+  void shutdown_reactor (void);
+
+  /// Wait for threads to exit.
+  void wait (void);
+
+  // Does <mprofile> belong to us?
+  int is_collocated (const TAO_MProfile &mprofile);
+
   /// Create the static threads - only called once.
   int create_static_threads (void);
 
+  /// Check if this thread pool has (explicit) lanes.
+  int with_lanes (void) const;
+
   /// @name Accessors
   // @{
 
+  TAO_Thread_Pool_Manager &manager (void) const;
   CORBA::ULong id (void) const;
 
   CORBA::ULong stack_size (void) const;
@@ -160,9 +253,6 @@ public:
   CORBA::ULong max_buffered_requests (void) const;
   CORBA::ULong max_request_buffer_size (void) const;
 
-  ACE_Thread_Manager &thread_manager (void);
-
-  CORBA::ORB_ptr orb (void) const;
   TAO_Thread_Lane **lanes (void);
   CORBA::ULong number_of_lanes (void) const;
 
@@ -170,6 +260,7 @@ public:
 
 private:
 
+  TAO_Thread_Pool_Manager &manager_;
   CORBA::ULong id_;
 
   CORBA::ULong stack_size_;
@@ -180,12 +271,11 @@ private:
 
   TAO_Thread_Lane **lanes_;
   CORBA::ULong number_of_lanes_;
-
-  ACE_Thread_Manager &thread_manager_;
-
-  CORBA::ORB_var orb_;
+  int with_lanes_;
 };
 
+class TAO_ORB_Core;
+
 /**
  * @class TAO_Thread_Pool_Manager
  *
@@ -199,14 +289,22 @@ class TAO_RTCORBA_Export TAO_Thread_Pool_Manager
 public:
 
   /// Constructor.
-  TAO_Thread_Pool_Manager (TAO_ORB_Core *orb_core);
+  TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
   ~TAO_Thread_Pool_Manager (void);
 
-  /// Create the static threads - only called once.
-  int
-  create_static_threads (void);
+  /// Finalize the resources.
+  void finalize (void);
+
+  /// Shutdown the reactor.
+  void shutdown_reactor (void);
+
+  /// Wait for threads to exit.
+  void wait (void);
+
+  // Does <mprofile> belong to us?
+  int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create a threadpool without lanes.
   RTCORBA::ThreadpoolId
@@ -217,7 +315,7 @@ public:
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                     CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a threadpool with lanes.
@@ -228,22 +326,29 @@ public:
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size,
-                                CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy a threadpool.
-  void
-  destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
-                      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
+                           CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
   /// Collection of thread pools.
   typedef ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> THREAD_POOLS;
 
-  /// Access the thread pools managed by this class.
+  /// @name Accessors
+  // @{
+
+  ACE_SYNCH_MUTEX &lock (void);
+
+  TAO_ORB_Core &orb_core (void) const;
+
   THREAD_POOLS &thread_pools (void);
 
+  // @}
+
 private:
 
   /// @name Helpers
@@ -282,7 +387,7 @@ private:
 
   // @}
 
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core &orb_core_;
 
   THREAD_POOLS thread_pools_;
   RTCORBA::ThreadpoolId thread_pool_id_counter_;
diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile
index efb7bb01115..608f28dad3e 100644
--- a/TAO/tao/RTPortableServer/Makefile
+++ b/TAO/tao/RTPortableServer/Makefile
@@ -27,9 +27,9 @@ CPP_SRCS += \
   RTPortableServer \
   RTPortableServerC \
   RT_Acceptor_Filters \
+  RT_Collocation_Resolver \
   RT_Object_Adapter_Factory \
   RT_POA \
-  RT_POA_Initializer \
   RT_Policy_Validator \
   RT_Servant_Dispatcher
 
@@ -169,23 +169,28 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RTPortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -193,21 +198,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -224,7 +214,17 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  RTPortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   RTPortableServerC.i RT_Object_Adapter_Factory.h \
   $(TAO_ROOT)/tao/Adapter.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -383,9 +383,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -506,9 +505,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Acceptor_Filter.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/CDR.h \
@@ -572,10 +570,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/MProfile.i
 
-.obj/RT_Object_Adapter_Factory.o .obj/RT_Object_Adapter_Factory.so .shobj/RT_Object_Adapter_Factory.o .shobj/RT_Object_Adapter_Factory.so: RT_Object_Adapter_Factory.cpp \
-  RT_Object_Adapter_Factory.h \
+.obj/RT_Collocation_Resolver.o .obj/RT_Collocation_Resolver.so .shobj/RT_Collocation_Resolver.o .shobj/RT_Collocation_Resolver.so: RT_Collocation_Resolver.cpp \
+  $(TAO_ROOT)/tao/RTPortableServer/RT_Collocation_Resolver.h \
   $(ACE_ROOT)/ace/pre.h \
-  rtportableserver_export.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -584,14 +583,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -602,8 +593,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -667,24 +666,21 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/try_macros.h \
-  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/Collocation_Resolver.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
@@ -699,22 +695,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  RT_POA_Initializer.h \
-  $(TAO_ROOT)/tao/POA_Extension_Initializer.h \
-  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RT_Collocation_Resolver.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -722,74 +708,40 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(ACE_ROOT)/ace/Map.h \
-  $(ACE_ROOT)/ace/Map_T.h \
-  $(ACE_ROOT)/ace/Pair.h \
-  $(ACE_ROOT)/ace/Pair_T.h \
-  $(ACE_ROOT)/ace/Pair_T.i \
-  $(ACE_ROOT)/ace/Pair_T.cpp \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Active_Map_Manager.h \
-  $(ACE_ROOT)/ace/Active_Map_Manager.i \
-  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Map_T.i \
-  $(ACE_ROOT)/ace/Map_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
-  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
-  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
-  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable.i \
   $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -805,6 +757,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
@@ -823,6 +777,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -835,9 +792,18 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
@@ -848,9 +814,104 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(ACE_ROOT)/ace/Map.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/POA.h \
+  $(TAO_ROOT)/tao/PortableServer/POAManager.h \
+  $(TAO_ROOT)/tao/PortableServer/POAManager.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PortableServer/POA.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i
 
-.obj/RT_POA.o .obj/RT_POA.so .shobj/RT_POA.o .shobj/RT_POA.so: RT_POA.cpp RT_POA.h \
+.obj/RT_Object_Adapter_Factory.o .obj/RT_Object_Adapter_Factory.so .shobj/RT_Object_Adapter_Factory.o .shobj/RT_Object_Adapter_Factory.so: RT_Object_Adapter_Factory.cpp \
+  RT_Object_Adapter_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   rtportableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -861,8 +922,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(TAO_ROOT)/tao/PortableServer/POA.h \
-  $(ACE_ROOT)/ace/SString.h \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
@@ -875,8 +940,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -890,15 +953,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Record.h \
@@ -921,6 +975,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Atomic_Op.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
   $(ACE_ROOT)/ace/Free_List.i \
@@ -955,6 +1010,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
@@ -963,8 +1049,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -994,28 +1078,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -1040,8 +1102,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
@@ -1053,45 +1113,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
-  $(TAO_ROOT)/tao/PortableServer/POAManager.h \
-  $(TAO_ROOT)/tao/PortableServer/POAManager.i \
-  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/PortableServer/POA.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  RTPortableServer.h RTPortableServerC.h RTPortableServerC.i RT_POA.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
@@ -1104,10 +1125,22 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable.i \
   $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
@@ -1117,6 +1150,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
   $(TAO_ROOT)/tao/PollableC.h \
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
@@ -1128,42 +1166,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
   $(ACE_ROOT)/ace/Singleton.h \
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/Stub.i \
-  $(TAO_ROOT)/tao/Acceptor_Registry.h \
-  $(TAO_ROOT)/tao/Acceptor_Registry.i \
-  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \
-  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
-  $(TAO_ROOT)/tao/PortableServer/Default_Acceptor_Filter.h \
-  $(TAO_ROOT)/tao/Acceptor_Filter.h \
-  $(TAO_ROOT)/tao/Acceptor_Filter.i \
-  RT_Acceptor_Filters.h RT_Acceptor_Filters.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp
+  RT_Servant_Dispatcher.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Dispatcher.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  RT_Policy_Validator.h RT_Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/Collocation_Resolver.h \
+  $(TAO_ROOT)/tao/Collocation_Resolver.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RT_Collocation_Resolver.i
 
-.obj/RT_POA_Initializer.o .obj/RT_POA_Initializer.so .shobj/RT_POA_Initializer.o .shobj/RT_POA_Initializer.so: RT_POA_Initializer.cpp RT_POA_Initializer.h \
+.obj/RT_POA.o .obj/RT_POA.so .shobj/RT_POA.o .shobj/RT_POA.so: RT_POA.cpp RT_POA.h \
   $(ACE_ROOT)/ace/pre.h \
   rtportableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -1174,12 +1207,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(TAO_ROOT)/tao/POA_Extension_Initializer.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
+  $(TAO_ROOT)/tao/PortableServer/POA.h \
+  $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
@@ -1192,6 +1221,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -1205,6 +1236,15 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Record.h \
@@ -1227,7 +1267,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Atomic_Op.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
   $(ACE_ROOT)/ace/Free_List.i \
@@ -1262,12 +1301,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  RT_Servant_Dispatcher.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Dispatcher.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
-  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
@@ -1277,8 +1310,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
@@ -1368,9 +1399,26 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/PortableServer/POAManager.h \
+  $(TAO_ROOT)/tao/PortableServer/POAManager.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PortableServer/POA.i \
+  RTPortableServerC.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -1389,7 +1437,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  RT_Policy_Validator.h \
+  RTPortableServerC.i RT_POA.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
@@ -1426,25 +1474,78 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
   $(ACE_ROOT)/ace/Singleton.h \
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
+  $(TAO_ROOT)/tao/Acceptor_Registry.h \
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Acceptor_Filter.h \
+  $(TAO_ROOT)/tao/Acceptor_Filter.h \
+  $(TAO_ROOT)/tao/Acceptor_Filter.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RT_Policy_Validator.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  RT_Acceptor_Filters.h RT_Acceptor_Filters.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/RT_Policy_Validator.o .obj/RT_Policy_Validator.so .shobj/RT_Policy_Validator.o .shobj/RT_Policy_Validator.so: RT_Policy_Validator.cpp RT_Policy_Validator.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -1692,13 +1793,56 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_ORB.h \
+  $(TAO_ROOT)/tao/RTCORBA/RT_ORB.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
   $(TAO_ROOT)/tao/Acceptor_Registry.h \
-  $(TAO_ROOT)/tao/Acceptor_Registry.i
+  $(TAO_ROOT)/tao/Acceptor_Registry.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i
 
 .obj/RT_Servant_Dispatcher.o .obj/RT_Servant_Dispatcher.so .shobj/RT_Servant_Dispatcher.o .shobj/RT_Servant_Dispatcher.so: RT_Servant_Dispatcher.cpp \
   RT_Servant_Dispatcher.h \
@@ -1904,9 +2048,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -1944,7 +2087,48 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/POA.i \
-  RTPortableServer.h RTPortableServerC.h RTPortableServerC.i RT_POA.i \
+  RTPortableServerC.h RTPortableServerC.i RT_POA.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Services.h \
@@ -1986,11 +2170,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
diff --git a/TAO/tao/RTPortableServer/Makefile.bor b/TAO/tao/RTPortableServer/Makefile.bor
index 89ff7ce5e8d..37c455780e9 100644
--- a/TAO/tao/RTPortableServer/Makefile.bor
+++ b/TAO/tao/RTPortableServer/Makefile.bor
@@ -8,9 +8,9 @@ OBJFILES = \
 	$(OBJDIR)\RTPortableServer.obj \
 	$(OBJDIR)\RTPortableServerC.obj \
 	$(OBJDIR)\RT_Acceptor_Filters.obj \
+	$(OBJDIR)\RT_Collocation_Resolver.obj \
 	$(OBJDIR)\RT_Object_Adapter_Factory.obj \
 	$(OBJDIR)\RT_POA.obj \
-	$(OBJDIR)\RT_POA_Initializer.obj \
 	$(OBJDIR)\RT_Policy_Validator.obj \
 	$(OBJDIR)\RT_Servant_Dispatcher.obj
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
index 6c37b0d28e2..db756286e2d 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -19,11 +19,7 @@
 
 ACE_RCSID (RTPortableServer, RTPortableServer, "$Id$")
 
-int
-TAO_RT_POA_Initializer::init (void)
+TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
 {
-  ACE_Service_Config::static_svcs ()->
-    insert (&ace_svc_desc_TAO_RT_Object_Adapter_Factory);
-
-  return 0;
+  ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_RT_Object_Adapter_Factory);
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h
index 9f81e8c9076..e66fe4f6ec0 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer.h
@@ -26,26 +26,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_RTPortableServer_Export TAO_RT_POA_Initializer
+#include "tao/RTCORBA/RTCORBA.h"
+
+class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
 {
 public:
-  static int init (void);
-  // Used to force the initialization of the ORB code.
+  // Constructor.
+  TAO_RTPortableServer_Initializer (void);
 };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_RT_POA_Initializer = &TAO_RT_POA_Initializer::init;
-
-#else
-
-static int
-TAO_Requires_RT_POA_Initializer  = TAO_RT_POA_Initializer::init ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
 
 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
 #include "RTPortableServerC.h"
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index aed88a4420f..b4ef0ad232e 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -30,7 +30,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTCORBA/RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "tao/RTCORBA/RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -63,7 +65,7 @@ TAO_NAMESPACE  RTPortableServer
 
   class POA;
   typedef POA *POA_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -74,23 +76,23 @@ TAO_NAMESPACE  RTPortableServer
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {} 
+    POA_var (POA_ptr p) : ptr_ (p) {}
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-    
+
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-    
+
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
     POA_ptr _retn (void);
     POA_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static POA_ptr tao_duplicate (POA_ptr);
@@ -98,7 +100,7 @@ TAO_NAMESPACE  RTPortableServer
     static POA_ptr tao_nil (void);
     static POA_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -125,7 +127,7 @@ TAO_NAMESPACE  RTPortableServer
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-  
+
   private:
     POA_ptr &ptr_;
   };
@@ -151,12 +153,12 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     static POA_ptr _duplicate (POA_ptr obj);
     static POA_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static POA_ptr _nil (void)
@@ -167,7 +169,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -179,7 +181,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
         const PortableServer::ObjectId & oid,
         const char * intf,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -190,7 +192,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     virtual PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -203,7 +205,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
         const PortableServer::ObjectId & oid,
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -214,12 +216,12 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     POA ();
-    
+
     virtual ~POA (void);
   private:
     POA (const POA &);
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index d1c1984f4d8..4df386ee644 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -17,11 +17,11 @@ TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols)
 }
 
 int
-TAO_Server_Protocol_Acceptor_Filter::
-fill_mprofile (const TAO_ObjectKey &object_key,
-               TAO_MProfile &mprofile,
-               TAO_Acceptor **acceptors_begin,
-               TAO_Acceptor **acceptors_end)
+TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO_ObjectKey &object_key,
+                                                   TAO_MProfile &mprofile,
+                                                   TAO_Acceptor **acceptors_begin,
+                                                   TAO_Acceptor **acceptors_end,
+                                                   CORBA::Short priority)
 {
   // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines
   // which protocols get included into IOR and in what order.
@@ -32,15 +32,19 @@ fill_mprofile (const TAO_ObjectKey &object_key,
       for (TAO_Acceptor** acceptor = acceptors_begin;
            acceptor != acceptors_end;
            ++acceptor)
-        if ((*acceptor)->tag () == protocol_type
-            && this->validate_acceptor (*acceptor)
-            && ((*acceptor)->create_mprofile (object_key,
-                                              mprofile,
-                                              1 /* >=1 endpoints per profile */)
-                == -1))
+        if ((*acceptor)->tag () == protocol_type &&
+            ((*acceptor)->create_profile (object_key,
+                                          mprofile,
+                                          priority) == -1))
           return -1;
     }
 
+  return 0;
+}
+
+int
+TAO_Server_Protocol_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile)
+{
   // Encode endpoints.
   for (CORBA::ULong i = 0;
        i < mprofile.profile_count ();
@@ -53,47 +57,3 @@ fill_mprofile (const TAO_ObjectKey &object_key,
 
   return 0;
 }
-
-int
-TAO_Server_Protocol_Acceptor_Filter::
-validate_acceptor (TAO_Acceptor * /*acceptor*/)
-{
-  return 1;
-}
-
-TAO_Priority_Acceptor_Filter::
-TAO_Priority_Acceptor_Filter (RTCORBA::ProtocolList &protocols,
-                              CORBA::Short priority)
-  : TAO_Server_Protocol_Acceptor_Filter (protocols),
-    priority_ (priority)
-{
-}
-
-int
-TAO_Priority_Acceptor_Filter::validate_acceptor (TAO_Acceptor *acceptor)
-{
-  return (this->priority_ == acceptor->priority ());
-}
-
-TAO_Bands_Acceptor_Filter::
-TAO_Bands_Acceptor_Filter (RTCORBA::ProtocolList &protocols,
-                           RTCORBA::PriorityBands &bands)
-  : TAO_Server_Protocol_Acceptor_Filter (protocols),
-    priority_bands_ (bands)
-{
-}
-
-int
-TAO_Bands_Acceptor_Filter::validate_acceptor (TAO_Acceptor *acceptor)
-{
-  for (CORBA::ULong i = 0;
-       i < this->priority_bands_.length ();
-       ++i)
-    {
-      if (this->priority_bands_[i].low <= acceptor->priority ()
-          && this->priority_bands_[i].high >= acceptor->priority ())
-        return 1;
-    }
-  return 0;
-}
-
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
index 41c4722c4e4..b54450aaecc 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
@@ -29,7 +29,10 @@
 
 #include "rtportableserver_export.h"
 #include "tao/Acceptor_Filter.h"
-#include "tao/RTCORBA/RTCORBA.h"
+
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "tao/RTCORBA/RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -55,19 +58,16 @@ class TAO_RTPortableServer_Export TAO_Server_Protocol_Acceptor_Filter :
 public:
   TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols);
 
-  virtual int fill_mprofile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             TAO_Acceptor **acceptors_begin,
-                             TAO_Acceptor **acceptors_end);
-  // Populate <mprofile> based on what's in <protocols_>.
+  /// Populate <mprofile> based on what's in <protocols_>.
+  int fill_profile (const TAO_ObjectKey &object_key,
+                    TAO_MProfile &mprofile,
+                    TAO_Acceptor **acceptors_begin,
+                    TAO_Acceptor **acceptors_end,
+                    CORBA::Short priority);
 
-  virtual int validate_acceptor (TAO_Acceptor *acceptor);
-  // Template method pattern.  This method is used by <fill_mprofile>
-  // to decide whether <acceptor> endpoint should be added to
-  // mprofile or not.  Returns true or false.
-  // This implementation always returns true.  Subclasses can override
-  // to specify additional conditions that must be met by an
-  // <acceptor> for inclusion into mprofile.
+  /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
+  /// tag component of profiles.
+  int encode_endpoints (TAO_MProfile &mprofile);
 
 private:
   RTCORBA::ProtocolList &protocols_;
@@ -75,57 +75,6 @@ private:
   // selection.
 };
 
-class TAO_RTPortableServer_Export TAO_Priority_Acceptor_Filter :
-  public TAO_Server_Protocol_Acceptor_Filter
-{
-  // = TITLE
-  //   RTCORBA::ServerProtocolPolicy & RTCORBA::SERVER_DECLARED
-  //   priority model Acceptor_Filter.
-  //
-  // = DESCRIPTION
-  //   Populates mprofile with endpoints that match
-  //   RTCORBA::SERVER_DECLARED priority and
-  //   RTCORBA::ServerProtocolPolicy of the POA.
-  //
-public:
-  TAO_Priority_Acceptor_Filter (RTCORBA::ProtocolList &protocols,
-                                CORBA::Short priority);
-  // Constructor.
-
-  virtual int validate_acceptor (TAO_Acceptor *acceptor);
-  // Returns true if <acceptor>'s priority equals to <priority_>.
-
-private:
-  CORBA::Short priority_;
-  // SERVER_DECLARED priority of the object.
-};
-
-class TAO_RTPortableServer_Export TAO_Bands_Acceptor_Filter :
-  public TAO_Server_Protocol_Acceptor_Filter
-{
-  // = TITLE
-  //   RTCORBA::PriorityBandedConnectionPolicy &
-  //   RTCORBA::ServerProtocolPolicy Acceptor_Filter.
-  //
-  // = DESCRIPTION
-  //   Populates mprofile with endpoints that match
-  //   RTCORBA::PriorityBandedConnectionPolicy and
-  //   RTCORBA::ServerProtocolPolicy of the POA.
-  //
-public:
-  TAO_Bands_Acceptor_Filter (RTCORBA::ProtocolList &protocols,
-                             RTCORBA::PriorityBands &bands);
-  // Constructor.
-
-  virtual int validate_acceptor (TAO_Acceptor *acceptor);
-  // Returns true if <acceptor>'s priority falls into the range of any
-  // of the <priority_bands_>.
-
-private:
-  RTCORBA::PriorityBands &priority_bands_;
-  // The value of POA's PriorityBandedConnectionPolicy.
-};
-
 #if defined (__ACE_INLINE__)
 #include "RT_Acceptor_Filters.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
new file mode 100644
index 00000000000..4f3552e9f9f
--- /dev/null
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -0,0 +1,120 @@
+// $Id$
+
+#include "tao/RTPortableServer/RT_Collocation_Resolver.h"
+
+ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$")
+
+#include "tao/ORB_Core.h"
+#include "tao/Object.h"
+#include "tao/Stub.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/POA.h"
+#include "tao/RTCORBA/Thread_Pool.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/RTPortableServer/RT_Collocation_Resolver.i"
+#endif /* ! __ACE_INLINE__ */
+
+CORBA::Boolean
+TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object,
+                                            CORBA::Environment &ACE_TRY_ENV) const
+{
+  // Make sure that the servant is in the same ORB that created this
+  // object.
+  if (!object->_is_collocated ())
+    return 0;
+
+  // Get the orb core.
+  TAO_ORB_Core *orb_core =
+    object->_stubobj ()->servant_orb_var ()->orb_core ();
+
+  // Lookup the target POA.  Note that Object Adapter lock is held
+  // until <servant_upcall> dies.
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core);
+  TAO_POA *poa =
+    servant_upcall.lookup_POA (object->_object_key (),
+                               ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  // Get the thread pool associated with this POA.
+  TAO_Thread_Pool *target_thread_pool =
+    (TAO_Thread_Pool *) poa->thread_pool ();
+
+  /// Get the ORB_Core's TSS resources.
+  TAO_ORB_Core_TSS_Resources &tss =
+    *orb_core->get_tss_resources ();
+
+  // Get the lane for this thread.
+  TAO_Thread_Lane *current_thread_lane =
+    (TAO_Thread_Lane *) tss.lane_;
+
+  TAO_Thread_Pool *current_thread_pool = 0;
+
+  // If we don't have a lane, we don't have a pool.
+  if (current_thread_lane)
+    current_thread_pool =
+      &current_thread_lane->pool ();
+
+  // If the pools don't match, then the current thread belongs to a
+  // different pool than POA.  Therefore, this object is not
+  // collocated.
+  if (current_thread_pool != target_thread_pool)
+    return 0;
+
+  // If the current thread and the POA are in the default thread pool,
+  // then the object is collocated.
+  if (current_thread_pool == 0)
+    return 1;
+
+  // If the current thread and the POA are in a thread pool without
+  // lanes, then the object is collocated.
+  if (!current_thread_pool->with_lanes ())
+    return 1;
+
+  // Grab the cached policies from the POA.
+  TAO_POA_Cached_Policies &cached_policies =
+    poa->cached_policies ();
+
+  // Grab the priority model used by the POA.  Note that this cannot
+  // be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread
+  // pool with lanes.
+  TAO_POA_Cached_Policies::PriorityModel priority_model =
+    cached_policies.priority_model ();
+
+  // If the policy is CLIENT_PROPAGATED, then we are collocated
+  // because the current thread is of the correct priority :-) and
+  // we'll simple use the current thread to run the upcall.
+  if (priority_model == TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+    return 1;
+
+  // Locate the target servant.  We are really not interested in the
+  // servant itself but in the priority that this servant will run at.
+  // Note that the operation name is bogus: it is not used because the
+  // IMPLICIT_ACTIVATION policy is not allowed with SERVER_DECLARED
+  // policy.
+  poa->locate_servant_i ("operation not used",
+                         servant_upcall.system_id_,
+                         servant_upcall,
+                         servant_upcall.current_context_,
+                         ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  // Get the priority that the servant will run at.
+  CORBA::Short target_priority =
+    servant_upcall.priority ();
+
+  // If it matches the current thread's priority, then we are
+  // collocated.  Otherwise we are not.
+  if (target_priority == current_thread_lane->lane_priority ())
+    return 1;
+  else
+    return 0;
+}
+
+ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver,
+                       ACE_TEXT ("RT_Collocation_Resolver"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_RT_Collocation_Resolver),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_FACTORY_DEFINE (TAO, TAO_RT_Collocation_Resolver)
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
new file mode 100644
index 00000000000..059160e17ec
--- /dev/null
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -0,0 +1,53 @@
+//=============================================================================
+/**
+ *  @file    RT_Collocation_Resolver.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_RT_COLLOCATION_RESOLVER_H
+#define TAO_RT_COLLOCATION_RESOLVER_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/RTPortableServer/rtportableserver_export.h"
+#include "tao/Collocation_Resolver.h"
+#include "ace/Service_Config.h"
+
+/**
+ * @class TAO_RT_Collocation_Resolver
+ *
+ * @brief This class helps decide on collocation among the maze of
+ * thread pools and lanes.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_RTPortableServer_Export TAO_RT_Collocation_Resolver :
+  public TAO_Collocation_Resolver
+{
+public:
+
+  /// Is <object> collocated?
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object,
+                                        CORBA::Environment &ACE_TRY_ENV) const;
+};
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
+ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
+
+#if defined (__ACE_INLINE__)
+# include "tao/RTPortableServer/RT_Collocation_Resolver.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_RT_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index 881a41c1bae..bb57456cd56 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
 #include "RT_Object_Adapter_Factory.h"
-#include "RT_POA_Initializer.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
+#include "RT_Servant_Dispatcher.h"
+#include "RT_Policy_Validator.h"
+#include "RT_Collocation_Resolver.h"
 
 ACE_RCSID (TAO_RTPortableServer,
            RT_Object_Adapter_Factory,
@@ -12,26 +14,40 @@ ACE_RCSID (TAO_RTPortableServer,
 
 TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void)
 {
+  // Set the name of the collocation resolver to be RT_Collocation_Resolver.
+  TAO_ORB_Core::set_collocation_resolver ("RT_Collocation_Resolver");
+  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Collocation_Resolver);
 }
 
 TAO_Adapter*
 TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
 {
-  // Register the RT_POA initializer so that it can register all of its
-  // hooks when the time comes.
-  TAO_RT_POA_Initializer *rt_initializer;
-  ACE_NEW_RETURN (rt_initializer,
-                  TAO_RT_POA_Initializer,
-                  0);
-  orb_core->add_poa_extension_initializer (rt_initializer);
-
   // Setup the POA_Current object in the ORB
   CORBA::Object_var current = new TAO_POA_Current;
   orb_core->poa_current (current.in ());
 
-  return new TAO_Object_Adapter (orb_core->server_factory ()->
+  TAO_Object_Adapter *object_adapter = 0;
+  ACE_NEW_RETURN (object_adapter,
+                  TAO_Object_Adapter (orb_core->server_factory ()->
                                         active_object_map_creation_parameters (),
-                                 *orb_core);
+                                      *orb_core),
+                  0);
+
+  // Create and register the RT servant dispatcher.
+  TAO_RT_Servant_Dispatcher *rt_servant_dispatcher;
+  ACE_NEW_RETURN (rt_servant_dispatcher,
+                  TAO_RT_Servant_Dispatcher,
+                  0);
+  object_adapter->servant_dispatcher (rt_servant_dispatcher);
+
+  // Create and add the RT policy validator.
+  TAO_POA_RT_Policy_Validator *rt_validator;
+  ACE_NEW_RETURN (rt_validator,
+                  TAO_POA_RT_Policy_Validator (*orb_core),
+                  0);
+  object_adapter->validator ().add_validator (rt_validator);
+
+  return object_adapter;
 }
 
 ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory)
@@ -41,5 +57,3 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory,
                        &ACE_SVC_NAME (TAO_RT_Object_Adapter_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-
-
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index cfdd7d3a3bb..96314d1e143 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -9,11 +9,14 @@
 #include "tao/Exception.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
+#include "tao/RTCORBA/Thread_Pool.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/Acceptor_Registry.h"
 
 #include "tao/RTCORBA/RT_Policy_i.h"
 
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
+#include "tao/RTPortableServer/RT_Policy_Validator.h"
 #include "RT_Acceptor_Filters.h"
 
 // auto_ptr class
@@ -42,7 +45,8 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
              thread_lock,
              orb_core,
              object_adapter,
-             ACE_TRY_ENV)
+             ACE_TRY_ENV),
+  thread_pool_ (0)
 {
   ACE_CHECK;
 
@@ -89,81 +93,103 @@ void
 TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies,
                                CORBA::Environment &ACE_TRY_ENV)
 {
+  {
+    CORBA::Policy_var policy =
+      policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
-  CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+    RTCORBA::PriorityModelPolicy_var priority_model =
+      RTCORBA::PriorityModelPolicy::_narrow (policy.in (),
+                                             ACE_TRY_ENV);
+    ACE_CHECK;
 
-  RTCORBA::PriorityModelPolicy_var priority_model =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in (),
-                                           ACE_TRY_ENV);
-  ACE_CHECK;
+    if (!CORBA::is_nil (priority_model.in ()))
+      {
+        RTCORBA::PriorityModel rt_priority_model =
+          priority_model->priority_model (ACE_TRY_ENV);
+        ACE_CHECK;
 
-  if (!CORBA::is_nil (priority_model.in ()))
-    {
-      RTCORBA::PriorityModel rt_priority_model =
-        priority_model->priority_model (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->cached_policies ().priority_model (
+          TAO_POA_Cached_Policies::PriorityModel (rt_priority_model));
 
-      this->cached_policies ().priority_model (
-                    TAO_POA_Cached_Policies::PriorityModel (rt_priority_model));
+        RTCORBA::Priority priority =
+          priority_model->server_priority (ACE_TRY_ENV);
+        ACE_CHECK;
 
-      RTCORBA::Priority priority = priority_model->server_priority (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->cached_policies ().server_priority (priority);
+      }
+  }
 
-      this->cached_policies ().server_priority (priority);
-    }
+  this->thread_pool_ =
+    TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
+                                                      policies.policies (),
+                                                      ACE_TRY_ENV);
+  ACE_CHECK;
 }
 
 void
-TAO_RT_POA::valid_priority (RTCORBA::Priority priority,
-                            CORBA_Environment &ACE_TRY_ENV)
-{
-  // Make sure <priority> matches our resource configuration:
-  // 1. If Priority Banded Connections are set, <priority> must match
-  //    one of the bands.
-  // 2. If no Priority Banded Connections are set, at least one server
-  //    endpoint must provide service at the specified <priority>.
-
-  // @@ RT CORBA Subsetting: optimize out locks.
-  CORBA::Policy_var policy =
-    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
-
-  RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in (),
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  TAO_PriorityBandedConnectionPolicy *bands_policy =
-    ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
-                      priority_bands.in ());
-
-  if (bands_policy != 0)
-    // Case 1.
+TAO_RT_POA::validate_priority (RTCORBA::Priority priority,
+                               CORBA_Environment &ACE_TRY_ENV)
+{
+  if (priority < RTCORBA::minPriority ||
+      priority > RTCORBA::maxPriority)
+    ACE_THROW (CORBA::BAD_PARAM ());
+
+  // If this POA is using a thread pool with lanes, make sure the
+  // priority matches one of the thread lanes.  Note that in this
+  // case, bands do not matter since matching the lanes priority is a
+  // stricter condition than meeting the band ranges.  In addition,
+  // when the POA was created, the bands had to match the lanes.
+  if (this->thread_pool_ != 0 &&
+      this->thread_pool_->with_lanes ())
     {
-      RTCORBA::PriorityBands &bands =
-        bands_policy->priority_bands_rep ();
+      TAO_Thread_Lane **lanes =
+        this->thread_pool_->lanes ();
 
-      for (CORBA::ULong i = 0; i < bands.length (); ++i)
+      for (CORBA::ULong i = 0;
+           i != this->thread_pool_->number_of_lanes ();
+           ++i)
         {
-          if (priority <= bands[i].high
-              && priority >= bands[i].low)
+          if (lanes[i]->lane_priority () == priority)
             return;
         }
+
+      ACE_THROW (CORBA::BAD_PARAM ());
     }
   else
-    // Case 2.
+    // Else we are dealing with a thread pool without lanes.
     {
-      TAO_Acceptor_Registry *ar =
-        this->orb_core_.acceptor_registry ();
+      // Check if we have bands.
+      CORBA::Policy_var bands =
+        this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
 
-      for (TAO_Acceptor **a = ar->begin (); a != ar->end (); ++a)
+      RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
+        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in (),
+                                                            ACE_TRY_ENV);
+      ACE_CHECK;
+
+      TAO_PriorityBandedConnectionPolicy *priority_bands_i =
+        ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
+                          priority_bands.in ());
+
+      if (priority_bands_i)
         {
-          if ((*a)->priority () == priority)
-            return;
+          // If we do have bands, make sure that the priority is
+          // matching one of the bands.
+          RTCORBA::PriorityBands &bands =
+            priority_bands_i->priority_bands_rep ();
+
+          for (CORBA::ULong i = 0;
+               i < bands.length ();
+               ++i)
+            {
+              if (bands[i].low <= priority &&
+                  bands[i].high >= priority)
+                return;
+            }
+
+          ACE_THROW (CORBA::BAD_PARAM ());
         }
     }
-
-  ACE_THROW (CORBA::BAD_PARAM ());
 }
 
 void
@@ -176,7 +202,7 @@ TAO_RT_POA::validate_policies (CORBA::Environment &ACE_TRY_ENV)
   // priority from "somewhere" when a request arrives for an inactive
   // object.
   if (this->cached_policies_.implicit_activation () ==
-            PortableServer::IMPLICIT_ACTIVATION)
+      PortableServer::IMPLICIT_ACTIVATION)
     {
       ACE_THROW (PortableServer::POA::WrongPolicy ());
     }
@@ -185,7 +211,7 @@ TAO_RT_POA::validate_policies (CORBA::Environment &ACE_TRY_ENV)
   // SERVER_DECLARED option for the PriorityModelPolicy then the ORB
   // shall raise a WrongPolicy user exception.
   if (this->cached_policies_.priority_model () !=
-            TAO_POA_Cached_Policies::SERVER_DECLARED)
+      TAO_POA_Cached_Policies::SERVER_DECLARED)
     {
       ACE_THROW (PortableServer::POA::WrongPolicy ());
     }
@@ -196,20 +222,19 @@ TAO_RT_POA::validate_policies (CORBA::Environment &ACE_TRY_ENV)
   // observed.
 }
 
-
 TAO_Stub *
-TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &key,
+TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                            const char *type_id,
                            CORBA::Short priority,
                            CORBA_Environment &ACE_TRY_ENV)
 {
+  // Client exposed policies.
   CORBA::PolicyList_var client_exposed_policies =
     this->client_exposed_policies (priority,
                                    ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  TAO_Stub *data = 0;
-
+  // Server protocol policy.
   CORBA::Policy_var protocol =
     this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
@@ -222,73 +247,197 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &key,
     ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
                       server_protocol_policy.in ());
 
+  // Filter for server protocol.
+  TAO_Server_Protocol_Acceptor_Filter filter (server_protocol->protocols_rep ());
 
-  // If the POA has RTCORBA::SERVER_DECLARED priority model
-  // then regardless of the fact that there are or that there
-  // are not bands then we need to pass only one endpoint that
-  // is either the one associated to the bands to which the
-  // server belongs, or the one associated to the server priority.
-  //
-  // If the POA has  RTCORBA::CLIENT_EXPOSED, than all endpoints
-  // should be passed.
-
-  if (this->cached_policies_.priority_model ()
-      == TAO_POA_Cached_Policies::SERVER_DECLARED)
+  // If this POA is using the default thread pool or a thread pool
+  // without lanes, create the IOR with the acceptors in the thread
+  // pool.
+  if (this->thread_pool_ == 0 ||
+      !this->thread_pool_->with_lanes ())
     {
-      CORBA::Policy_var bands =
-        this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
-
-      RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in (),
-                                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      TAO_Acceptor_Registry *acceptor_registry =
+        TAO_POA_RT_Policy_Validator::extract_acceptor_registry (this->orb_core_,
+                                                                this->thread_pool_);
+
+      return
+        this->TAO_POA::create_stub_object (object_key,
+                                           type_id,
+                                           client_exposed_policies._retn (),
+                                           &filter,
+                                           *acceptor_registry,
+                                           ACE_TRY_ENV);
+    }
 
-      TAO_PriorityBandedConnectionPolicy *priority_bands_i =
-        ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
-                          priority_bands.in ());
+  // If this POA has the SERVER_DECLARED policy, create the IOR with
+  // the acceptors in the only thread lane that matches the priority
+  // of the object.
+  if (this->cached_policies_.priority_model () ==
+      TAO_POA_Cached_Policies::SERVER_DECLARED)
+    {
+      TAO_Thread_Lane **lanes =
+        this->thread_pool_->lanes ();
 
-      if (priority_bands_i != 0)
+      for (CORBA::ULong i = 0;
+           i != this->thread_pool_->number_of_lanes ();
+           ++i)
         {
-          TAO_Bands_Acceptor_Filter
-            filter (server_protocol->protocols_rep (),
-                    priority_bands_i->priority_bands_rep());
-
-          data = this->orb_core_.create_stub_object (key,
-                                                     type_id,
-                                                     client_exposed_policies._retn (),
-                                                     &filter,
-                                                     ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          if (lanes[i]->lane_priority () == priority)
+            return this->TAO_POA::create_stub_object (object_key,
+                                                      type_id,
+                                                      client_exposed_policies._retn (),
+                                                      &filter,
+                                                      lanes[i]->resources ().acceptor_registry (),
+                                                      ACE_TRY_ENV);
         }
-      else
+
+      ACE_ASSERT (0);
+    }
+
+  // If this POA has the CLIENT_PROPAGATED policy, create the IOR with
+  // the acceptors in the thread lanes that matches the bands in this
+  // POA.  If there are no bands, all the thread lanes are used.
+  CORBA::Policy_var bands =
+    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
+
+  RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
+    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in (),
+                                                        ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  TAO_PriorityBandedConnectionPolicy *priority_bands_i =
+    ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
+                      priority_bands.in ());
+
+  return this->create_stub_object (object_key,
+                                   type_id,
+                                   client_exposed_policies._retn (),
+                                   &filter,
+                                   priority_bands_i,
+                                   ACE_TRY_ENV);
+}
+
+TAO_Stub *
+TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
+                                const char *type_id,
+                                CORBA::PolicyList *policy_list,
+                                TAO_Acceptor_Filter *filter,
+                                TAO_PriorityBandedConnectionPolicy *priority_bands,
+                                CORBA::Environment &ACE_TRY_ENV)
+{
+  int error = 0;
+
+  // Count the number of endpoints.
+  size_t profile_count =
+    this->endpoint_count ();
+
+  // Create a profile container and have acceptor registries populate
+  // it with profiles as appropriate.
+  TAO_MProfile mprofile (0);
+
+  // Allocate space for storing the profiles.  There can never be more
+  // profiles than there are endpoints.  In some cases, there can be
+  // less profiles than endpoints.
+  int result =
+    mprofile.set (profile_count);
+  if (result == -1)
+    error = 1;
+
+  TAO_Thread_Lane **lanes =
+    this->thread_pool_->lanes ();
+
+  // Leave it to the filter to decide which acceptors/in which order
+  // go into the mprofile.
+  for (CORBA::ULong i = 0;
+       i != this->thread_pool_->number_of_lanes () &&
+         !error;
+       ++i)
+    {
+      if (this->lane_required (lanes[i],
+                               priority_bands))
         {
-          RTCORBA::Priority object_priority =
-            this->cached_policies_.server_priority () > priority ?
-                this->cached_policies_.server_priority () : priority;
-          TAO_Priority_Acceptor_Filter filter (server_protocol->protocols_rep (),
-                                               object_priority);
-
-          data = this->orb_core_.create_stub_object (key,
-                                                     type_id,
-                                                     client_exposed_policies._retn (),
-                                                     &filter,
-                                                     ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          TAO_Acceptor_Registry &acceptor_registry =
+            lanes[i]->resources ().acceptor_registry ();
+
+          result =
+            filter->fill_profile (object_key,
+                                  mprofile,
+                                  acceptor_registry.begin (),
+                                  acceptor_registry.end (),
+                                  lanes[i]->lane_priority ());
+          if (result == -1)
+            error = 1;
         }
     }
-  else
+
+  if (!error)
+    result = filter->encode_endpoints (mprofile);
+  if (result == -1)
+    error = 1;
+
+  if (error)
+    ACE_THROW_RETURN (CORBA::INTERNAL (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_MPROFILE_CREATION_ERROR,
+                          0),
+                        CORBA::COMPLETED_NO),
+                      0);
+
+  // Make sure we have at least one profile.  <mp> may end up being
+  // empty if none of the acceptor endpoints have the right priority
+  // for this object, for example.
+  if (mprofile.profile_count () == 0)
+    ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_MPROFILE_CREATION_ERROR,
+                          0),
+                        CORBA::COMPLETED_NO),
+                      0);
+
+  return
+    this->orb_core_.create_stub_object (mprofile,
+                                        type_id,
+                                        policy_list,
+                                        ACE_TRY_ENV);
+}
+
+size_t
+TAO_RT_POA::endpoint_count (void)
+{
+  size_t profile_count = 0;
+
+  TAO_Thread_Lane **lanes =
+    this->thread_pool_->lanes ();
+
+  for (CORBA::ULong i = 0;
+       i != this->thread_pool_->number_of_lanes ();
+       ++i)
+    profile_count +=
+      lanes[i]->resources ().acceptor_registry ().endpoint_count ();
+
+  return profile_count;
+}
+
+int
+TAO_RT_POA::lane_required (TAO_Thread_Lane *lane,
+                           TAO_PriorityBandedConnectionPolicy *priority_bands)
+{
+  if (priority_bands == 0)
+    return 1;
+
+  RTCORBA::PriorityBands &bands =
+    priority_bands->priority_bands_rep ();
+
+  for (CORBA::ULong i = 0;
+       i < bands.length ();
+       ++i)
     {
-      // Client propagated.
-      TAO_Server_Protocol_Acceptor_Filter filter (server_protocol->protocols_rep ());
-      data = this->orb_core_.create_stub_object (key,
-                                                 type_id,
-                                                 client_exposed_policies._retn (),
-                                                 &filter,
-                                                 ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      if (bands[i].low <= lane->lane_priority () &&
+          bands[i].high >= lane->lane_priority ())
+        return 1;
     }
 
-  return data;
+  return 0;
 }
 
 CORBA::PolicyList *
@@ -378,8 +527,8 @@ TAO_RT_POA::find_POA (const char *adapter_name,
 
 void
 TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
-              CORBA::Boolean wait_for_completion,
-              CORBA_Environment &ACE_TRY_ENV)
+                     CORBA::Boolean wait_for_completion,
+                     CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_POA::destroy (etherealize_objects,
@@ -393,7 +542,7 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
 
 PortableServer::ThreadPolicy_ptr
 TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                       CORBA_Environment &ACE_TRY_ENV)
+                                  CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
@@ -407,7 +556,7 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
 
 PortableServer::LifespanPolicy_ptr
 TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                           CORBA_Environment &ACE_TRY_ENV)
+                                    CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
@@ -419,7 +568,7 @@ TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
 
 PortableServer::IdUniquenessPolicy_ptr
 TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                    CORBA_Environment &ACE_TRY_ENV)
+                                         CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
@@ -432,12 +581,12 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue
 
 PortableServer::IdAssignmentPolicy_ptr
 TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                    CORBA_Environment &ACE_TRY_ENV)
+                                         CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
     this->TAO_POA::create_id_assignment_policy (value,
-                                               ACE_TRY_ENV);
+                                                ACE_TRY_ENV);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -447,7 +596,7 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV)
+                                               CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
@@ -459,7 +608,7 @@ TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivatio
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                            CORBA_Environment &ACE_TRY_ENV)
+                                             CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
@@ -472,7 +621,7 @@ TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPol
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                              CORBA_Environment &ACE_TRY_ENV)
+                                              CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
@@ -540,7 +689,7 @@ TAO_RT_POA::the_activator (CORBA_Environment &ACE_TRY_ENV)
 
 void
 TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                    CORBA_Environment &ACE_TRY_ENV)
+                           CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_POA::the_activator (adapter_activator,
@@ -561,7 +710,7 @@ TAO_RT_POA::get_servant_manager (CORBA_Environment &ACE_TRY_ENV)
 
 void
 TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                          CORBA_Environment &ACE_TRY_ENV)
+                                 CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -584,7 +733,7 @@ TAO_RT_POA::get_servant (CORBA_Environment &ACE_TRY_ENV)
 
 void
 TAO_RT_POA::set_servant (PortableServer::Servant servant,
-                  CORBA_Environment &ACE_TRY_ENV)
+                         CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -597,7 +746,7 @@ TAO_RT_POA::set_servant (PortableServer::Servant servant,
 
 PortableServer::ObjectId *
 TAO_RT_POA::activate_object (PortableServer::Servant p_servant,
-                                           CORBA_Environment &ACE_TRY_ENV)
+                             CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -611,8 +760,8 @@ TAO_RT_POA::activate_object (PortableServer::Servant p_servant,
 
 void
 TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                              PortableServer::Servant p_servant,
-                              CORBA_Environment &ACE_TRY_ENV)
+                                     PortableServer::Servant p_servant,
+                                     CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -626,7 +775,7 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
 
 void
 TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid,
-                        CORBA_Environment &ACE_TRY_ENV)
+                               CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -638,7 +787,7 @@ TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid,
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference (const char *intf,
-                                    CORBA_Environment &ACE_TRY_ENV)
+                              CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -651,8 +800,8 @@ TAO_RT_POA::create_reference (const char *intf,
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                            const char *intf,
-                                            CORBA_Environment &ACE_TRY_ENV)
+                                      const char *intf,
+                                      CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -666,7 +815,7 @@ TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
 
 PortableServer::ObjectId *
 TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant,
-                                         CORBA_Environment &ACE_TRY_ENV)
+                           CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -680,7 +829,7 @@ TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant,
 
 CORBA::Object_ptr
 TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant,
-                                        CORBA_Environment &ACE_TRY_ENV)
+                                  CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -695,7 +844,7 @@ TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant,
 
 PortableServer::Servant
 TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference,
-                                              CORBA_Environment &ACE_TRY_ENV)
+                                  CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -710,7 +859,7 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference,
 
 PortableServer::ObjectId *
 TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference,
-                                           CORBA_Environment &ACE_TRY_ENV)
+                             CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
@@ -724,7 +873,7 @@ TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference,
 
 PortableServer::Servant
 TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid,
-                                       CORBA_Environment &ACE_TRY_ENV)
+                           CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -738,7 +887,7 @@ TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid,
 
 CORBA::Object_ptr
 TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid,
-                                   CORBA_Environment &ACE_TRY_ENV)
+                             CORBA_Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -762,4 +911,3 @@ TAO_RT_POA::id (CORBA::Environment &ACE_TRY_ENV)
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 89654538476..ab523dd99e9 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -23,8 +23,10 @@
 
 #include "rtportableserver_export.h"
 #include "tao/PortableServer/POA.h"
-#include "tao/RTCORBA/RTCORBA.h"
-#include "RTPortableServer.h"
+
+#define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
+#include "RTPortableServerC.h"
+#undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -39,6 +41,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+class TAO_Thread_Pool;
+class TAO_Thread_Lane;
+class TAO_PriorityBandedConnectionPolicy;
+
 class TAO_RTPortableServer_Export TAO_RT_POA :
   public virtual RTPortableServer::POA,
   public virtual TAO_POA
@@ -262,6 +268,8 @@ public:
 
   virtual ~TAO_RT_POA (void);
 
+  void *thread_pool (void) const;
+
 protected:
 
   /// Template method for creating new POA's of this type.
@@ -280,8 +288,8 @@ protected:
                                    CORBA::Short priority,
                                    CORBA_Environment &ACE_TRY_ENV);
 
-  void valid_priority (RTCORBA::Priority priority,
-                       CORBA_Environment &ACE_TRY_ENV);
+  void validate_priority (RTCORBA::Priority priority,
+                          CORBA_Environment &ACE_TRY_ENV);
 
   void validate_policies (CORBA::Environment &ACE_TRY_ENV);
 
@@ -290,6 +298,20 @@ protected:
   void parse_rt_policies (TAO_POA_Policy_Set &policies,
                           CORBA::Environment &ACE_TRY_ENV);
 
+  size_t endpoint_count (void);
+
+  TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
+                                const char *type_id,
+                                CORBA::PolicyList *policy_list,
+                                TAO_Acceptor_Filter *filter,
+                                TAO_PriorityBandedConnectionPolicy *priority_bands,
+                                CORBA::Environment &ACE_TRY_ENV);
+
+  int lane_required (TAO_Thread_Lane *lane,
+                     TAO_PriorityBandedConnectionPolicy *priority_bands);
+
+  TAO_Thread_Pool *thread_pool_;
+
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
index c45f4cd0db7..71c05db66dc 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -6,8 +6,8 @@
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_priority (const char * intf,
-                                         RTCORBA::Priority priority,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                            RTCORBA::Priority priority,
+                                            CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -15,7 +15,7 @@ TAO_RT_POA::create_reference_with_priority (const char * intf,
   this->validate_policies (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  this->valid_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority, ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Lock access for the duration of this transaction.
@@ -28,9 +28,9 @@ TAO_RT_POA::create_reference_with_priority (const char * intf,
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
-                                                const char * intf,
-                                                RTCORBA::Priority priority,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                   const char * intf,
+                                                   RTCORBA::Priority priority,
+                                                   CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -38,7 +38,7 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
   this->validate_policies (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  this->valid_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority, ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Lock access for the duration of this transaction.
@@ -52,8 +52,8 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
-                                        RTCORBA::Priority priority,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                           RTCORBA::Priority priority,
+                                           CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -62,7 +62,7 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
   this->validate_policies (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  this->valid_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   // Lock access for the duration of this transaction.
@@ -75,9 +75,9 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
 
 ACE_INLINE void
 TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
-                                               PortableServer::Servant servant,
-                                               RTCORBA::Priority priority,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                                  PortableServer::Servant servant,
+                                                  RTCORBA::Priority priority,
+                                                  CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -87,7 +87,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
   this->validate_policies (ACE_TRY_ENV);
   ACE_CHECK;
 
-  this->valid_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority, ACE_TRY_ENV);
   ACE_CHECK;
 
   // Lock access for the duration of this transaction.
@@ -99,3 +99,8 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
                                    ACE_TRY_ENV);
 }
 
+ACE_INLINE void *
+TAO_RT_POA::thread_pool (void) const
+{
+  return this->thread_pool_;
+}
diff --git a/TAO/tao/RTPortableServer/RT_POA_Initializer.cpp b/TAO/tao/RTPortableServer/RT_POA_Initializer.cpp
deleted file mode 100644
index d2b0c9bcfa2..00000000000
--- a/TAO/tao/RTPortableServer/RT_POA_Initializer.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-
-#include "RT_POA_Initializer.h"
-#include "RT_Servant_Dispatcher.h"
-#include "RT_Policy_Validator.h"
-
-#include "tao/PortableServer/Object_Adapter.h"
-
-#include "tao/ORB_Core.h"
-
-ACE_RCSID(tao, RT_POA_Initializer, "$Id$")
-
-TAO_RT_POA_Initializer::~TAO_RT_POA_Initializer (void)
-{
-}
-
-void
-TAO_RT_POA_Initializer::register_hooks_impl (TAO_Object_Adapter &object_adapter,
-                                             CORBA::Environment &ACE_TRY_ENV)
-{
-  // Create and register the RT servant dispatcher.
-  TAO_RT_Servant_Dispatcher *rt_servant_dispatcher;
-  ACE_NEW (rt_servant_dispatcher,
-           TAO_RT_Servant_Dispatcher);
-  object_adapter.servant_dispatcher (rt_servant_dispatcher);
-
-  // Create and add the RT policy validator.
-  TAO_POA_RT_Policy_Validator *rt_validator;
-  ACE_NEW (rt_validator,
-           TAO_POA_RT_Policy_Validator (&object_adapter.orb_core ()));
-
-  object_adapter.validator ().add_validator (rt_validator);
-
-  // Add the default RT policies to the list of default POA policies.
-  this->init_rt_default_policies (object_adapter.default_poa_policies (),
-                                  object_adapter.orb_core (),
-                                  ACE_TRY_ENV);
-
-}
-
-void
-TAO_RT_POA_Initializer::init_rt_default_policies (TAO_POA_Policy_Set &policies,
-                                                  TAO_ORB_Core &orb_core,
-                                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Policy_var policy =
-    orb_core.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
-  if (!CORBA::is_nil (policy.in ()))
-    {
-      policies.merge_policy (policy.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  CORBA::Policy_var protocol =
-    orb_core.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
-  if (!CORBA::is_nil (protocol.in ()))
-    {
-      policies.merge_policy (protocol.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
diff --git a/TAO/tao/RTPortableServer/RT_POA_Initializer.h b/TAO/tao/RTPortableServer/RT_POA_Initializer.h
deleted file mode 100644
index 1a48039fa0b..00000000000
--- a/TAO/tao/RTPortableServer/RT_POA_Initializer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   RT_POA_Initializer.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- *  @author Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_RT_POA_INITIALIZER_H
-#define TAO_RT_POA_INITIALIZER_H
-#include "ace/pre.h"
-
-#include "rtportableserver_export.h"
-#include "tao/POA_Extension_Initializer.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declarations.
-class TAO_POA_Policy_Set;
-class TAO_ORB_Core;
-
-class TAO_RTPortableServer_Export TAO_RT_POA_Initializer
-  : public TAO_POA_Extension_Initializer
-{
-public:
-  /// Destructor.
-  virtual ~TAO_RT_POA_Initializer (void);
-
-protected:
-
-  virtual void register_hooks_impl (TAO_Object_Adapter &object_adapter,
-                                    CORBA::Environment &ACE_TRY_ENV);
-
-  void init_rt_default_policies (TAO_POA_Policy_Set &policies,
-                                 TAO_ORB_Core &orb_core,
-                                 CORBA::Environment &ACE_TRY_ENV);
-};
-
-#include "ace/post.h"
-#endif /* TAO_RT_POA_INITIALIZER_H */
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index f962b9727bf..23115845489 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -4,12 +4,19 @@
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/RT_Policy_i.h"
+#include "tao/RTCORBA/Thread_Pool.h"
+#include "tao/RTCORBA/RT_ORB.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/Acceptor_Registry.h"
+#include "tao/PortableServer/POA_Cached_Policies.h"
 
 ACE_RCSID(tao, POA, "$Id$")
 
-TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
+TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core)
+  : TAO_POA_Policy_Validator (orb_core),
+    acceptor_registry_ (0),
+    thread_pool_ (0)
 {
   // No-Op.
 }
@@ -19,11 +26,24 @@ TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void)
   // No-Op.
 }
 
+TAO_Acceptor_Registry *
+TAO_POA_RT_Policy_Validator::acceptor_registry (void)
+{
+  if (this->acceptor_registry_ == 0)
+    this->acceptor_registry_ =
+      TAO_POA_RT_Policy_Validator::extract_acceptor_registry (this->orb_core_,
+                                                              this->thread_pool_);
+  return this->acceptor_registry_;
+}
+
 void
 TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
                                             CORBA::Environment &ACE_TRY_ENV)
 {
-  this->orb_core_->open (ACE_TRY_ENV);
+  this->validate_thread_pool (policies, ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->validate_lifespan (policies, ACE_TRY_ENV);
   ACE_CHECK;
 
   this->validate_server_protocol (policies, ACE_TRY_ENV);
@@ -31,13 +51,13 @@ TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
 
   this->validate_priorities (policies, ACE_TRY_ENV);
   ACE_CHECK;
-
 }
 
 CORBA::Boolean
 TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 {
   return (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
+          type == RTCORBA::THREADPOOL_POLICY_TYPE ||
           type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE ||
           type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE ||
           type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE);
@@ -65,28 +85,39 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies,
   RTCORBA::ProtocolList &protocols =
     server_protocol->protocols_rep ();
 
-  TAO_Acceptor_Registry *ar = this->orb_core_->acceptor_registry ();
+  TAO_Acceptor_Registry *acceptor_registry =
+    this->acceptor_registry ();
 
   for (CORBA::ULong j = 0; j < protocols.length (); ++j)
     {
+      int found = 0;
       CORBA::ULong protocol_type = protocols[j].protocol_type;
-      for (TAO_AcceptorSetIterator a = ar->begin (); a != ar->end (); ++a)
+      for (TAO_AcceptorSetIterator a = acceptor_registry->begin ();
+           a != acceptor_registry->end ();
+           ++a)
         {
           if ((*a)->tag () == protocol_type)
-            return;
+            {
+              found = 1;
+              break;
+            }
         }
+
+      if (!found)
+        ACE_THROW (PortableServer::POA::InvalidPolicy ());
     }
 
-  ACE_THROW (PortableServer::POA::InvalidPolicy ());
 }
 
 void
 TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                                  CORBA::Environment &ACE_TRY_ENV)
 {
   // Initialize to the default priority/priority model.
-  RTCORBA::Priority priority = TAO_INVALID_PRIORITY;
-  RTCORBA::PriorityModel rt_priority_model = RTCORBA::CLIENT_PROPAGATED;
+  CORBA::Short priority =
+    TAO_INVALID_PRIORITY;
+  TAO_POA_Cached_Policies::PriorityModel rt_priority_model =
+    TAO_POA_Cached_Policies::NOT_SPECIFIED;
 
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
@@ -101,12 +132,22 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
       priority = priority_model->server_priority (ACE_TRY_ENV);
       ACE_CHECK;
 
-      rt_priority_model = priority_model->priority_model (ACE_TRY_ENV);
+      rt_priority_model =
+        TAO_POA_Cached_Policies::PriorityModel (
+          priority_model->priority_model (ACE_TRY_ENV));
       ACE_CHECK;
 
       // Check that the priority is in bounds.
-      if (priority < RTCORBA::minPriority
-          || priority > RTCORBA::maxPriority)
+      if (priority < RTCORBA::minPriority ||
+          priority > RTCORBA::maxPriority)
+        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+    }
+  else
+    // If priority model was not specified, then we better not have a
+    // thread pool with lanes.
+    {
+      if (this->thread_pool_ != 0 &&
+          this->thread_pool_->with_lanes ())
         ACE_THROW (PortableServer::POA::InvalidPolicy ());
     }
 
@@ -123,30 +164,49 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
                       priority_bands.in ());
 
   // If priority banded connections are set, make sure that:
-  //  0. There is at least one band.
-  //  1. Priority model is also set.
-  //  2. If priority model is SERVER_DECLARED, server_priority must
-  //     match one of the bands.
-  //  3. For each band, there must be at least one endpoint that can
-  //     service it, i.e., whose priority falls into the band's range.
+  //  0. A priority model was specified.
+  //  1. There is at least one band.
+  //  2a. low is not < RTCORBA::minPriority
+  //  2b. low <= high
+  //  2c. high is not > RTCORBA::maxPriority
+  //  3. If priority model is SERVER_DECLARED, server_priority must
+  //  match one of the bands.
+  //  4. If this POA has a thread pool with lanes, then for each band,
+  //  there must be at least one thread lane that can service it,
+  //  i.e., whose priority falls into the band's range.
   if (bands_policy != 0)
     {
+      // Checks 0.
+      if (rt_priority_model == TAO_POA_Cached_Policies::NOT_SPECIFIED)
+        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+
       RTCORBA::PriorityBands &bands =
         bands_policy->priority_bands_rep ();
 
-      // Checks 0 and 1.
-      if (bands.length () == 0
-          || priority == TAO_INVALID_PRIORITY)
+      // Checks 1.
+      if (bands.length () == 0)
         ACE_THROW (PortableServer::POA::InvalidPolicy ());
 
-      // Check 2.
-      if (rt_priority_model == RTCORBA::SERVER_DECLARED)
+      // Checks 2.
+      for (CORBA::ULong i = 0; i < bands.length (); ++i)
+        {
+          //  2a. low is not < RTCORBA::minPriority
+          //  2b. low is not > high
+          //  2c. high is not > RTCORBA::maxPriority
+          if (bands[i].low < RTCORBA::minPriority ||
+              bands[i].low > bands[i].high ||
+              bands[i].high > RTCORBA::maxPriority)
+            ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        }
+
+      // Check 3.
+      if (rt_priority_model == TAO_POA_Cached_Policies::SERVER_DECLARED)
         {
           int match = 0;
           for (CORBA::ULong i = 0; i < bands.length (); ++i)
             {
-              if (priority <= bands[i].high
-                  && priority >= bands[i].low)
+              if (priority <= bands[i].high &&
+                  priority >= bands[i].low)
                 {
                   match = 1;
                   break;
@@ -157,21 +217,38 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
             ACE_THROW (PortableServer::POA::InvalidPolicy ());
         }
 
-      // Check 3.
-      TAO_Acceptor_Registry *ar = this->orb_core_->acceptor_registry ();
-      for (CORBA::ULong i = 0; i < bands.length (); ++i)
+      //
+      // Check 4.
+      //
+
+      // If this POA is using the default thread pool (which doesn't
+      // have lanes) or a thread pool without lanes, we are done with
+      // the checks.
+      if (this->thread_pool_ == 0 ||
+          !this->thread_pool_->with_lanes ())
+        return;
+
+      // If this POA is using a thread pool with lanes, make sure we
+      // have at least one thread lane that corresponds to these
+      // each band.
+      TAO_Thread_Lane **lanes =
+        this->thread_pool_->lanes ();
+
+      for (CORBA::ULong band = 0;
+           band < bands.length ();
+           ++band)
         {
           int match = 0;
-          for (TAO_AcceptorSetIterator a = ar->begin ();
-               a != ar->end ();
-               ++a)
+          for (CORBA::ULong lane = 0;
+               lane != this->thread_pool_->number_of_lanes () && !match;
+               ++lane)
             {
-              if ((*a)->priority () <= bands[i].high
-                  && (*a)->priority () >= bands[i].low)
-                {
-                  match = 1;
-                  break;
-                }
+              CORBA::Short lane_priority =
+                lanes[lane]->lane_priority ();
+
+              if (lane_priority <= bands[band].high &&
+                  lane_priority >= bands[band].low)
+                match = 1;
             }
           if (!match)
             ACE_THROW (PortableServer::POA::InvalidPolicy ());
@@ -182,19 +259,229 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
     }
 
   // If priority banded connections are not set, and the priority
-  // model is SERVER_DECLARED, make sure we have at least one endpoint
-  // that can provide service for the specified SERVER_DECLARED
+  // model is SERVER_DECLARED, make sure we have at least one thread
+  // lane that can provide service for the specified SERVER_DECLARED
   // priority.
-  if (rt_priority_model == RTCORBA::SERVER_DECLARED)
+  if (rt_priority_model == TAO_POA_Cached_Policies::SERVER_DECLARED)
+    {
+      // If this POA is using the default thread pool (which doesn't
+      // have lanes) or a thread pool without lanes, we are done with
+      // the checks.
+      if (this->thread_pool_ == 0 ||
+          !this->thread_pool_->with_lanes ())
+        return;
+
+      // If this POA is using a thread pool with lanes, make sure we
+      // have at least one thread lane that can provide service for
+      // the specified SERVER_DECLARED priority.
+      TAO_Thread_Lane **lanes =
+        this->thread_pool_->lanes ();
+
+      int match = 0;
+      for (CORBA::ULong lane = 0;
+           lane != this->thread_pool_->number_of_lanes () && !match;
+           ++lane)
+        {
+          CORBA::Short lane_priority =
+            lanes[lane]->lane_priority ();
+
+          if (lane_priority <= priority &&
+              lane_priority >= priority)
+            match = 1;
+        }
+      if (!match)
+        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+
+      // Done with checks.
+      return;
+    }
+
+}
+
+void
+TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies,
+                                                   CORBA::Environment &ACE_TRY_ENV)
+{
+  this->thread_pool_ =
+    TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
+                                                      policies,
+                                                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies,
+                                                CORBA::Environment &ACE_TRY_ENV)
+{
+  // If this POA is using a RTCORBA thread pool, make sure the
+  // lifespan policy is not persistent since we cannot support it
+  // right now.
+  if (this->thread_pool_ != 0)
+    {
+      CORBA::Policy_var policy =
+        policies.get_cached_policy (TAO_CACHED_POLICY_LIFESPAN);
+      PortableServer::LifespanPolicy_var lifespan_policy =
+        PortableServer::LifespanPolicy::_narrow (policy.in (),
+                                                 ACE_TRY_ENV);
+      ACE_CHECK;
+
+      PortableServer::LifespanPolicyValue lifespan =
+        lifespan_policy->value (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      if (lifespan == PortableServer::PERSISTENT)
+        {
+          ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        }
+    }
+}
+
+void
+TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies,
+                                                  CORBA::Environment &ACE_TRY_ENV)
+{
+  // Check if the user has specified the priority model policy.
+  CORBA::Policy_var priority_model =
+    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+
+  if (CORBA::is_nil (priority_model.in ()))
     {
-      TAO_Acceptor_Registry *ar = this->orb_core_->acceptor_registry ();
+      // If not, check if the priority model policy has been specified
+      // at the ORB level.
+      priority_model =
+        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+      if (!CORBA::is_nil (priority_model.in ()))
+        {
+          // If so, we'll use that policy.
+          policies.set_policy (priority_model.in (), ACE_TRY_ENV);
+          ACE_CHECK;
+        }
+    }
+
+  // Check if the user has specified the server protocol policy.
+  CORBA::Policy_var server_protocol =
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+
+  if (CORBA::is_nil (server_protocol.in ()))
+    {
+      // If not, check if the server protocol policy has been
+      // specified at the ORB level.
+      server_protocol =
+        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+      if (!CORBA::is_nil (server_protocol.in ()))
+        {
+          // If so, we'll use that policy.
+          policies.set_policy (server_protocol.in (), ACE_TRY_ENV);
+          ACE_CHECK;
+        }
+    }
+
+  // Check if the user has specified the thread pool policy.
+  CORBA::Policy_var thread_pool =
+    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
 
-      for (TAO_AcceptorSetIterator a = ar->begin (); a != ar->end (); ++a)
+  if (CORBA::is_nil (thread_pool.in ()))
+    {
+      // If not, check if the thread pool policy has been specified at
+      // the ORB level.
+      thread_pool =
+        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
+      if (!CORBA::is_nil (thread_pool.in ()))
         {
-          if ((*a)->priority () == priority)
-            return;
+          // If so, we'll use that policy.
+          policies.set_policy (thread_pool.in (), ACE_TRY_ENV);
+          ACE_CHECK;
         }
+    }
+}
 
-      ACE_THROW (CORBA::BAD_PARAM ());
+/* static */
+TAO_Thread_Pool *
+TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
+                                                  TAO_Policy_Set &policies,
+                                                  CORBA::Environment &ACE_TRY_ENV)
+{
+  CORBA::Policy_var policy =
+    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
+
+  RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
+    RTCORBA::ThreadpoolPolicy::_narrow (policy.in (),
+                                        ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  if (CORBA::is_nil (thread_pool_policy.in ()))
+    return 0;
+
+  RTCORBA::ThreadpoolId thread_pool_id =
+    thread_pool_policy->threadpool (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  // Get the RTORB.
+  CORBA::Object_var object =
+    orb_core.resolve_rt_orb (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  RTCORBA::RTORB_var rt_orb =
+    RTCORBA::RTORB::_narrow (object.in (),
+                             ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  TAO_RT_ORB *tao_rt_orb =
+    ACE_dynamic_cast (TAO_RT_ORB *,
+                      rt_orb.in ());
+
+  TAO_Thread_Pool_Manager &tp_manager =
+    tao_rt_orb->tp_manager ();
+
+  TAO_Thread_Pool_Manager::THREAD_POOLS &thread_pools =
+    tp_manager.thread_pools ();
+
+  // Check that the thread pool id is valid.
+  TAO_Thread_Pool *thread_pool = 0;
+  int result =
+    thread_pools.find (thread_pool_id,
+                       thread_pool);
+
+  if (result != 0)
+    ACE_THROW_RETURN (PortableServer::POA::InvalidPolicy (),
+                      0);
+
+  return thread_pool;
+}
+
+/* static */
+TAO_Acceptor_Registry *
+TAO_POA_RT_Policy_Validator::extract_acceptor_registry (TAO_ORB_Core &orb_core,
+                                                        TAO_Thread_Pool *thread_pool)
+{
+  TAO_Acceptor_Registry *acceptor_registry = 0;
+
+  // If <thread_pool_> != 0, it means that we have a RT thread pool.
+  if (thread_pool)
+    {
+      TAO_Thread_Lane **lanes =
+        thread_pool->lanes ();
+
+      // All the lanes have similar acceptor registries.  Therefore,
+      // looking at the first lane should suffice.
+      TAO_Thread_Lane_Resources &resources =
+        lanes[0]->resources ();
+
+      acceptor_registry =
+        &resources.acceptor_registry ();
+    }
+  else
+    // We are dealing with the default thread pool.
+    {
+      TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
+        orb_core.thread_lane_resources_manager ();
+
+      TAO_Thread_Lane_Resources &resources =
+        thread_lane_resources_manager.default_lane_resources ();
+
+      acceptor_registry =
+        &resources.acceptor_registry ();
     }
+
+  return acceptor_registry;
 }
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 613b400221b..1c6b6148b66 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -25,17 +25,26 @@
 #include "tao/PortableServer/Policy_Validator.h"
 
 class TAO_ORB_Core;
+class TAO_Acceptor_Registry;
+class TAO_Thread_Pool;
 
 class TAO_RTPortableServer_Export TAO_POA_RT_Policy_Validator
   : public TAO_POA_Policy_Validator
 {
 public:
   /// Constructor.
-  TAO_POA_RT_Policy_Validator (TAO_ORB_Core *orb_core);
+  TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core);
 
   /// Destructor.
   ~TAO_POA_RT_Policy_Validator (void);
 
+  static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
+                                               TAO_Policy_Set &policies,
+                                               CORBA::Environment &ACE_TRY_ENV);
+
+  static TAO_Acceptor_Registry *extract_acceptor_registry (TAO_ORB_Core &orb_core,
+                                                           TAO_Thread_Pool *thread_pool);
+
 protected:
 
   /**
@@ -43,8 +52,12 @@ protected:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  virtual void validate_impl (TAO_Policy_Set &policies,
-                              CORBA::Environment &ACE_TRY_ENV);
+  void validate_impl (TAO_Policy_Set &policies,
+                      CORBA::Environment &ACE_TRY_ENV);
+
+  /// Add/merge policies.
+  void merge_policies_impl (TAO_Policy_Set &policies,
+                            CORBA::Environment &ACE_TRY_ENV);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -61,12 +74,19 @@ private:
   void validate_priorities (TAO_Policy_Set &policies,
                             CORBA::Environment &ACE_TRY_ENV);
 
+  void validate_thread_pool (TAO_Policy_Set &policies,
+                             CORBA::Environment &ACE_TRY_ENV);
+
+  void validate_lifespan (TAO_Policy_Set &policies,
+                          CORBA::Environment &ACE_TRY_ENV);
+
+  TAO_Acceptor_Registry *acceptor_registry (void);
+
+  TAO_Acceptor_Registry *acceptor_registry_;
+
+  TAO_Thread_Pool *thread_pool_;
 
-private:
-  TAO_ORB_Core *orb_core_;
 };
 
 #include "ace/post.h"
 #endif /* TAO_RT_POLICY_VALIDATOR_H_ */
-
-
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index abe4b603481..362d6b1be03 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -2,6 +2,7 @@
 
 #include "RT_Servant_Dispatcher.h"
 #include "RT_POA.h"
+#include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/Service_Context.h"
@@ -9,35 +10,34 @@
 
 ACE_RCSID(tao, Default_Acceptor_Filter, "$Id$")
 
-RT_Priority_Model_Processing::RT_Priority_Model_Processing (TAO_POA &poa)
+RT_Priority_Model_Processing::RT_Priority_Model_Processing (TAO_POA &poa,
+                                                            CORBA::Short servant_priority)
   : state_ (NO_ACTION_REQUIRED),
     poa_ (poa),
     original_native_priority_ (0),
-    original_CORBA_priority_ (0)
+    original_CORBA_priority_ (0),
+    servant_priority_ (servant_priority)
 {
 }
 
 RT_Priority_Model_Processing::~RT_Priority_Model_Processing (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
   if (this->state_ == PRIORITY_RESET_REQUIRED)
     {
-      this->state_ = NO_ACTION_REQUIRED;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
-      // Reset the priority of the current thread back to its original
-      // value.
-      TAO_Protocols_Hooks *tph = poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (tph->set_thread_native_priority (this->original_native_priority_,
-                                           ACE_TRY_ENV)
-          == -1)
-        // At this point we cannot throw an exception.  Just log the
-        // error.
-        ACE_DEBUG ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - Priority_Model_Processing:: ")
-                    ACE_TEXT (" Priority_Model_Processing\n")));
+      ACE_TRY
+        {
+          this->post_invoke (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          // Eat up the exception.
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Exception caught: TAO (%P|%t) - Priority_Model_Processing::~Priority_Model_Processing");
+        }
+      ACE_ENDTRY;
     }
 }
 
@@ -47,26 +47,73 @@ RT_Priority_Model_Processing::pre_invoke (
    TAO_Service_Context &reply_service_context,
    CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_POA_Cached_Policies &cached_policies = this->poa_.cached_policies ();
+  TAO_Thread_Pool *thread_pool =
+    (TAO_Thread_Pool *) this->poa_.thread_pool ();
 
-  // CLIENT_PROPAGATED PriorityModel processing.
-  if (cached_policies.priority_model () == TAO_POA_Cached_Policies::CLIENT_PROPAGATED
-      && cached_policies.server_priority () != TAO_INVALID_PRIORITY)
+  if (thread_pool != 0 &&
+      thread_pool->with_lanes ())
     {
-      // Remember current thread's priority.
-      TAO_Protocols_Hooks *tph = poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
-      ACE_CHECK;
+      //
+      // We don't mess with the priority of threads in lanes.
+      //
 
-      if (tph->get_thread_CORBA_and_native_priority (this->original_CORBA_priority_,
-                                                     this->original_native_priority_,
-                                                     ACE_TRY_ENV)
-          == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (1,
-                                           CORBA::COMPLETED_NO));
+      if (TAO_debug_level > 0)
+        {
+          // Get the ORB_Core's TSS resources.
+          TAO_ORB_Core_TSS_Resources *tss =
+            this->poa_.orb_core ().get_tss_resources ();
+
+          /// Get the lane attribute in TSS.
+          TAO_Thread_Lane *lane =
+            (TAO_Thread_Lane *) tss->lane_;
+
+          ACE_ASSERT (lane->pool ().id () ==
+                      thread_pool->id ());
+
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("Using thread pool with lane ")
+                      ACE_TEXT ("(%P|%t|%d|%d): original thread CORBA/native priority %d/%d not changed\n"),
+                      lane->pool ().id (),
+                      lane->id (),
+                      lane->lane_priority (),
+                      lane->native_priority ()));
+        }
+
+      return;
+    }
+
+  // Remember current thread's priority.
+  TAO_Protocols_Hooks *tph =
+    this->poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  if (tph->get_thread_CORBA_and_native_priority (this->original_CORBA_priority_,
+                                                 this->original_native_priority_,
+                                                 ACE_TRY_ENV)
+      == -1)
+    ACE_THROW (CORBA::DATA_CONVERSION (1,
+                                       CORBA::COMPLETED_NO));
+
+  const char *priority_model;
+  RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
+  TAO_POA_Cached_Policies &cached_policies =
+    this->poa_.cached_policies ();
+
+  // NOT_SPECIFIED PriorityModel processing.
+  if (cached_policies.priority_model () ==
+      TAO_POA_Cached_Policies::NOT_SPECIFIED)
+    {
+      priority_model = "RTCORBA::NOT_SPECIFIED";
+    }
+
+  // CLIENT_PROPAGATED PriorityModel processing.
+  else if (cached_policies.priority_model () ==
+      TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+    {
+      priority_model = "RTCORBA::CLIENT_PROPAGATED";
 
       // Attempt to extract client-propagated priority from the
-      //  ServiceContextList of the request.
-      RTCORBA::Priority target_priority;
+      // ServiceContextList of the request.
       const IOP::ServiceContext *context;
 
       if (request_service_context.get_context (IOP::RTCorbaPriority,
@@ -92,38 +139,92 @@ RT_Priority_Model_Processing::pre_invoke (
         }
       else
         {
-          // Use default priority if none came in the request.  (Request
-          // must have come from a non-RT ORB.)
+          // Use default priority if none came in the request.
+          // (Request must have come from a non-RT ORB.)
           target_priority = cached_policies.server_priority ();
         }
+    }
+  else
+    // SERVER_DECLARED PriorityModel processing.
+    {
+      priority_model = "RTCORBA::SERVER_DECLARED";
+
+      // Use the request associated with the servant.
+      target_priority = this->servant_priority_;
+    }
+
+  char thread_pool_id[BUFSIZ];
+  if (TAO_debug_level > 0)
+    {
+      if (thread_pool == 0)
+        ACE_OS::strcpy (thread_pool_id,
+                        "default thread pool");
+      else
+        ACE_OS::sprintf (thread_pool_id,
+                         "thread pool %d",
+                         thread_pool->id ());
+    }
+
+  // Change the priority of the current thread for the duration of
+  // request.
+  if (target_priority != TAO_INVALID_PRIORITY &&
+      target_priority != this->original_CORBA_priority_)
+    {
+      if (tph->set_thread_CORBA_priority (target_priority,
+                                          ACE_TRY_ENV)
+          == -1)
+        ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
+
+      this->state_ = PRIORITY_RESET_REQUIRED;
 
-      // Change the priority of the current thread to the
-      // client-propagated value for the duration of
-      // request.
-      if (this->original_CORBA_priority_ != target_priority)
+      if (TAO_debug_level > 0)
+        {
+          CORBA::Short native_priority;
+          tph->get_thread_native_priority (native_priority,
+                                           ACE_TRY_ENV);
+
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("%s processing using %s ")
+                      ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
+                      ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"),
+                      priority_model,
+                      thread_pool_id,
+                      this->original_CORBA_priority_,
+                      this->original_native_priority_,
+                      target_priority,
+                      native_priority));
+        }
+    }
+  // No change in priority required.
+  else if (target_priority != TAO_INVALID_PRIORITY &&
+           target_priority == this->original_CORBA_priority_)
+    {
+      if (TAO_debug_level > 0)
         {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("RTCORBA::CLIENT_PROPAGATED processing")
-                        ACE_TEXT (" (%P|%t): original thread CORBA/native priority %d/%d;")
-                        ACE_TEXT (" temporarily changed to CORBA priority %d\n"),
-                        this->original_CORBA_priority_,
-                        this->original_native_priority_,
-                        target_priority));
-
-          if (tph->set_thread_CORBA_priority (target_priority,
-                                              ACE_TRY_ENV)
-              == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
-
-          this->state_ = PRIORITY_RESET_REQUIRED;
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("%s processing using %s ")
+                      ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
+                      ACE_TEXT ("is the same as the target priority\n"),
+                      priority_model,
+                      thread_pool_id,
+                      this->original_CORBA_priority_,
+                      this->original_native_priority_));
+        }
+    }
+  // Target priority is invalid.
+  else
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("%s processing using %s ")
+                      ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
+                      ACE_TEXT ("not changed\n"),
+                      priority_model,
+                      thread_pool_id,
+                      this->original_CORBA_priority_,
+                      this->original_native_priority_));
         }
-      else if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("RTCORBA::CLIENT_PROPAGATED processing")
-                    ACE_TEXT (" (%P|%t): original thread priority =")
-                    ACE_TEXT (" requested priority = %d\n"),
-                    target_priority));
     }
 }
 
@@ -137,7 +238,8 @@ RT_Priority_Model_Processing::post_invoke (
 
       // Reset the priority of the current thread back to its original
       // value.
-      TAO_Protocols_Hooks *tph = poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
+      TAO_Protocols_Hooks *tph =
+        this->poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
       ACE_CHECK;
 
       if (tph->set_thread_native_priority (this->original_native_priority_,
@@ -159,11 +261,11 @@ TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant
                                      CORBA::Environment &ACE_TRY_ENV)
 {
   // RTCORBA PriorityModelPolicy processing (may need to be
-  // moved/adjusted when POA threadpools are added).
-  // This is the earliest place we can do the processing, since only
-  // at this point we know the target POA.
-
-  RT_Priority_Model_Processing priority_processing (servant_upcall.poa ());
+  // moved/adjusted when POA threadpools are added).  This is the
+  // earliest place we can do the processing, since only at this point
+  // we know the target POA.
+  RT_Priority_Model_Processing priority_processing (servant_upcall.poa (),
+                                                    servant_upcall.priority ());
 
   // Set thread's priority.
   priority_processing.pre_invoke (req.request_service_context (),
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index c95dfde5e00..9d8c758122a 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -17,7 +17,10 @@
 
 #include "rtportableserver_export.h"
 #include "tao/PortableServer/Servant_Dispatcher.h"
-#include "tao/RTCORBA/RTCORBA.h"
+
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "tao/RTCORBA/RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -76,7 +79,8 @@ class TAO_RTPortableServer_Export RT_Priority_Model_Processing
 public:
 
   // Constructor.
-  RT_Priority_Model_Processing (TAO_POA &poa);
+  RT_Priority_Model_Processing (TAO_POA &poa,
+                                CORBA::Short servant_priority);
 
   // Resets the priority of the current thread back to its original
   // value if necessary, i.e., if it was changed and the
@@ -119,6 +123,9 @@ private:
 
   // Original CORBA priority of the thread.
   RTCORBA::Priority original_CORBA_priority_;
+
+  // Servant Priority.
+  CORBA::Short servant_priority_;
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp
index 0e482ff801a..c2a57e6fb9c 100644
--- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp
+++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServer.dll" /libpath:"..\\" /libpath:"..\PortableServer" /libpath:"..\RTCORBA" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServer.dll" /libpath:"..\\" /libpath:"..\..\..\ace" /libpath:"..\PortableServer" /libpath:"..\RTCORBA"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "RTPortableServer - Win32 Debug"

@@ -84,7 +84,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA"

 

 !ELSEIF  "$(CFG)" == "RTPortableServer - Win32 MFC Debug"

 

@@ -113,7 +113,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTPORTABLESERVERd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAO_RTCORBAmfcd.lib TAOmfcd.lib acemfcd.lib TAO_PortableServermfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServermfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao\RTCORBA"

+# ADD LINK32 TAO_RTCORBAmfcd.lib TAOmfcd.lib acemfcd.lib TAO_PortableServermfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServermfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "RTPortableServer - Win32 MFC Release"

 

@@ -142,7 +142,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTPORTABLESERVER.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAO_RTCORBAmfc.lib TAOmfc.lib acemfc.lib TAO_PortableServermfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServermfc.dll" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao\RTCORBA"

+# ADD LINK32 TAO_RTCORBAmfc.lib TAOmfc.lib acemfc.lib TAO_PortableServermfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTPortableServermfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\PortableServer"

 

 !ENDIF 

 

@@ -161,15 +161,15 @@ SOURCE=.\RT_Acceptor_Filters.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_Object_Adapter_Factory.cpp

+SOURCE=.\RT_Collocation_Resolver.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA.cpp

+SOURCE=.\RT_Object_Adapter_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA_Initializer.cpp

+SOURCE=.\RT_POA.cpp

 # End Source File

 # Begin Source File

 

@@ -197,15 +197,15 @@ SOURCE=.\RT_Acceptor_Filters.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_Object_Adapter_Factory.h

+SOURCE=.\RT_Collocation_Resolver.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA.h

+SOURCE=.\RT_Object_Adapter_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA_Initializer.h

+SOURCE=.\RT_POA.h

 # End Source File

 # Begin Source File

 

@@ -237,6 +237,10 @@ SOURCE=.\RT_Acceptor_Filters.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Collocation_Resolver.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\RT_POA.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp b/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp
index c8dfedf2c79..950e2bb9efa 100644
--- a/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp
+++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp
@@ -99,6 +99,10 @@ SOURCE=.\RT_Acceptor_Filters.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Collocation_Resolver.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\RT_POA.i

 # End Source File

 # Begin Source File

@@ -115,15 +119,15 @@ SOURCE=.\RT_Acceptor_Filters.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_Object_Adapter_Factory.h

+SOURCE=.\RT_Collocation_Resolver.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA.h

+SOURCE=.\RT_Object_Adapter_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA_Initializer.h

+SOURCE=.\RT_POA.h

 # End Source File

 # Begin Source File

 

@@ -155,15 +159,15 @@ SOURCE=.\RT_Acceptor_Filters.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_Object_Adapter_Factory.cpp

+SOURCE=.\RT_Collocation_Resolver.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA.cpp

+SOURCE=.\RT_Object_Adapter_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\RT_POA_Initializer.cpp

+SOURCE=.\RT_POA.cpp

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/Reactor_Registry.cpp b/TAO/tao/Reactor_Registry.cpp
deleted file mode 100644
index f707ca1e1bf..00000000000
--- a/TAO/tao/Reactor_Registry.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#include "tao/Reactor_Registry.h"
-#include "tao/ORB_Core.h"
-#include "tao/Leader_Follower.h"
-#include "tao/LF_Strategy.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Reactor_Registry.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Reactor_Registry, "$Id$")
-
-TAO_Reactor_Registry::TAO_Reactor_Registry (void)
-  :  orb_core_ (0)
-  ,  lf_strategy_ (0)
-{
-}
-
-void
-TAO_Reactor_Registry::open (TAO_ORB_Core* orb_core)
-{
-  this->orb_core_ = orb_core;
-
-  this->lf_strategy_ = orb_core->resource_factory ()->create_lf_strategy ();
-}
-
-TAO_Reactor_Registry::~TAO_Reactor_Registry (void)
-{
-  delete this->lf_strategy_;
-}
-
-
-TAO_LF_Strategy &
-TAO_Reactor_Registry::lf_strategy (void)
-{
-  return *this->lf_strategy_;
-}
diff --git a/TAO/tao/Reactor_Registry.h b/TAO/tao/Reactor_Registry.h
deleted file mode 100644
index 3b877541b06..00000000000
--- a/TAO/tao/Reactor_Registry.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   Reactor_Registry.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_REACTOR_REGISTRY_H
-#define TAO_REACTOR_REGISTRY_H
-#include "ace/pre.h"
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-class TAO_Leader_Follower;
-class TAO_LF_Strategy;
-class TAO_Acceptor;
-class ACE_Reactor;
-
-/**
- * @class TAO_Reactor_Registry
- *
- * @brief The interface for the concurrency strategy.
- *
- * The ORB concurrency strategy is responsible for assigning
- * reactors to threads, keeping the relationship between threads
- * and their leader-follower groups and activating (if required)
- * the server-side Svc_Handlers.
- */
-class TAO_Export TAO_Reactor_Registry
-{
-public:
-  /// Default constructor
-  TAO_Reactor_Registry (void);
-
-  /// The destructor
-  virtual ~TAO_Reactor_Registry (void);
-
-  /// The ORB core for this concurrency strategy.
-  TAO_ORB_Core *orb_core (void) const;
-
-  /// Initialize the Reactor Registry
-  virtual void open (TAO_ORB_Core *orb_core);
-
-  /// Return the reactor for the current thread
-  virtual ACE_Reactor *reactor (void) = 0;
-
-  /// Return the reactor for a given acceptor
-  virtual ACE_Reactor *reactor (TAO_Acceptor *acceptor) = 0;
-
-  /// Return the Leader-Follower group for the current thread
-  virtual TAO_Leader_Follower &leader_follower (void) = 0;
-
-  /// Return the leader follower strategy
-  virtual TAO_LF_Strategy &lf_strategy (void);
-
-  /// Return the Leader-Follower group for a given acceptor
-  virtual TAO_Leader_Follower &leader_follower (TAO_Acceptor *acceptor) = 0;
-
-  /**
-   * The strategy is allowed to store TSS resources using a
-   * place-holder in the ORB_Core class. The ORB_Core the calls back
-   * to do the final cleanup.
-   */
-  virtual void destroy_tss_cookie (void* cookie) = 0;
-
-  /// Wakeup all the reactors
-  virtual int shutdown_all (void) = 0;
-
-private:
-  /// The orb_core
-  TAO_ORB_Core *orb_core_;
-
-  /// The leader follower strategy
-  TAO_LF_Strategy *lf_strategy_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Reactor_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif /* TAO_REACTOR_REGISTRY_H */
diff --git a/TAO/tao/Reactor_Registry.i b/TAO/tao/Reactor_Registry.i
deleted file mode 100644
index 23578dce586..00000000000
--- a/TAO/tao/Reactor_Registry.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_ORB_Core *
-TAO_Reactor_Registry::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index b40168ef2dc..62795db02ba 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -65,12 +65,6 @@ TAO_Resource_Factory::use_locked_data_blocks (void) const
   return 0;
 }
 
-TAO_Reactor_Registry *
-TAO_Resource_Factory::get_reactor_registry (void)
-{
-  return 0;
-}
-
 ACE_Reactor *
 TAO_Resource_Factory::get_reactor (void)
 {
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 49fb5c4ae35..9b4694a4d66 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -29,7 +29,6 @@
 
 class TAO_Acceptor_Registry;
 class TAO_Connector_Registry;
-class TAO_Reactor_Registry;
 
 class TAO_Flushing_Strategy;
 class TAO_Connection_Purging_Strategy;
@@ -125,10 +124,6 @@ public:
   ///    Locked_Data_Blocks
   virtual int use_locked_data_blocks (void) const;
 
-  /// Create the reactor holder, an strategy to control the number of
-  /// reactors in the ORB
-  virtual TAO_Reactor_Registry *get_reactor_registry (void);
-
   /// Return an <ACE_Reactor> to be utilized.
   virtual ACE_Reactor *get_reactor (void);
 
diff --git a/TAO/tao/Single_Reactor.cpp b/TAO/tao/Single_Reactor.cpp
deleted file mode 100644
index 242f11526f1..00000000000
--- a/TAO/tao/Single_Reactor.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-
-#include "tao/Single_Reactor.h"
-#include "tao/ORB_Core.h"
-#include "tao/Resource_Factory.h"
-#include "tao/Leader_Follower.h"
-#include "ace/Reactor.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Single_Reactor.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Single_Reactor, "$Id$")
-
-TAO_Single_Reactor::~TAO_Single_Reactor (void)
-{
-  delete this->leader_follower_;
-}
-
-void
-TAO_Single_Reactor::open (TAO_ORB_Core *orb_core)
-{
-  this->TAO_Reactor_Registry::open (orb_core);
-  ACE_NEW (this->leader_follower_,
-           TAO_Leader_Follower (this->orb_core ()));
-}
-
-ACE_Reactor *
-TAO_Single_Reactor::reactor (void)
-{
-  return this->leader_follower_->reactor ();
-}
-
-ACE_Reactor *
-TAO_Single_Reactor::reactor (TAO_Acceptor *)
-{
-  return this->reactor ();
-}
-
-TAO_Leader_Follower &
-TAO_Single_Reactor::leader_follower (void)
-{
-  return *this->leader_follower_;
-}
-
-TAO_Leader_Follower &
-TAO_Single_Reactor::leader_follower (TAO_Acceptor *)
-{
-  return *this->leader_follower_;
-}
-
-void
-TAO_Single_Reactor::destroy_tss_cookie (void*)
-{
-}
-
-int
-TAO_Single_Reactor::shutdown_all (void)
-{
-  TAO_Leader_Follower &leader_follower =
-    this->leader_follower ();
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    leader_follower.lock (),
-                    -1);
-
-  // Wakeup all the threads waiting blocked in the event loop, this
-  // does not guarantee that they will all go away, but reduces the
-  // load on the POA....
-  ACE_Reactor *reactor =
-    this->reactor ();
-
-  reactor->wakeup_all_threads ();
-
-  // If there are some client threads running we have to wait until
-  // they finish, when the last one does it will shutdown the
-  // reactor for us.  Meanwhile no new requests will be accepted
-  // because the POA will not process them.
-
-  if (!leader_follower.has_clients ())
-    {
-      // Wake up all waiting threads in the reactor.
-      reactor->end_reactor_event_loop ();
-    }
-
-  return 0;
-}
diff --git a/TAO/tao/Single_Reactor.h b/TAO/tao/Single_Reactor.h
deleted file mode 100644
index 7cb88d60a8b..00000000000
--- a/TAO/tao/Single_Reactor.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   Single_Reactor.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_SINGLE_REACTOR_H
-#define TAO_SINGLE_REACTOR_H
-#include "ace/pre.h"
-
-#include "tao/Reactor_Registry.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Leader_Follower;
-
-/**
- * @class TAO_Single_Reactor
- *
- * @brief The Single_Reactor concurrency strategy.
- *
- * This strategy creates a different reactor for each priority
- * level, threads at the right priority level run the event loop
- * on that reactor.
- * Multiple threads can share the same reactor, usually using the
- * thread-pool strategy.
- */
-class TAO_Export TAO_Single_Reactor  : public TAO_Reactor_Registry
-{
-public:
-  /// Default constructor
-  TAO_Single_Reactor (void);
-
-  /// The destructor
-  virtual ~TAO_Single_Reactor (void);
-
-  // = The TAO_Reactor_Registry methods, please check the
-  // documentation in tao/Reactor_Registry.h
-  virtual void open (TAO_ORB_Core* orb_core);
-  virtual ACE_Reactor *reactor (void);
-  virtual ACE_Reactor *reactor (TAO_Acceptor *acceptor);
-  virtual TAO_Leader_Follower &leader_follower (void);
-  virtual TAO_Leader_Follower &leader_follower (TAO_Acceptor *acceptor);
-  virtual void destroy_tss_cookie (void* cookie);
-  virtual int shutdown_all (void);
-
-private:
-  /// The leader follower
-  TAO_Leader_Follower *leader_follower_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Single_Reactor.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif /* TAO_SINGLE_REACTOR_H */
diff --git a/TAO/tao/Single_Reactor.i b/TAO/tao/Single_Reactor.i
deleted file mode 100644
index 073a813d569..00000000000
--- a/TAO/tao/Single_Reactor.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Single_Reactor::TAO_Single_Reactor (void)
-{
-}
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index f0a8acabeb9..98659bbf63e 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -50,27 +50,30 @@ TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
 //    2) For V1.[1,2] there are tagged components
 
 int
-TAO_DIOP_Acceptor::create_mprofile (const TAO_ObjectKey & object_key,
-                                    TAO_MProfile &mprofile,
-                                    CORBA::Boolean share_profile)
+TAO_DIOP_Acceptor::create_profile (const TAO_ObjectKey & object_key,
+                                   TAO_MProfile &mprofile,
+                                   CORBA::Short priority)
 {
   // Sanity check.
   if (this->endpoint_count_ == 0)
     return -1;
 
-  // Check if multiple endpoints should be put in one profile or
-  // if they should be spread across multiple profiles.
-  if (share_profile == 1)
-    return this->create_shared_profile (object_key,
-                                        mprofile);
+  // Check if multiple endpoints should be put in one profile or if
+  // they should be spread across multiple profiles.
+  if (priority == TAO_INVALID_PRIORITY)
+    return this->create_new_profile (object_key,
+                                     mprofile,
+                                     priority);
   else
-    return this->create_new_profiles (object_key,
-                                      mprofile);
+    return this->create_shared_profile (object_key,
+                                        mprofile,
+                                        priority);
 }
 
 int
-TAO_DIOP_Acceptor::create_new_profiles (const TAO_ObjectKey &object_key,
-                                        TAO_MProfile &mprofile)
+TAO_DIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+                                       TAO_MProfile &mprofile,
+                                       CORBA::Short priority)
 {
   // Adding this->endpoint_count_ to the TAO_MProfile.
   int count = mprofile.profile_count ();
@@ -90,6 +93,7 @@ TAO_DIOP_Acceptor::create_new_profiles (const TAO_ObjectKey &object_key,
                                         this->version_,
                                         this->orb_core_),
                       -1);
+      pfile->endpoint ()->priority (priority);
 
       if (mprofile.give_profile (pfile) == -1)
         {
@@ -120,7 +124,8 @@ TAO_DIOP_Acceptor::create_new_profiles (const TAO_ObjectKey &object_key,
 
 int
 TAO_DIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
-                                          TAO_MProfile &mprofile)
+                                          TAO_MProfile &mprofile,
+                                          CORBA::Short priority)
 {
   size_t index = 0;
   TAO_Profile *pfile = 0;
@@ -150,7 +155,7 @@ TAO_DIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
                                         this->version_,
                                         this->orb_core_),
                       -1);
-      iiop_profile->endpoint ()->priority (this->priority ());
+      iiop_profile->endpoint ()->priority (priority);
 
       if (mprofile.give_profile (iiop_profile) == -1)
         {
@@ -186,7 +191,7 @@ TAO_DIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
                                          this->addrs_[index].get_port_number (),
                                          this->addrs_[index]),
                       -1);
-      endpoint->priority (this->priority_);
+      endpoint->priority (priority);
       iiop_profile->add_endpoint (endpoint);
     }
 
@@ -223,8 +228,8 @@ TAO_DIOP_Acceptor::close (void)
       // Either way it will cause the connection handler to be destructed.
       if (this->connection_handler_->get_handle () != ACE_INVALID_HANDLE)
         {
-          this->orb_core_->reactor ()->remove_handler (this->connection_handler_,
-                                                       ACE_Event_Handler::READ_MASK);
+          this->connection_handler_->reactor ()->remove_handler (this->connection_handler_,
+                                                                 ACE_Event_Handler::READ_MASK);
         }
       else
         {
@@ -237,6 +242,7 @@ TAO_DIOP_Acceptor::close (void)
 
 int
 TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
+                         ACE_Reactor *reactor,
                          int major,
                          int minor,
                          const char *address,
@@ -296,7 +302,8 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                     1) != 0)
         return -1;
       else
-        return this->open_i (addr);
+        return this->open_i (addr,
+                             reactor);
     }
   else if (port_separator_loc == 0)
     {
@@ -342,11 +349,13 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (this->addrs_[0].set (addr) != 0)
     return -1;
 
-  return this->open_i (addr);
+  return this->open_i (addr,
+                       reactor);
 }
 
 int
 TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
+                                 ACE_Reactor *reactor,
                                  int major,
                                  int minor,
                                  const char *options)
@@ -391,11 +400,13 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
                 1) != 0)
     return -1;
 
-  return this->open_i (addr);
+  return this->open_i (addr,
+                       reactor);
 }
 
 int
-TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
+TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
+                           ACE_Reactor *reactor)
 {
   ACE_NEW_RETURN (this->connection_handler_,
                   TAO_DIOP_Connection_Handler (this->orb_core_,
@@ -409,8 +420,8 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
   // Register only with a valid handle
   if (this->connection_handler_->get_handle () != ACE_INVALID_HANDLE)
     {
-      this->orb_core_->reactor ()->register_handler (this->connection_handler_,
-                                                     ACE_Event_Handler::READ_MASK);
+      reactor->register_handler (this->connection_handler_,
+                                 ACE_Event_Handler::READ_MASK);
     }
 
   // Set the port for each addr.  If there is more than one network
@@ -723,22 +734,11 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
 
           if (name == "priority")
             {
-              CORBA::Short corba_priority =
-                ACE_static_cast (CORBA::Short,
-                                 ACE_OS::atoi (value.c_str ()));
-
-              if (corba_priority >= 0
-                  /* && corba_priority < 32768 */)
-                // priority_ and corba_priority will always be less
-                // than 32768 since CORBA::Short is a signed 16 bit
-                // integer.
-                this->priority_ = corba_priority;
-              else
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("TAO (%P|%t) Invalid DIOP endpoint ")
-                                   ACE_TEXT ("priority: <%s>\n"),
-                                   value.c_str ()),
-                                  -1);
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("TAO (%P|%t) Invalid DIOP endpoint format: ")
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                                 value.c_str ()),
+                                -1);
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index 326c6d0e1d0..6a99cc1188f 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -61,18 +61,20 @@ public:
    * Pluggable.h for details.
    */
   virtual int open (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     int version_major,
                     int version_minor,
                     const char *address,
                     const char *options = 0);
   virtual int open_default (TAO_ORB_Core *orb_core,
+                            ACE_Reactor *reactor,
                             int version_major,
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile,
-                               CORBA::Boolean share_profile);
+  virtual int create_profile (const TAO_ObjectKey &object_key,
+                              TAO_MProfile &mprofile,
+                              CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint *endpoint);
   virtual CORBA::ULong endpoint_count (void);
@@ -106,7 +108,8 @@ protected:
    * virtual to allow a derived class implementation to be invoked
    * instead.
    */
-  virtual int open_i (const ACE_INET_Addr &addr);
+  virtual int open_i (const ACE_INET_Addr &addr,
+                      ACE_Reactor *reactor);
 
   /**
    * Probe the system for available network interfaces, and initialize
@@ -126,14 +129,15 @@ protected:
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
-  int create_new_profiles (const TAO_ObjectKey &object_key,
-                           TAO_MProfile &mprofile);
+  int create_new_profile (const TAO_ObjectKey &object_key,
+                          TAO_MProfile &mprofile,
+                          CORBA::Short priority);
 
   /// Helper method to create a profile that contains all of
   /// our endpoints.
   int create_shared_profile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile);
-
+                             TAO_MProfile &mprofile,
+                             CORBA::Short priority);
 protected:
 
   /// Array of ACE_INET_Addr instances, each one corresponding to a
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 7ac0e18a9d7..abeaa01d662 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "DIOP_Connection_Handler.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
@@ -13,6 +12,7 @@
 #include "tao/Messaging_Policy_i.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Resume_Handle.h"
 
@@ -25,8 +25,6 @@
 
 ACE_RCSID(tao, DIOP_Connect, "$Id$")
 
-
-
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_DIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
@@ -287,8 +285,8 @@ TAO_DIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
 // @@ Frank: Hopefully this isn't needed
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index 4b50a940275..a49b6f1fafe 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -29,7 +29,6 @@
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
 #include "DIOP_Transport.h"
-//#include "tao/DIOPC.h"
 #include "ace/SOCK_Dgram.h"
 #include "strategies_export.h"
 
@@ -69,8 +68,9 @@ public:
  */
 
 
-class TAO_Strategies_Export TAO_DIOP_Connection_Handler : public TAO_DIOP_SVC_HANDLER,
-                                               public TAO_Connection_Handler
+class TAO_Strategies_Export TAO_DIOP_Connection_Handler :
+  public TAO_DIOP_SVC_HANDLER,
+  public TAO_Connection_Handler
 {
 
 public:
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index ad0b3056855..d3868128e98 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -49,7 +49,6 @@ CPP_SRCS += \
   TAO_Strategies_Internal \
   uiop_endpoints \
   advanced_resource \
-  Reactor_Per_Priority \
   LFU_Connection_Purging_Strategy \
   FIFO_Connection_Purging_Strategy \
   NULL_Connection_Purging_Strategy \
@@ -410,6 +409,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   DIOP_Acceptor.i DIOP_Connector.h
@@ -997,6 +998,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   DIOP_Acceptor.i DIOP_Profile.h \
@@ -1728,6 +1731,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   DIOP_Acceptor.i DIOP_Profile.h \
@@ -2067,6 +2072,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Messaging_Policy_i.h \
   $(TAO_ROOT)/tao/Messaging_Policy_i.i \
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/Base_Transport_Property.h \
   $(TAO_ROOT)/tao/Base_Transport_Property.inl \
   $(TAO_ROOT)/tao/Resume_Handle.h \
@@ -2669,6 +2676,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   UIOP_Connector.h \
@@ -3015,6 +3024,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   UIOP_Connector.h \
@@ -4105,7 +4116,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/operation_details.i \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
-  $(TAO_ROOT)/tao/Invocation.i
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp UIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -4438,6 +4451,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   UIOP_Profile.h \
@@ -4796,7 +4811,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/GIOP_Message_State.inl \
   $(TAO_ROOT)/tao/GIOP_Message_Lite.i \
   $(TAO_ROOT)/tao/Resume_Handle.h \
-  $(TAO_ROOT)/tao/Resume_Handle.inl
+  $(TAO_ROOT)/tao/Resume_Handle.inl \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 .obj/UIOP_Endpoint.o .obj/UIOP_Endpoint.so .shobj/UIOP_Endpoint.o .shobj/UIOP_Endpoint.so: UIOP_Endpoint.cpp UIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -5389,6 +5406,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(ACE_ROOT)/ace/MEM_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -6427,7 +6446,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/operation_details.i \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
-  $(TAO_ROOT)/tao/Invocation.i
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 .obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.so .shobj/SHMIOP_Acceptor.o .shobj/SHMIOP_Acceptor.so: SHMIOP_Acceptor.cpp SHMIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -6760,6 +6781,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Connector_Registry.h \
   $(TAO_ROOT)/tao/Connector_Registry.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(ACE_ROOT)/ace/MEM_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -7116,6 +7139,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
   $(TAO_ROOT)/tao/Base_Transport_Property.h \
   $(TAO_ROOT)/tao/Base_Transport_Property.inl \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   SHMIOP_Endpoint.h \
   $(ACE_ROOT)/ace/MEM_Addr.h \
   $(ACE_ROOT)/ace/MEM_Addr.i \
@@ -8018,10 +8043,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
   advanced_resource.i UIOP_Factory.h SHMIOP_Factory.h DIOP_Factory.h \
-  Reactor_Per_Priority.h \
-  $(TAO_ROOT)/tao/Reactor_Registry.h \
-  $(TAO_ROOT)/tao/Reactor_Registry.i \
-  Reactor_Per_Priority.i LFU_Connection_Purging_Strategy.h \
+  LFU_Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
   FIFO_Connection_Purging_Strategy.h NULL_Connection_Purging_Strategy.h \
@@ -8029,8 +8051,6 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/LF_Strategy.h \
   $(TAO_ROOT)/tao/LF_Strategy.inl \
   LF_Strategy_Null.inl \
-  $(TAO_ROOT)/tao/Single_Reactor.h \
-  $(TAO_ROOT)/tao/Single_Reactor.i \
   $(TAO_ROOT)/tao/LRU_Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/LF_Strategy_Complete.h \
   $(TAO_ROOT)/tao/LF_Strategy_Complete.inl \
@@ -8040,6 +8060,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
   $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
   $(TAO_ROOT)/tao/LF_Follower.inl \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
@@ -8094,261 +8115,6 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/TP_Reactor.h \
   $(ACE_ROOT)/ace/TP_Reactor.i
 
-.obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.so .shobj/Reactor_Per_Priority.o .shobj/Reactor_Per_Priority.so: Reactor_Per_Priority.cpp Reactor_Per_Priority.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/Reactor_Registry.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/svc_export.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Record.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Log_Record.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/try_macros.h \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Reactor_Registry.i \
-  strategies_export.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Reactor_Per_Priority.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/Pluggable.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable.i \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/MessagingC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PollableC.h \
-  $(TAO_ROOT)/tao/PollableC.i \
-  $(TAO_ROOT)/tao/MessagingC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Leader_Follower.h \
-  $(TAO_ROOT)/tao/LF_Follower.h \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
-  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
-  $(TAO_ROOT)/tao/LF_Follower.inl \
-  $(ACE_ROOT)/ace/Intrusive_List.h \
-  $(ACE_ROOT)/ace/Intrusive_List.inl \
-  $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  $(TAO_ROOT)/tao/Leader_Follower.i
-
 .obj/LFU_Connection_Purging_Strategy.o .obj/LFU_Connection_Purging_Strategy.so .shobj/LFU_Connection_Purging_Strategy.o .shobj/LFU_Connection_Purging_Strategy.so: LFU_Connection_Purging_Strategy.cpp \
   LFU_Connection_Purging_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
diff --git a/TAO/tao/Strategies/Makefile.bor b/TAO/tao/Strategies/Makefile.bor
index 30599f4f7ac..945857b1b92 100644
--- a/TAO/tao/Strategies/Makefile.bor
+++ b/TAO/tao/Strategies/Makefile.bor
@@ -30,7 +30,6 @@ OBJFILES = \
 	$(OBJDIR)\TAO_Strategies_Internal.obj \
 	$(OBJDIR)\uiop_endpoints.obj \
 	$(OBJDIR)\advanced_resource.obj \
-	$(OBJDIR)\Reactor_Per_Priority.obj \
 	$(OBJDIR)\FIFO_Connection_Purging_Strategy.obj \
 	$(OBJDIR)\LFU_Connection_Purging_Strategy.obj \
 	$(OBJDIR)\NULL_Connection_Purging_Strategy.obj \
diff --git a/TAO/tao/Strategies/Reactor_Per_Priority.cpp b/TAO/tao/Strategies/Reactor_Per_Priority.cpp
deleted file mode 100644
index b0b545a1565..00000000000
--- a/TAO/tao/Strategies/Reactor_Per_Priority.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// $Id$
-
-#include "Reactor_Per_Priority.h"
-#include "tao/ORB_Core.h"
-#include "tao/Resource_Factory.h"
-#include "tao/Leader_Follower.h"
-#include "tao/Pluggable.h"
-#include "tao/debug.h"
-#include "ace/Reactor.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Reactor_Per_Priority.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(Strategies, Reactor_Per_Priority, "$Id$")
-
-TAO_Reactor_Per_Priority::~TAO_Reactor_Per_Priority (void)
-{
-  for (Map_Iterator i = this->map_.begin ();
-       i != this->map_.end ();
-       ++i)
-    {
-      delete (*i).int_id_;
-    }
-}
-
-ACE_Reactor *
-TAO_Reactor_Per_Priority::reactor (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  TAO_ORB_Core_TSS_Resources *tss =
-    this->orb_core ()->get_tss_resources ();
-
-  TAO_Leader_Follower *leader_follower =
-    ACE_static_cast (TAO_Leader_Follower*,
-                     tss->reactor_registry_cookie_);
-
-  if (leader_follower != 0)
-    return leader_follower->reactor ();
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Short priority = 0;
-  if (tph->get_thread_CORBA_priority (priority,
-                                      ACE_TRY_ENV)
-      == -1)
-    {
-      if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - Reactor_Per_Priority::reactor: ")
-                    ACE_TEXT (" cannot get priority for this thread\n")));
-      return 0;
-    }
-
-  leader_follower = this->leader_follower_i (priority);
-
-  return leader_follower->reactor ();
-}
-
-ACE_Reactor *
-TAO_Reactor_Per_Priority::reactor (TAO_Acceptor *acceptor)
-{
-  //
-  // Here is the explanation for going from CORBA priority to Native
-  // and back again:
-  //
-  // Suppose the user specifies 20,000 as the (CORBA) priority for a
-  // endpoint.  20,000 will be mapped to the native priority (say 10)
-  // when the thread is created.  When the thread goes to access it's
-  // reactor, the native priority will be converted to the CORBA
-  // priority (say 19,000) which is used to look up the reactor.
-  // There is a loss of precision in this conversion.
-  //
-  // We use the same two step normalization here.  Otherwise, we'll
-  // get a reactor which is different than the one used by the
-  // endpoint thread(s).
-
-  CORBA::Short normalized_corba_priority = 0;
-  CORBA::Short user_specified_corba_priority =
-    acceptor->priority ();
-
-  TAO_CORBA_Priority_Normalizer *corba_priority_normalizer =
-    this->orb_core ()->corba_priority_normalizer ();
-
-  CORBA::Boolean result =
-    corba_priority_normalizer->normalize (user_specified_corba_priority,
-                                          normalized_corba_priority);
-  if (result == 0)
-    return 0;
-
-  TAO_Leader_Follower *leader_follower =
-    this->leader_follower_i (normalized_corba_priority);
-
-  return leader_follower->reactor ();
-}
-
-TAO_Leader_Follower &
-TAO_Reactor_Per_Priority::leader_follower (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  TAO_ORB_Core_TSS_Resources *tss =
-    this->orb_core ()->get_tss_resources ();
-
-  TAO_Leader_Follower *leader_follower =
-    ACE_static_cast (TAO_Leader_Follower*,
-                     tss->reactor_registry_cookie_);
-
-  if (leader_follower != 0)
-    return *leader_follower;
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (*leader_follower);
-
-  CORBA::Short priority = 0;
-  if (tph->get_thread_CORBA_priority (priority,
-                                      ACE_TRY_ENV)
-      == -1)
-    return *leader_follower;
-
-  return *this->leader_follower_i (priority);
-}
-
-TAO_Leader_Follower &
-TAO_Reactor_Per_Priority::leader_follower (TAO_Acceptor *acceptor)
-{
-  CORBA::Short priority =
-    acceptor->priority ();
-
-  return *this->leader_follower_i (priority);
-}
-
-void
-TAO_Reactor_Per_Priority::destroy_tss_cookie (void*)
-{
-  // Do nothing, data is destroyed in the map...
-}
-
-TAO_Leader_Follower *
-TAO_Reactor_Per_Priority::leader_follower_i (CORBA::Short priority)
-{
-  // If the priority of the current thread is not right we return.
-  TAO_Leader_Follower *leader_follower = 0;
-  if (this->map_.find (priority, leader_follower) == -1)
-    {
-      if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - new priority %d\n"),
-                    priority));
-      // The priority is new, create an entry in the table.
-      ACE_NEW_RETURN (leader_follower,
-                      TAO_Leader_Follower (this->orb_core ()),
-                      leader_follower);
-      this->map_.bind (priority, leader_follower);
-    }
-
-  return leader_follower;
-}
-
-int
-TAO_Reactor_Per_Priority::shutdown_all (void)
-{
-  for (Map_Iterator i = this->map_.begin ();
-       i != this->map_.end ();
-       ++i)
-    {
-      TAO_Leader_Follower &leader_follower =
-        *((*i).int_id_);
-
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        ace_mon,
-                        leader_follower.lock (),
-                        -1);
-
-      // Wakeup all the threads waiting blocked in the event loop,
-      // this does not guarantee that they will all go away, but
-      // reduces the load on the POA....
-      ACE_Reactor *reactor =
-        leader_follower.reactor ();
-
-      reactor->wakeup_all_threads ();
-
-      // If there are some client threads running we have to wait
-      // until they finish, when the last one does it will shutdown
-      // the reactor for us.  Meanwhile no new requests will be
-      // accepted because the POA will not process them.
-
-      if (!leader_follower.has_clients ())
-        {
-          // Wake up all waiting threads in the reactor.
-          reactor->end_reactor_event_loop ();
-        }
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>;
-template class ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>;
-template class ACE_Map_Iterator_Base<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>;
-template class ACE_Map_Reverse_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>;
-template class ACE_Map_Entry<CORBA::Short,TAO_Leader_Follower*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Entry<CORBA::Short,TAO_Leader_Follower*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Strategies/Reactor_Per_Priority.h b/TAO/tao/Strategies/Reactor_Per_Priority.h
deleted file mode 100644
index 50a4e209b1b..00000000000
--- a/TAO/tao/Strategies/Reactor_Per_Priority.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Reactor_Per_Priority.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_REACTOR_PER_PRIORITY_H
-#define TAO_REACTOR_PER_PRIORITY_H
-#include "ace/pre.h"
-
-#include "tao/Reactor_Registry.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "strategies_export.h"
-#include "ace/Map_Manager.h"
-
-class TAO_Leader_Follower;
-
-class TAO_Strategies_Export TAO_Reactor_Per_Priority  : public TAO_Reactor_Registry
-{
-  // = TITLE
-  //   The Reactor_Per_Priority concurrency strategy.
-  //
-  // = DESCRIPTION
-  //   This strategy creates a different reactor for each priority
-  //   level, threads at the right priority level run the event loop
-  //   on that reactor.
-  //   Multiple threads can share the same reactor, usually using the
-  //   thread-pool strategy.
-  //
-public:
-  TAO_Reactor_Per_Priority (void);
-  // Default constructor
-
-  virtual ~TAO_Reactor_Per_Priority (void);
-  // The destructor
-
-  // = The TAO_Reactor_Registry methods, please check the
-  // documentation in tao/Reactor_Registry.h
-  virtual ACE_Reactor *reactor (void);
-  virtual ACE_Reactor *reactor (TAO_Acceptor *acceptor);
-  virtual TAO_Leader_Follower &leader_follower (void);
-  virtual TAO_Leader_Follower &leader_follower (TAO_Acceptor *acceptor);
-  virtual void destroy_tss_cookie (void* cookie);
-  virtual int shutdown_all (void);
-
-private:
-  TAO_Leader_Follower *leader_follower_i (CORBA::Short priority);
-  // Obtain the leader follower object given a priority, used to
-  // implement all the other methods
-
-private:
-  typedef ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> Map;
-  typedef ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> Map_Iterator;
-
-  Map map_;
-  // The map between priorities and the control structure for the
-  // reactor
-};
-
-#if defined (__ACE_INLINE__)
-# include "Reactor_Per_Priority.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif /* TAO_REACTOR_PER_PRIORITY_H */
diff --git a/TAO/tao/Strategies/Reactor_Per_Priority.i b/TAO/tao/Strategies/Reactor_Per_Priority.i
deleted file mode 100644
index 86c085d631a..00000000000
--- a/TAO/tao/Strategies/Reactor_Per_Priority.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Reactor_Per_Priority::TAO_Reactor_Per_Priority (void)
-{
-}
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 829561bf057..b40f8ecc948 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -74,23 +74,26 @@ TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor (void)
 //       interfaces over which we can receive requests.  Thus a profile
 //       must be made for each one.
 int
-TAO_SHMIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-                                      TAO_MProfile &mprofile,
-                                      CORBA::Boolean share_profile)
+TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+                                     TAO_MProfile &mprofile,
+                                     CORBA::Short priority)
 {
   // Check if multiple endpoints should be put in one profile or
   // if they should be spread across multiple profiles.
-  if (share_profile == 1)
-    return this->create_shared_profile (object_key,
-                                        mprofile);
+  if (priority == TAO_INVALID_PRIORITY)
+    return this->create_new_profile (object_key,
+                                     mprofile,
+                                     priority);
   else
-    return this->create_profile (object_key,
-                                 mprofile);
+    return this->create_shared_profile (object_key,
+                                        mprofile,
+                                        priority);
 }
 
 int
-TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
-                                     TAO_MProfile &mprofile)
+TAO_SHMIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+                                         TAO_MProfile &mprofile,
+                                         CORBA::Short priority)
 {
   // @@ we only make one for now
   int count = mprofile.profile_count ();
@@ -107,8 +110,7 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
                                       this->version_,
                                       this->orb_core_),
                   -1);
-
-  pfile->endpoint ()->priority (this->priority_);
+  pfile->endpoint ()->priority (priority);
 
   if (mprofile.give_profile (pfile) == -1)
     {
@@ -139,7 +141,8 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 
 int
 TAO_SHMIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
-                                            TAO_MProfile &mprofile)
+                                            TAO_MProfile &mprofile,
+                                            CORBA::Short priority)
 {
   TAO_Profile *pfile = 0;
   TAO_SHMIOP_Profile *shmiop_profile = 0;
@@ -160,7 +163,9 @@ TAO_SHMIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
     {
       // If <mprofile> doesn't contain SHMIOP_Profile, we need to create
       // one.
-      return create_profile (object_key, mprofile);
+      return create_new_profile (object_key,
+                                 mprofile,
+                                 priority);
     }
   else
     {
@@ -172,7 +177,7 @@ TAO_SHMIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
                                            this->address_.get_port_number (),
                                            this->address_.get_remote_addr ()),
                       -1);
-      endpoint->priority (this->priority_);
+      endpoint->priority (priority);
       shmiop_profile->add_endpoint (endpoint);
 
       return 0;
@@ -201,6 +206,7 @@ TAO_SHMIOP_Acceptor::close (void)
 
 int
 TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
+                           ACE_Reactor *reactor,
                            int major,
                            int minor,
                            const char *port,
@@ -221,11 +227,13 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (port)
     this->address_.set (port);
 
-  return this->open_i (orb_core);
+  return this->open_i (orb_core,
+                       reactor);
 }
 
 int
 TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
+                                   ACE_Reactor *reactor,
                                    int major,
                                    int minor,
                                    const char *options)
@@ -246,7 +254,8 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 
   this->host_ = this->address_.get_host_name ();
 
-  return this->open_i (orb_core);
+  return this->open_i (orb_core,
+                       reactor);
 }
 
 int
@@ -260,7 +269,8 @@ TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
 }
 
 int
-TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core)
+TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
+                             ACE_Reactor *reactor)
 {
   this->orb_core_ = orb_core;
 
@@ -281,7 +291,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core)
   // We only accept connection on localhost.
   //  ACE_INET_Addr local_addr (addr.get_port_number (), ACE_TEXT ("localhost"));
   if (this->base_acceptor_.open (this->address_,
-                                 this->orb_core_->reactor (this),
+                                 reactor,
                                  this->creation_strategy_,
                                  this->accept_strategy_,
                                  this->concurrency_strategy_) == -1)
@@ -362,7 +372,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
     if (TAO_debug_level > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"),
+                    ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::decode - v%d.%d\n"),
                     major,
                     minor));
       }
@@ -480,22 +490,11 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
 
           if (name == "priority")
             {
-              CORBA::Short corba_priority =
-                ACE_static_cast (CORBA::Short,
-                                 ACE_OS::atoi (value.c_str ()));
-
-              if (corba_priority >= 0
-                  /* && corba_priority < 32768 */)
-                // priority_ and corba_priority will always be less
-                // than 32768 since CORBA::Short is a signed 16 bit
-                // integer.
-                this->priority_ = corba_priority;
-              else
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint ")
-                                   ACE_TEXT ("priority: <%s>\n"),
-                                   value.c_str ()),
-                                  -1);
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ")
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                                 value.c_str ()),
+                                -1);
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index de7e801cf94..293e64c89ab 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -60,18 +60,20 @@ public:
   // = The TAO_Acceptor methods, check the documentation in
   //   Pluggable.h for details.
   virtual int open (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     int version_major,
                     int version_minor,
                     const char *port,
                     const char *options = 0);
   virtual int open_default (TAO_ORB_Core *orb_core,
+                            ACE_Reactor *reactor,
                             int version_major,
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile,
-                               CORBA::Boolean share_profile);
+  virtual int create_profile (const TAO_ObjectKey &object_key,
+                              TAO_MProfile &mprofile,
+                              CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint* endpoint);
   virtual CORBA::ULong endpoint_count (void);
@@ -85,19 +87,21 @@ public:
   // use.
 
 private:
-  int open_i (TAO_ORB_Core* orb_core);
+  int open_i (TAO_ORB_Core* orb_core,
+              ACE_Reactor *reactor);
   // Implement the common part of the open*() methods.
 
   virtual int parse_options (const char *options);
   // Parse protocol specific options.
 
-  int create_profile (const TAO_ObjectKey &object_key,
-                      TAO_MProfile &mprofile);
-  // Create a SHMIOP profile representing this acceptor.  Factors out
-  // common functionality of <create_mprofile> and <create_shared_mprofile>.
+  int create_new_profile (const TAO_ObjectKey &object_key,
+                          TAO_MProfile &mprofile,
+                          CORBA::Short priority);
+  // Create a SHMIOP profile representing this acceptor.
 
   int create_shared_profile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile);
+                             TAO_MProfile &mprofile,
+                             CORBA::Short priority);
   // Add the endpoints on this acceptor to a shared profile.
 
 protected:
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index a5cf1b09db3..1a5af864db5 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -13,6 +13,7 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "SHMIOP_Endpoint.h"
 #include "tao/Resume_Handle.h"
 
@@ -247,8 +248,8 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
 
@@ -258,8 +259,8 @@ TAO_SHMIOP_Connection_Handler::handle_input (ACE_HANDLE)
   // Increase the reference count on the upcall that have passed us.
   this->incr_pending_upcalls ();
 
-  TAO_Resume_Handle  resume_handle (this->orb_core (),
-                                    this->get_handle ());
+  TAO_Resume_Handle resume_handle (this->orb_core (),
+                                   this->get_handle ());
 
   int retval = this->transport ()->handle_input_i (resume_handle);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index 88f1accf53e..61cab8b2edb 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -41,8 +41,9 @@
  */
 
 
-class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler : public TAO_SHMIOP_SVC_HANDLER,
-                                                            public TAO_Connection_Handler
+class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler :
+  public TAO_SHMIOP_SVC_HANDLER,
+  public TAO_Connection_Handler
 {
 
 public:
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 56105c78a59..d94e35fcbc7 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 
@@ -15,12 +14,12 @@
 #include "ace/Auto_Ptr.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Invocation.h"
+#include "tao/Thread_Lane_Resources.h"
 
 ACE_RCSID (Strategies,
            SHMIOP_Connector,
            "$Id$")
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
@@ -166,8 +165,8 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
 
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
-  if (this->orb_core ()->transport_cache ()->find_transport (desc,
-                                                             base_transport) == 0)
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
+                                                                              base_transport) == 0)
     {
       if (TAO_debug_level > 5)
         ACE_DEBUG ((LM_DEBUG,
@@ -183,7 +182,7 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                     ACE_TEXT ("making a new connection \n")));
 
       // Purge connections (if necessary)
-      this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->lane_resources ().transport_cache ().purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection
@@ -237,8 +236,8 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
       base_transport = TAO_Transport::_duplicate (svc_handler->transport ());
       // Add the handler to Cache
       int retval =
-        this->orb_core ()->transport_cache ()->cache_transport (desc,
-                                                                svc_handler->transport ());
+        this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                 svc_handler->transport ());
 
       if (retval != 0 && TAO_debug_level > 0)
         {
@@ -370,8 +369,8 @@ TAO_SHMIOP_Connector::preconnect (const char *preconnects)
 
               // Add the handler to Cache
               int retval =
-                this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                        handlers[slot]->transport ());
+                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                         handlers[slot]->transport ());
               successes++;
 
               if (retval != 0 && TAO_debug_level > 4)
diff --git a/TAO/tao/Strategies/TAO_Strategies.dsp b/TAO/tao/Strategies/TAO_Strategies.dsp
index 975147e7a47..940e463ab15 100644
--- a/TAO/tao/Strategies/TAO_Strategies.dsp
+++ b/TAO/tao/Strategies/TAO_Strategies.dsp
@@ -142,10 +142,6 @@ SOURCE=.\NULL_Connection_Purging_Strategy.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\SHMIOP_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -258,10 +254,6 @@ SOURCE=.\LF_Strategy_Null.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\SHMIOP_Acceptor.h

 # End Source File

 # Begin Source File

@@ -294,10 +286,6 @@ SOURCE=.\SHMIOP_Transport.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\strategies_export.h

 # End Source File

 # Begin Source File

@@ -374,10 +362,6 @@ SOURCE=.\DIOP_Transport.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\SHMIOP_Acceptor.i

 # End Source File

 # Begin Source File

@@ -402,10 +386,6 @@ SOURCE=.\SHMIOP_Transport.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\UIOP_Connect.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Strategies/TAO_Strategies_Static.dsp b/TAO/tao/Strategies/TAO_Strategies_Static.dsp
index 24e09b71cb9..8fb847e4232 100644
--- a/TAO/tao/Strategies/TAO_Strategies_Static.dsp
+++ b/TAO/tao/Strategies/TAO_Strategies_Static.dsp
@@ -139,10 +139,6 @@ SOURCE=.\NULL_Connection_Purging_Strategy.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\SHMIOP_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -255,10 +251,6 @@ SOURCE=.\LF_Strategy_Null.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\SHMIOP_Acceptor.h

 # End Source File

 # Begin Source File

@@ -359,10 +351,6 @@ SOURCE=.\DIOP_Transport.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\SHMIOP_Acceptor.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 2625298ef81..a2c7d00728e 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -1,7 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
@@ -83,23 +81,27 @@ TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
 }
 
 int
-TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-                                    TAO_MProfile &mprofile,
-                                    CORBA::Boolean share_profile)
+TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+                                   TAO_MProfile &mprofile,
+                                   CORBA::Short priority)
 {
   // Check if multiple endpoints should be put in one profile or
   // if they should be spread across multiple profiles.
-  if (share_profile == 1)
-    return this->create_shared_profile (object_key,
-                                        mprofile);
+  if (priority == TAO_INVALID_PRIORITY)
+    return this->create_new_profile (object_key,
+                                     mprofile,
+                                     priority);
   else
-    return this->create_profile (object_key,
-                                 mprofile);
+    return this->create_shared_profile (object_key,
+                                        mprofile,
+                                        priority);
+
 }
 
 int
-TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
-                                   TAO_MProfile &mprofile)
+TAO_UIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+                                       TAO_MProfile &mprofile,
+                                       CORBA::Short priority)
 {
   ACE_UNIX_Addr addr;
 
@@ -118,8 +120,7 @@ TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
                                     this->version_,
                                     this->orb_core_),
                   -1);
-
-  pfile->endpoint ()->priority (this->priority_);
+  pfile->endpoint ()->priority (priority);
 
   if (mprofile.give_profile (pfile) == -1)
     {
@@ -148,7 +149,8 @@ TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 
 int
 TAO_UIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
-                                          TAO_MProfile &mprofile)
+                                          TAO_MProfile &mprofile,
+                                          CORBA::Short priority)
 {
   TAO_Profile *pfile = 0;
   TAO_UIOP_Profile *uiop_profile = 0;
@@ -169,7 +171,9 @@ TAO_UIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
     {
       // If <mprofile> doesn't contain UIOP_Profile, we need to create
       // one.
-      return create_profile (object_key, mprofile);
+      return create_new_profile (object_key,
+                                 mprofile,
+                                 priority);
     }
   else
     {
@@ -183,7 +187,7 @@ TAO_UIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
       ACE_NEW_RETURN (endpoint,
                       TAO_UIOP_Endpoint (addr),
                       -1);
-      endpoint->priority (this->priority_);
+      endpoint->priority (priority);
       uiop_profile->add_endpoint (endpoint);
 
       return 0;
@@ -226,6 +230,7 @@ TAO_UIOP_Acceptor::close (void)
 
 int
 TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
+                         ACE_Reactor *reactor,
                          int major,
                          int minor,
                          const char *address,
@@ -248,11 +253,13 @@ TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (this->parse_options (options) == -1)
     return -1;
   else
-    return this->open_i (address);
+    return this->open_i (address,
+                         reactor);
 }
 
 int
 TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
+                                 ACE_Reactor *reactor,
                                  int major,
                                  int minor,
                                  const char *options)
@@ -278,11 +285,13 @@ TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
   if (tempname.get () == 0)
     return -1;
 
-  return this->open_i (tempname.get ());
+  return this->open_i (tempname.get (),
+                       reactor);
 }
 
 int
-TAO_UIOP_Acceptor::open_i (const char *rendezvous)
+TAO_UIOP_Acceptor::open_i (const char *rendezvous,
+                           ACE_Reactor *reactor)
 {
   ACE_NEW_RETURN (this->creation_strategy_,
                   TAO_UIOP_CREATION_STRATEGY (this->orb_core_,
@@ -303,7 +312,7 @@ TAO_UIOP_Acceptor::open_i (const char *rendezvous)
   this->rendezvous_point (addr, rendezvous);
 
   if (this->base_acceptor_.open (addr,
-                                 this->orb_core_->reactor (this),
+                                 reactor,
                                  this->creation_strategy_,
                                  this->accept_strategy_,
                                  this->concurrency_strategy_) == -1)
@@ -505,22 +514,11 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
 
           if (name == "priority")
             {
-              CORBA::Short corba_priority =
-                ACE_static_cast (CORBA::Short,
-                                 ACE_OS::atoi (value.c_str ()));
-
-              if (corba_priority >= 0
-                  /* && corba_priority < 32768 */)
-                // priority_ and corba_priority will always be less
-                // than 32768 since CORBA::Short is a signed 16 bit
-                // integer.
-                this->priority_ = corba_priority;
-              else
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "TAO (%P|%t) Invalid UIOP endpoint "
-                                   "priority: <%s>\n",
-                                   value.c_str ()),
-                                  -1);
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                                 value.c_str ()),
+                                -1);
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index cd7fb42a95e..530dac4bee1 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -65,18 +65,20 @@ public:
   // = The TAO_Acceptor methods, check the documentation in
   //   Pluggable.h for details.
   virtual int open (TAO_ORB_Core *orb_core,
+                    ACE_Reactor *reactor,
                     int version_major,
                     int version_minor,
                     const char *address,
                     const char *options = 0);
   virtual int open_default (TAO_ORB_Core *orb_core,
+                            ACE_Reactor *reactor,
                             int version_major,
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile,
-                               CORBA::Boolean share_profile);
+  virtual int create_profile (const TAO_ObjectKey &object_key,
+                              TAO_MProfile &mprofile,
+                              CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint* endpoint);
   virtual CORBA::ULong endpoint_count (void);
@@ -84,7 +86,8 @@ public:
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO_ObjectKey &key);
 private:
-  int open_i (const char *rendezvous);
+  int open_i (const char *rendezvous,
+              ACE_Reactor *reactor);
   // Implement the common part of the open*() methods
 
   void rendezvous_point (ACE_UNIX_Addr &, const char *rendezvous);
@@ -98,14 +101,14 @@ private:
   // Obtains uiop properties that must be used by this acceptor, i.e.,
   // initializes <uiop_properties_>.
 
-  int create_profile (const TAO_ObjectKey &object_key,
-                      TAO_MProfile &mprofile);
-  // Create a UIOP profile representing this acceptor.  This method
-  // factors out common functionality of <create_mprofile> and
-  // <create_endpoint_for_mprofile>.
+  int create_new_profile (const TAO_ObjectKey &object_key,
+                          TAO_MProfile &mprofile,
+                          CORBA::Short priority);
+  // Create a UIOP profile representing this acceptor.
 
   int create_shared_profile (const TAO_ObjectKey &object_key,
-                             TAO_MProfile &mprofile);
+                             TAO_MProfile &mprofile,
+                             CORBA::Short priority);
   // Add the endpoints on this acceptor to a shared profile.
 
 private:
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 8dfbe37a1db..011db4856f3 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -17,6 +17,7 @@
 #include "tao/GIOP_Message_Lite.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Resume_Handle.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #if !defined (__ACE_INLINE__)
 # include "UIOP_Connection_Handler.inl"
@@ -227,18 +228,17 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
-
 int
 TAO_UIOP_Connection_Handler::handle_input (ACE_HANDLE)
 {
   this->incr_pending_upcalls ();
 
-  TAO_Resume_Handle  resume_handle (this->orb_core (),
-                                    this->get_handle ());
+  TAO_Resume_Handle resume_handle (this->orb_core (),
+                                   this->get_handle ());
 
   int retval =
     this->transport ()->handle_input_i (resume_handle);
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index ded09d4721d..176d1d0e721 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -1,7 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 #include "UIOP_Connector.h"
 
 #if TAO_HAS_UIOP == 1
@@ -15,12 +13,12 @@
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Invocation.h"
+#include "tao/Thread_Lane_Resources.h"
 
 ACE_RCSID(Strategies,
           UIOP_Connector,
           "$Id$")
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Node<ACE_UNIX_Addr>;
@@ -158,8 +156,8 @@ TAO_UIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
 
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
-  if (this->orb_core ()->transport_cache ()->find_transport (desc,
-                                                             base_transport) == 0)
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
+                                                                              base_transport) == 0)
     {
       if (TAO_debug_level > 5)
         ACE_DEBUG ((LM_DEBUG,
@@ -175,7 +173,7 @@ TAO_UIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                     ACE_TEXT ("making a new connection \n")));
 
       // Purge connections (if necessary)
-      this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->lane_resources ().transport_cache ().purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection
@@ -225,8 +223,8 @@ TAO_UIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
       base_transport = TAO_Transport::_duplicate (svc_handler->transport ());
       // Add the handler to Cache
       int retval =
-        this->orb_core ()->transport_cache ()->cache_transport (desc,
-                                                                base_transport);
+        this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                 base_transport);
 
       if (retval != 0 && TAO_debug_level > 0)
         {
@@ -346,8 +344,8 @@ TAO_UIOP_Connector::preconnect (const char *preconnects)
 
               // Add the handler to Cache
               int retval =
-                this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                        handlers[slot]->transport ());
+                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                         handlers[slot]->transport ());
               ++successes;
 
               if (retval != 0 && TAO_debug_level > 4)
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 09aa67c35ba..9689f290bd3 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -10,7 +10,6 @@
 #include "SHMIOP_Factory.h"
 #include "DIOP_Factory.h"
 
-#include "Reactor_Per_Priority.h"
 #include "LFU_Connection_Purging_Strategy.h"
 #include "FIFO_Connection_Purging_Strategy.h"
 #include "NULL_Connection_Purging_Strategy.h"
@@ -18,7 +17,6 @@
 #include "LF_Strategy_Null.h"
 
 #include "tao/debug.h"
-#include "tao/Single_Reactor.h"
 #include "tao/LRU_Connection_Purging_Strategy.h"
 #include "tao/LF_Strategy_Complete.h"
 #include "tao/Leader_Follower.h"
@@ -58,9 +56,8 @@ TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 }
 
 TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
-  :reactor_registry_type_ (TAO_SINGLE_REACTOR),
-   reactor_type_ (TAO_REACTOR_TP),
-   cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK)
+  : reactor_type_ (TAO_REACTOR_TP),
+    cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK)
 {
   // Constructor
 }
@@ -108,23 +105,12 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
       if (ACE_OS::strcasecmp (argv[curarg],
                               "-ORBReactorRegistry") == 0)
         {
-
           curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      "single") == 0)
-                this->reactor_registry_type_ = TAO_SINGLE_REACTOR;
-              else if (ACE_OS::strcasecmp (name,
-                                           "per-priority") == 0)
-                this->reactor_registry_type_ = TAO_REACTOR_PER_PRIORITY;
-              else
-                this->report_option_value_error ("-ORBReactorRegistry", name);
-            }
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("TAO_Advanced_Resource_Factory::init - ")
+                             ACE_TEXT ("-ORBReactorRegistry no longer supported\n")),
+                            -1);
         }
-
       else if (ACE_OS::strcasecmp (argv[curarg],
                                    "-ORBReactorLock") == 0)
         {
@@ -142,7 +128,6 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
                 this->reactor_type_= TAO_REACTOR_SELECT_MT;
             }
         }
-
       else if (ACE_OS::strcasecmp (argv[curarg],
                                    "-ORBReactorType") == 0)
         {
@@ -508,31 +493,7 @@ TAO_Advanced_Resource_Factory::get_protocol_factories (void)
   return &protocol_factories_;
 }
 
-TAO_Reactor_Registry *
-TAO_Advanced_Resource_Factory::get_reactor_registry (void)
-{
-  TAO_Reactor_Registry *reactor_registry = 0;
-  switch (this->reactor_registry_type_)
-    {
-    default:
-    case TAO_SINGLE_REACTOR:
-      ACE_NEW_RETURN (reactor_registry,
-                      TAO_Single_Reactor,
-                      0);
-      break;
-
-    case TAO_REACTOR_PER_PRIORITY:
-      ACE_NEW_RETURN (reactor_registry,
-                      TAO_Reactor_Per_Priority,
-                      0);
-      break;
-
-    }
-
-  return reactor_registry;
-}
-
-ACE_Reactor_Impl*
+ACE_Reactor_Impl *
 TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
 {
   ACE_Reactor_Impl *impl = 0;
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index ae24f4aef6c..eafa8afcf46 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -64,15 +64,7 @@ public:
     TAO_REACTOR_TP
   };
 
-  // = Reactor mappings strategy
-  enum
-  {
-    TAO_SINGLE_REACTOR,
-    TAO_REACTOR_PER_PRIORITY
-  };
-
   // = Resource Retrieval
-  virtual TAO_Reactor_Registry *get_reactor_registry (void);
   virtual int init_protocol_factories (void);
   virtual ACE_Allocator* input_cdr_dblock_allocator (void);
   virtual ACE_Allocator* input_cdr_buffer_allocator (void);
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 2c308688fb5..beacffdf72e 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -511,7 +511,6 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
   TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
                                                  this->base_profiles_,
-                                                 this->orb_core_.get (),
                                                  ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
@@ -688,7 +687,7 @@ TAO_Stub::buffering_constraint (void)
       TAO_Policy_Current &policy_current =
         this->orb_core_->policy_current ();
 
-      result = 
+      result =
         policy_current.get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
     }
 
@@ -701,7 +700,7 @@ TAO_Stub::buffering_constraint (void)
         this->orb_core_->policy_manager ();
       if (policy_manager != 0)
         {
-          result = 
+          result =
             policy_manager->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
         }
     }
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 879717a098d..de70be90ce9 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -259,15 +259,15 @@ SOURCE=.\CodecFactory_ORBInitializer.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Handler.cpp

+SOURCE=.\Collocation_Resolver.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Purging_Strategy.cpp

+SOURCE=.\Connection_Handler.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Impl.cpp

+SOURCE=.\Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

 

@@ -279,10 +279,6 @@ SOURCE=.\CONV_FRAMEC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\CORBA_String.cpp

 # End Source File

 # Begin Source File

@@ -311,6 +307,10 @@ SOURCE=.\default_client.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Default_Collocation_Resolver.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Default_Endpoint_Selector_Factory.cpp

 # End Source File

 # Begin Source File

@@ -331,6 +331,10 @@ SOURCE=.\Default_Stub_Factory.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Default_Thread_Lane_Resources_Manager.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\DLL_ORB.cpp

 # End Source File

 # Begin Source File

@@ -519,6 +523,10 @@ SOURCE=.\Leader_Follower_Flushing_Strategy.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\LF_Event.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\LF_Event_Binder.cpp

 # End Source File

 # Begin Source File

@@ -543,6 +551,10 @@ SOURCE=.\LF_Strategy.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\LF_Strategy_Complete.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\LocalObject.cpp

 # End Source File

 # Begin Source File

@@ -667,10 +679,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\POA_Extension_Initializer.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Policy_Manager.cpp

 # End Source File

 # Begin Source File

@@ -719,10 +727,6 @@ SOURCE=.\Reactive_Flushing_Strategy.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Registry.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Remote_Object_Proxy_Broker.cpp

 # End Source File

 # Begin Source File

@@ -771,10 +775,6 @@ SOURCE=.\Services_Activate.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\skip.cpp

 # End Source File

 # Begin Source File

@@ -831,11 +831,15 @@ SOURCE=.\target_specification.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.cpp

+SOURCE=.\Thread_Lane_Resources.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS.cpp

+SOURCE=.\Thread_Lane_Resources_Manager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TimeBaseC.cpp

 # End Source File

 # Begin Source File

 

@@ -904,7 +908,7 @@ SOURCE=.\WrongTransactionC.cpp
 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# PROP Default_Filter "h;hpp;hxx;hm;fi;fd"

 # Begin Source File

 

 SOURCE=.\Abstract_Servant_Base.h

@@ -987,10 +991,6 @@ SOURCE=.\Cleanup_Func_Registry.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Func_Registry.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\Client_Strategy_Factory.h

 # End Source File

 # Begin Source File

@@ -1011,15 +1011,15 @@ SOURCE=.\CodecFactory_ORBInitializer.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Handler.h

+SOURCE=.\Collocation_Resolver.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Purging_Strategy.h

+SOURCE=.\Connection_Handler.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Impl.h

+SOURCE=.\Connection_Purging_Strategy.h

 # End Source File

 # Begin Source File

 

@@ -1031,14 +1031,6 @@ SOURCE=.\CONV_FRAMEC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\corba.h

 # End Source File

 # Begin Source File

@@ -1071,6 +1063,10 @@ SOURCE=.\default_client.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Default_Collocation_Resolver.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Default_Endpoint_Selector_Factory.h

 # End Source File

 # Begin Source File

@@ -1091,6 +1087,10 @@ SOURCE=.\Default_Stub_Factory.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Default_Thread_Lane_Resources_Manager.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Direct_Priority_Mapping.h

 # End Source File

 # Begin Source File

@@ -1203,10 +1203,6 @@ SOURCE=.\GIOPC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOPS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\IFR_Client_Adapter.h

 # End Source File

 # Begin Source File

@@ -1271,14 +1267,6 @@ SOURCE=.\IOPC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ior_corbaloc_export.h

 # End Source File

 # Begin Source File

@@ -1303,11 +1291,11 @@ SOURCE=.\Leader_Follower_Flushing_Strategy.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Binder.h

+SOURCE=.\LF_Event.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Binder.inl

+SOURCE=.\LF_Event_Binder.h

 # End Source File

 # Begin Source File

 

@@ -1315,39 +1303,23 @@ SOURCE=.\LF_Event_Loop_Thread_Helper.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Loop_Thread_Helper.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\LF_Follower.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\LF_Follower_Auto_Adder.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Adder.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\LF_Follower_Auto_Ptr.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Ptr.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\LF_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy.inl

+SOURCE=.\LF_Strategy_Complete.h

 # End Source File

 # Begin Source File

 

@@ -1367,7 +1339,7 @@ SOURCE=.\Managed_Types.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\marshal.h

+SOURCE=.\Marshal.h

 # End Source File

 # Begin Source File

 

@@ -1391,10 +1363,6 @@ SOURCE=.\MessagingC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\MProfile.h

 # End Source File

 # Begin Source File

@@ -1451,10 +1419,6 @@ SOURCE=.\orb_core.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Strategies_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ORB_Table.h

 # End Source File

 # Begin Source File

@@ -1491,10 +1455,6 @@ SOURCE=.\Pluggable_Messaging_Utils.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\POA_Extension_Initializer.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Policy_Manager.h

 # End Source File

 # Begin Source File

@@ -1515,14 +1475,6 @@ SOURCE=.\PollableC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\PortableInterceptor.h

 # End Source File

 # Begin Source File

@@ -1551,18 +1503,10 @@ SOURCE=.\Queued_Message.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Queued_Message.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactive_Flushing_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Registry.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Remote_Object_Proxy_Broker.h

 # End Source File

 # Begin Source File

@@ -1591,10 +1535,6 @@ SOURCE=.\sequence.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Sequence_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_Strategy_Factory.h

 # End Source File

 # Begin Source File

@@ -1615,10 +1555,6 @@ SOURCE=.\Services_Activate.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\singletons.h

 # End Source File

 # Begin Source File

@@ -1667,10 +1603,6 @@ SOURCE=.\TAO_Server_Request.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Singleton_Manager.h

 # End Source File

 # Begin Source File

@@ -1679,27 +1611,19 @@ SOURCE=.\TAOC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAOS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\target_specification.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.h

+SOURCE=.\Thread_Lane_Resources.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS.h

+SOURCE=.\Thread_Lane_Resources_Manager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS_T.h

+SOURCE=.\TimeBaseC.h

 # End Source File

 # Begin Source File

 

@@ -1711,10 +1635,6 @@ SOURCE=.\Transport.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\Transport_Cache_Manager.h

 # End Source File

 # Begin Source File

@@ -1780,7 +1700,7 @@ SOURCE=.\WrongTransactionC.h
 # End Group

 # Begin Group "Inline Files"

 

-# PROP Default_Filter "i"

+# PROP Default_Filter "i;inl"

 # Begin Source File

 

 SOURCE=.\Acceptor_Filter.i

@@ -1831,27 +1751,27 @@ SOURCE=.\cdr.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ClientInterceptorAdapter.inl

+SOURCE=.\Cleanup_Func_Registry.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Handler.i

+SOURCE=.\ClientInterceptorAdapter.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Purging_Strategy.inl

+SOURCE=.\Collocation_Resolver.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.i

+SOURCE=.\Connection_Handler.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.i

+SOURCE=.\Connection_Purging_Strategy.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES_T.i

+SOURCE=.\CONV_FRAMEC.i

 # End Source File

 # Begin Source File

 

@@ -1879,6 +1799,10 @@ SOURCE=.\default_client.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Default_Collocation_Resolver.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Default_Protocols_Hooks.i

 # End Source File

 # Begin Source File

@@ -1891,6 +1815,10 @@ SOURCE=.\default_server.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Default_Thread_Lane_Resources_Manager.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\DLL_ORB.inl

 # End Source File

 # Begin Source File

@@ -1963,7 +1891,7 @@ SOURCE=.\GIOP_Message_Locate_Header.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_State.inl

+SOURCE=.\GIOP_Message_State.i

 # End Source File

 # Begin Source File

 

@@ -1979,14 +1907,6 @@ SOURCE=.\GIOPC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOPS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOPS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_Acceptor.i

 # End Source File

 # Begin Source File

@@ -2035,39 +1955,39 @@ SOURCE=.\IOPC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS.i

+SOURCE=.\IOR_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS_T.i

+SOURCE=.\Leader_Follower.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_Parser.i

+SOURCE=.\LF_Event.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower.i

+SOURCE=.\LF_Event_Binder.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event.cpp

+SOURCE=.\LF_Event_Loop_Thread_Helper.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event.h

+SOURCE=.\LF_Follower.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event.inl

+SOURCE=.\LF_Follower_Auto_Adder.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy_Complete.cpp

+SOURCE=.\LF_Follower_Auto_Ptr.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy_Complete.h

+SOURCE=.\LF_Strategy.inl

 # End Source File

 # Begin Source File

 

@@ -2087,7 +2007,7 @@ SOURCE=.\Managed_Types.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\marshal.i

+SOURCE=.\Marshal.i

 # End Source File

 # Begin Source File

 

@@ -2103,10 +2023,6 @@ SOURCE=.\MessagingC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\MProfile.i

 # End Source File

 # Begin Source File

@@ -2147,10 +2063,6 @@ SOURCE=.\orb_core.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Strategies_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ORB_Table.inl

 # End Source File

 # Begin Source File

@@ -2195,14 +2107,6 @@ SOURCE=.\PollableC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\PortableInterceptor.i

 # End Source File

 # Begin Source File

@@ -2219,7 +2123,7 @@ SOURCE=.\Profile.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Registry.i

+SOURCE=.\Queued_Message.inl

 # End Source File

 # Begin Source File

 

@@ -2235,10 +2139,6 @@ SOURCE=.\sequence.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Sequence_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Service_Callbacks.i

 # End Source File

 # Begin Source File

@@ -2251,10 +2151,6 @@ SOURCE=.\Services.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\StringSeqC.i

 # End Source File

 # Begin Source File

@@ -2283,10 +2179,6 @@ SOURCE=.\TAO_Server_Request.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Singleton_Manager.inl

 # End Source File

 # Begin Source File

@@ -2295,15 +2187,15 @@ SOURCE=.\TAOC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOS.i

+SOURCE=.\target_specification.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOS_T.i

+SOURCE=.\Thread_Lane_Resources.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\target_specification.i

+SOURCE=.\Thread_Lane_Resources_Manager.i

 # End Source File

 # Begin Source File

 

@@ -2311,11 +2203,7 @@ SOURCE=.\TimeBaseC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS_T.i

+SOURCE=.\Transport.inl

 # End Source File

 # Begin Source File

 

@@ -2350,13 +2238,5 @@ SOURCE=.\ValueFactory_Map.i
 SOURCE=.\tao.rc

 # End Source File

 # End Group

-# Begin Group "Template Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\TAO_Singleton.cpp

-# End Source File

-# End Group

 # End Target

 # End Project

diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index bac2f70fb8c..cc0729b5b82 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -24,6 +24,8 @@
 #include "Default_Stub_Factory.h"
 #include "Default_Endpoint_Selector_Factory.h"
 #include "Default_Protocols_Hooks.h"
+#include "Default_Thread_Lane_Resources_Manager.h"
+#include "Default_Collocation_Resolver.h"
 
 ACE_RCSID (tao,
            TAO_Internal,
@@ -227,6 +229,10 @@ TAO_Internal::open_services_i (int &argc,
         insert (&ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
       ACE_Service_Config::static_svcs ()->
         insert (&ace_svc_desc_TAO_Default_Protocols_Hooks);
+      ACE_Service_Config::static_svcs ()->
+        insert (&ace_svc_desc_TAO_Default_Thread_Lane_Resources_Manager_Factory);
+      ACE_Service_Config::static_svcs ()->
+        insert (&ace_svc_desc_TAO_Default_Collocation_Resolver);
 
       int result = 0;
 
@@ -241,8 +247,8 @@ TAO_Internal::open_services_i (int &argc,
       // Handle RTCORBA library special case.  Since RTCORBA needs
       // its init method call to register several hooks, call it here
       // if it hasn't already been called.
-      TAO_Object_Loader *rt_loader =
-        ACE_Dynamic_Service<TAO_Object_Loader>::instance ("RT_ORB_Loader");
+      ACE_Service_Object *rt_loader =
+        ACE_Dynamic_Service<ACE_Service_Object>::instance ("RT_ORB_Loader");
       if (rt_loader != 0)
           rt_loader->init (0, 0);
 
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index be6114f879c..b9020a3bba2 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -86,2168 +86,2080 @@ LIB32=link.exe -lib
 

 # Name "TAO LIB - Win32 Static Release"

 # Name "TAO LIB - Win32 Static Debug"

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h"

-# Begin Source File

-

-SOURCE=.\Abstract_Servant_Base.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Acceptor_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Adapter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\arg_shifter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Invocation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Queued_Message.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Reply_Dispatcher.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Timeout_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Base_Transport_Property.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDir_Adapter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Bind_Dispatcher_Guard.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Block_Flushing_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BoundsC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Buffering_Constraint_Policy.h

-# End Source File

-# Begin Source File

+# Begin Group "Source Files"

 

-SOURCE=.\Cache_Entries.h

-# End Source File

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

-SOURCE=.\cdr.h

+SOURCE=.\Abstract_Servant_Base.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Encaps_Codec.h

+SOURCE=.\Acceptor_Filter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Func_Registry.h

+SOURCE=.\Acceptor_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Client_Strategy_Factory.h

+SOURCE=.\Adapter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ClientInterceptorAdapter.h

+SOURCE=.\Any.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ClientRequestInfo.h

+SOURCE=.\append.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory.h

+SOURCE=.\Asynch_Invocation.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory_ORBInitializer.h

+SOURCE=.\Asynch_Queued_Message.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Handler.h

+SOURCE=.\Asynch_Reply_Dispatcher.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Purging_Strategy.h

+SOURCE=.\Asynch_Timeout_Handler.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Impl.h

+SOURCE=.\Base_Transport_Property.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Registry.h

+SOURCE=.\BiDir_Adapter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.h

+SOURCE=.\Bind_Dispatcher_Guard.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.h

+SOURCE=.\Block_Flushing_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\corba.h

+SOURCE=.\BoundsC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBA_String.h

+SOURCE=.\Buffering_Constraint_Policy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.h

+SOURCE=.\Cache_Entries.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBALOC_Parser.h

+SOURCE=.\CDR.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBANAME_Parser.h

+SOURCE=.\CDR_Encaps_Codec.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CurrentC.h

+SOURCE=.\Cleanup_Func_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\debug.h

+SOURCE=.\Client_Strategy_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_client.h

+SOURCE=.\ClientInterceptorAdapter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Endpoint_Selector_Factory.h

+SOURCE=.\ClientRequestInfo.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Protocols_Hooks.h

+SOURCE=.\CodecFactory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.h

+SOURCE=.\CodecFactory_ORBInitializer.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_server.h

+SOURCE=.\Connection_Handler.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Stub_Factory.h

+SOURCE=.\Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\DLL_ORB.h

+SOURCE=.\Connector_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\DLL_Parser.h

+SOURCE=.\CONV_FRAMEC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.h

+SOURCE=.\CORBA_String.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Dynamic_Adapter.h

+SOURCE=.\corbafwd.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\DynamicC.h

+SOURCE=.\CORBALOC_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Encodable.h

+SOURCE=.\CORBANAME_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Endpoint.h

+SOURCE=.\CurrentC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Endpoint_Selector_Factory.h

+SOURCE=.\debug.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Environment.h

+SOURCE=.\default_client.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Exception.h

+SOURCE=.\Default_Endpoint_Selector_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Exclusive_TMS.h

+SOURCE=.\Default_Protocols_Hooks.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Fault_Tolerance_Service.h

+SOURCE=.\default_resource.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\FILE_Parser.h

+SOURCE=.\default_server.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Flushing_Strategy.h

+SOURCE=.\Default_Stub_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Base.h

+SOURCE=.\Default_Thread_Lane_Resources_Manager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser.h

+SOURCE=.\Default_Collocation_Resolver.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_10.h

+SOURCE=.\DLL_ORB.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_11.h

+SOURCE=.\DLL_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_12.h

+SOURCE=.\DomainC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_Impl.h

+SOURCE=.\Dynamic_Adapter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Lite.h

+SOURCE=.\DynamicC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Locate_Header.h

+SOURCE=.\Encodable.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_State.h

+SOURCE=.\Endpoint.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Version.h

+SOURCE=.\Endpoint_Selector_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Utils.h

+SOURCE=.\Environment.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOPC.h

+SOURCE=.\Exception.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IFR_Client_Adapter.h

+SOURCE=.\Exclusive_TMS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Acceptor.h

+SOURCE=.\Fault_Tolerance_Service.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Connection_Handler.h

+SOURCE=.\FILE_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Connector.h

+SOURCE=.\Flushing_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Endpoint.h

+SOURCE=.\GIOP_Message_Base.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\iiop_endpoints.h

+SOURCE=.\GIOP_Message_Generator_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Factory.h

+SOURCE=.\GIOP_Message_Generator_Parser_10.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Lite_Factory.h

+SOURCE=.\GIOP_Message_Generator_Parser_11.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.h

+SOURCE=.\GIOP_Message_Generator_Parser_12.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Transport.h

+SOURCE=.\GIOP_Message_Generator_Parser_Impl.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOPC.h

+SOURCE=.\GIOP_Message_Lite.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Incoming_Message_Queue.h

+SOURCE=.\GIOP_Message_Locate_Header.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Interceptor_List.h

+SOURCE=.\GIOP_Message_State.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.h

+SOURCE=.\GIOP_Message_Version.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation_Endpoint_Selectors.h

+SOURCE=.\GIOP_Utils.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.h

+SOURCE=.\GIOPC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS.h

+SOURCE=.\IFR_Client_Adapter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS_T.h

+SOURCE=.\IFR_TypeCodes.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ior_corbaloc_export.h

+SOURCE=.\IIOP_Acceptor.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ior_corbaname_export.h

+SOURCE=.\IIOP_Connection_Handler.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_Parser.h

+SOURCE=.\IIOP_Connector.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IORInfo.h

+SOURCE=.\IIOP_Endpoint.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower.h

+SOURCE=.\iiop_endpoints.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower_Flushing_Strategy.h

+SOURCE=.\IIOP_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event.h

+SOURCE=.\IIOP_Lite_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Binder.h

+SOURCE=.\IIOP_Profile.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Loop_Thread_Helper.h

+SOURCE=.\IIOP_Transport.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower.h

+SOURCE=.\IIOPC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Adder.h

+SOURCE=.\Incoming_Message_Queue.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Ptr.h

+SOURCE=.\Interceptor_List.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy.h

+SOURCE=.\Invocation.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy_Complete.h

+SOURCE=.\Invocation_Endpoint_Selectors.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LocalObject.h

+SOURCE=.\IOPC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LRU_Connection_Purging_Strategy.h

+SOURCE=.\IOR_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Types.h

+SOURCE=.\IORInfo.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\marshal.h

+SOURCE=.\Leader_Follower.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\MCAST_Parser.h

+SOURCE=.\Leader_Follower_Flushing_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_ORBInitializer.h

+SOURCE=.\LF_Event.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_Policy_i.h

+SOURCE=.\LF_Event_Binder.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_PolicyFactory.h

+SOURCE=.\LF_Event_Loop_Thread_Helper.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.h

+SOURCE=.\LF_Follower.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.h

+SOURCE=.\LF_Follower_Auto_Adder.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\MProfile.h

+SOURCE=.\LF_Follower_Auto_Ptr.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Muxed_TMS.h

+SOURCE=.\LF_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\nvlist.h

+SOURCE=.\LF_Strategy_Complete.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\object.h

+SOURCE=.\LocalObject.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_KeyC.h

+SOURCE=.\LRU_Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.h

+SOURCE=.\Managed_Types.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Proxy_Broker.h

+SOURCE=.\Marshal.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Proxy_Impl.h

+SOURCE=.\MCAST_Parser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Ref_Table.h

+SOURCE=.\Messaging_ORBInitializer.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.h

+SOURCE=.\Messaging_Policy_i.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\OctetSeqC.h

+SOURCE=.\Messaging_PolicyFactory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\operation_details.h

+SOURCE=.\MessagingC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\orb.h

+SOURCE=.\MProfile.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\orb_core.h

+SOURCE=.\Muxed_TMS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Strategies_T.h

+SOURCE=.\NVList.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Table.h

+SOURCE=.\Object.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\orbconf.h

+SOURCE=.\Object_KeyC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORBInitializer_Registry.h

+SOURCE=.\Object_Loader.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORBInitInfo.h

+SOURCE=.\Object_Proxy_Broker.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\params.h

+SOURCE=.\Object_Proxy_Impl.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Parser_Registry.h

+SOURCE=.\Object_Ref_Table.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable.h

+SOURCE=.\ObjectIDList.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable_Messaging.h

+SOURCE=.\OctetSeqC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable_Messaging_Utils.h

+SOURCE=.\operation_details.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\POA_Extension_Initializer.h

+SOURCE=.\ORB.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.h

+SOURCE=.\ORB_Core.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Set.h

+SOURCE=.\ORB_Table.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyC.h

+SOURCE=.\ORBInitializer_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyFactory_Registry.h

+SOURCE=.\ORBInitInfo.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableC.h

+SOURCE=.\params.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableS.h

+SOURCE=.\Parser_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableS_T.h

+SOURCE=.\Pluggable.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableInterceptor.h

+SOURCE=.\Pluggable_Messaging.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableInterceptorC.h

+SOURCE=.\Pluggable_Messaging_Utils.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Principal.h

+SOURCE=.\Policy_Manager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Profile.h

+SOURCE=.\Policy_Set.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Protocol_Factory.h

+SOURCE=.\PolicyC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Protocols_Hooks.h

+SOURCE=.\PolicyFactory_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Queued_Message.h

+SOURCE=.\PollableC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactive_Flushing_Strategy.h

+SOURCE=.\PortableInterceptorC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Registry.h

+SOURCE=.\Principal.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Remote_Object_Proxy_Broker.h

+SOURCE=.\Profile.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Remote_Object_Proxy_Impl.h

+SOURCE=.\Protocol_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reply_Dispatcher.h

+SOURCE=.\Protocols_Hooks.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\RequestInfo_Util.h

+SOURCE=.\Queued_Message.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Resource_Factory.h

+SOURCE=.\Reactive_Flushing_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Resume_Handle.h

+SOURCE=.\Remote_Object_Proxy_Broker.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\sequence.h

+SOURCE=.\Remote_Object_Proxy_Impl.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sequence_T.h

+SOURCE=.\Reply_Dispatcher.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Server_Strategy_Factory.h

+SOURCE=.\RequestInfo_Util.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Callbacks.h

+SOURCE=.\Resource_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Context.h

+SOURCE=.\Resume_Handle.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.h

+SOURCE=.\Sequence.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services_Activate.h

+SOURCE=.\Server_Strategy_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.h

+SOURCE=.\Service_Callbacks.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\singletons.h

+SOURCE=.\Service_Context.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\StringSeqC.h

+SOURCE=.\Services.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\stub.h

+SOURCE=.\Services_Activate.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Stub_Factory.h

+SOURCE=.\skip.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sync_Strategies.h

+SOURCE=.\StringSeqC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Synch_Queued_Message.h

+SOURCE=.\Stub.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Synch_Reply_Dispatcher.h

+SOURCE=.\Stub_Factory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.h

+SOURCE=.\Sync_Strategies.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Profile.h

+SOURCE=.\Synch_Queued_Message.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Export.h

+SOURCE=.\Synch_Reply_Dispatcher.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Internal.h

+SOURCE=.\Tagged_Components.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Server_Request.h

+SOURCE=.\Tagged_Profile.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton.h

+SOURCE=.\TAO_Internal.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton_Manager.h

+SOURCE=.\TAO_Server_Request.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOC.h

+SOURCE=.\TAO_Singleton_Manager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOS.h

+SOURCE=.\TAOC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\target_specification.h

+SOURCE=.\target_specification.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.h

+SOURCE=.\Thread_Lane_Resources.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS.h

+SOURCE=.\Thread_Lane_Resources_Manager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS_T.h

+SOURCE=.\Collocation_Resolver.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Timeprobe.h

+SOURCE=.\TimeBaseC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport.h

+SOURCE=.\Transport.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Cache_Manager.h

+SOURCE=.\Transport_Cache_Manager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Descriptor_Interface.h

+SOURCE=.\Transport_Descriptor_Interface.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Mux_Strategy.h

+SOURCE=.\Transport_Mux_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Timer.h

+SOURCE=.\Transport_Timer.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\try_macros.h

+SOURCE=.\Typecode.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\typecode.h

+SOURCE=.\Typecode_Constants.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.h

+SOURCE=.\TypeCodeFactory_Adapter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory.h

+SOURCE=.\ValueBase.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory_Map.h

+SOURCE=.\ValueFactory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\varbase.h

+SOURCE=.\ValueFactory_Map.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_On_Leader_Follower.h

+SOURCE=.\Wait_On_Leader_Follower.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_On_Reactor.h

+SOURCE=.\Wait_On_Reactor.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_On_Read.h

+SOURCE=.\Wait_On_Read.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_Strategy.h

+SOURCE=.\Wait_Strategy.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\WrongTransactionC.h

+SOURCE=.\WrongTransactionC.cpp

 # End Source File

 # End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "i,inl"

-# Begin Source File

-

-SOURCE=.\Acceptor_Filter.i

-# End Source File

-# Begin Source File

+# Begin Group "Header Files"

 

-SOURCE=.\Acceptor_Registry.i

-# End Source File

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

-SOURCE=.\Adapter.i

+SOURCE=.\Abstract_Servant_Base.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\any.i

+SOURCE=.\Acceptor_Filter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Invocation.i

+SOURCE=.\Acceptor_Registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.i

+SOURCE=.\Adapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Base_Transport_Property.inl

+SOURCE=.\any.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Bind_Dispatcher_Guard.i

+SOURCE=.\arg_shifter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\BoundsC.i

+SOURCE=.\Asynch_Invocation.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Buffering_Constraint_Policy.i

+SOURCE=.\Asynch_Queued_Message.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cache_Entries.i

+SOURCE=.\Asynch_Reply_Dispatcher.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\cdr.i

+SOURCE=.\Asynch_Timeout_Handler.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Func_Registry.inl

+SOURCE=.\Base_Transport_Property.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ClientInterceptorAdapter.inl

+SOURCE=.\BiDir_Adapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Handler.i

+SOURCE=.\Bind_Dispatcher_Guard.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Purging_Strategy.inl

+SOURCE=.\Block_Flushing_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Impl.inl

+SOURCE=.\BoundsC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.i

+SOURCE=.\Buffering_Constraint_Policy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.i

+SOURCE=.\Cache_Entries.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES_T.i

+SOURCE=.\cdr.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBA_String.inl

+SOURCE=.\CDR_Encaps_Codec.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.i

+SOURCE=.\Cleanup_Func_Registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBALOC_Parser.i

+SOURCE=.\Cleanup_Func_Registry.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBANAME_Parser.i

+SOURCE=.\Client_Strategy_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CurrentC.i

+SOURCE=.\ClientInterceptorAdapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_client.i

+SOURCE=.\ClientRequestInfo.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Protocols_Hooks.i

+SOURCE=.\CodecFactory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.i

+SOURCE=.\CodecFactory_ORBInitializer.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_server.i

+SOURCE=.\Connection_Handler.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DLL_ORB.inl

+SOURCE=.\Connection_Purging_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DLL_Parser.i

+SOURCE=.\Connector_Registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.i

+SOURCE=.\CONV_FRAMEC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DynamicC.i

+SOURCE=.\corba.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Endpoint.i

+SOURCE=.\CORBA_String.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Environment.i

+SOURCE=.\corbafwd.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Exception.i

+SOURCE=.\CORBALOC_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Fault_Tolerance_Service.i

+SOURCE=.\CORBANAME_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\FILE_Parser.i

+SOURCE=.\CurrentC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\giop.i

+SOURCE=.\debug.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Base.i

+SOURCE=.\default_client.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser.inl

+SOURCE=.\Default_Endpoint_Selector_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_10.inl

+SOURCE=.\Default_Protocols_Hooks.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_11.inl

+SOURCE=.\default_resource.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_12.inl

+SOURCE=.\default_server.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_Impl.inl

+SOURCE=.\Default_Stub_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Lite.i

+SOURCE=.\Default_Thread_Lane_Resources_Manager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Locate_Header.i

+SOURCE=.\Default_Collocation_Resolver.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_State.inl

+SOURCE=.\Direct_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Version.inl

+SOURCE=.\DLL_ORB.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Utils.i

+SOURCE=.\DLL_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOPC.i

+SOURCE=.\DomainC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOPS.i

+SOURCE=.\Dynamic_Adapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOPS_T.i

+SOURCE=.\DynamicC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Acceptor.i

+SOURCE=.\Encodable.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Connection_Handler.i

+SOURCE=.\Endpoint.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Endpoint.i

+SOURCE=.\Endpoint_Selector_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\iiop_endpoints.i

+SOURCE=.\Environment.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.i

+SOURCE=.\Exception.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Transport.i

+SOURCE=.\Exclusive_TMS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOPC.i

+SOURCE=.\Fault_Tolerance_Service.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Incoming_Message_Queue.inl

+SOURCE=.\FILE_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Interceptor_List.inl

+SOURCE=.\Flushing_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.i

+SOURCE=.\giop.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation_Endpoint_Selectors.i

+SOURCE=.\GIOP_Message_Base.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.i

+SOURCE=.\GIOP_Message_Generator_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS.i

+SOURCE=.\GIOP_Message_Generator_Parser_10.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPS_T.i

+SOURCE=.\GIOP_Message_Generator_Parser_11.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_Parser.i

+SOURCE=.\GIOP_Message_Generator_Parser_12.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower.i

+SOURCE=.\GIOP_Message_Generator_Parser_Impl.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event.inl

+SOURCE=.\GIOP_Message_Lite.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Binder.inl

+SOURCE=.\GIOP_Message_Locate_Header.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Loop_Thread_Helper.inl

+SOURCE=.\GIOP_Message_State.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower.inl

+SOURCE=.\GIOP_Message_Version.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Adder.inl

+SOURCE=.\GIOP_Utils.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Ptr.inl

+SOURCE=.\GIOPC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy.inl

+SOURCE=.\IFR_Client_Adapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy_Complete.inl

+SOURCE=.\IIOP_Acceptor.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LocalObject.i

+SOURCE=.\IIOP_Connection_Handler.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Types.i

+SOURCE=.\IIOP_Connector.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\marshal.i

+SOURCE=.\IIOP_Endpoint.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MCAST_Parser.i

+SOURCE=.\iiop_endpoints.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_Policy_i.i

+SOURCE=.\IIOP_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.i

+SOURCE=.\IIOP_Lite_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.i

+SOURCE=.\IIOP_Profile.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MProfile.i

+SOURCE=.\IIOP_Transport.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\NVList.i

+SOURCE=.\IIOPC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\object.i

+SOURCE=.\Incoming_Message_Queue.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_KeyC.i

+SOURCE=.\Incoming_Message_Queue.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.i

+SOURCE=.\Interceptor_List.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.i

+SOURCE=.\Invocation.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\OctetSeqC.i

+SOURCE=.\Invocation_Endpoint_Selectors.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\operation_details.i

+SOURCE=.\IOPC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB.i

+SOURCE=.\ior_corbaloc_export.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\orb_core.i

+SOURCE=.\ior_corbaname_export.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Strategies_T.i

+SOURCE=.\IOR_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Table.inl

+SOURCE=.\IORInfo.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORBInitializer_Registry.inl

+SOURCE=.\Leader_Follower.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\params.i

+SOURCE=.\Leader_Follower_Flushing_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Parser_Registry.i

+SOURCE=.\LF_Event.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable.i

+SOURCE=.\LF_Event.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable_Messaging.i

+SOURCE=.\LF_Event_Binder.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable_Messaging_Utils.i

+SOURCE=.\LF_Event_Binder.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.i

+SOURCE=.\LF_Event_Loop_Thread_Helper.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Set.i

+SOURCE=.\LF_Event_Loop_Thread_Helper.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyC.i

+SOURCE=.\LF_Follower.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableC.i

+SOURCE=.\LF_Follower.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableS.i

+SOURCE=.\LF_Follower_Auto_Adder.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableS_T.i

+SOURCE=.\LF_Follower_Auto_Adder.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableInterceptorC.i

+SOURCE=.\LF_Follower_Auto_Ptr.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Principal.i

+SOURCE=.\LF_Follower_Auto_Ptr.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Profile.i

+SOURCE=.\LF_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Queued_Message.inl

+SOURCE=.\LF_Strategy.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Registry.i

+SOURCE=.\LF_Strategy_Complete.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reply_Dispatcher.i

+SOURCE=.\LF_Strategy_Complete.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Resume_Handle.inl

+SOURCE=.\Linear_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\sequence.i

+SOURCE=.\LocalObject.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sequence_T.i

+SOURCE=.\LRU_Connection_Purging_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Callbacks.i

+SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Context.inl

+SOURCE=.\Marshal.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.i

+SOURCE=.\MCAST_Parser.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.i

+SOURCE=.\Messaging_ORBInitializer.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\StringSeqC.i

+SOURCE=.\Messaging_Policy_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\stub.i

+SOURCE=.\Messaging_PolicyFactory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sync_Strategies.i

+SOURCE=.\MessagingC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.i

+SOURCE=.\MProfile.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Profile.i

+SOURCE=.\Muxed_TMS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Internal.i

+SOURCE=.\nvlist.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Server_Request.i

+SOURCE=.\object.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton.inl

+SOURCE=.\Object_KeyC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton_Manager.inl

+SOURCE=.\Object_Loader.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOC.i

+SOURCE=.\Object_Proxy_Broker.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOS.i

+SOURCE=.\Object_Proxy_Impl.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOS_T.i

+SOURCE=.\Object_Ref_Table.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\target_specification.i

+SOURCE=.\ObjectIDList.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.i

+SOURCE=.\OctetSeqC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS.i

+SOURCE=.\operation_details.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS_T.i

+SOURCE=.\orb.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport.inl

+SOURCE=.\orb_core.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Cache_Manager.inl

+SOURCE=.\ORB_Table.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Descriptor_Interface.inl

+SOURCE=.\orbconf.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\typecode.i

+SOURCE=.\ORBInitializer_Registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.i

+SOURCE=.\ORBInitInfo.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory.i

+SOURCE=.\params.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory_Map.i

+SOURCE=.\Parser_Registry.h

 # End Source File

-# End Group

-# Begin Group "Resource files"

-

-# PROP Default_Filter "rc"

 # Begin Source File

 

-SOURCE=.\tao.rc

+SOURCE=.\Pluggable.h

 # End Source File

-# End Group

-# Begin Group "Template Files"

-

-# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\TAO_Singleton.cpp

+SOURCE=.\Pluggable_Messaging.h

 # End Source File

-# End Group

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

 # Begin Source File

 

-SOURCE=.\Abstract_Servant_Base.cpp

+SOURCE=.\Pluggable_Messaging_Utils.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Acceptor_Filter.cpp

+SOURCE=.\Policy_Manager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Acceptor_Registry.cpp

+SOURCE=.\Policy_Set.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Adapter.cpp

+SOURCE=.\PolicyC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Any.cpp

+SOURCE=.\PolicyFactory_Registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\append.cpp

+SOURCE=.\PollableC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Invocation.cpp

+SOURCE=.\PortableInterceptor.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Queued_Message.cpp

+SOURCE=.\PortableInterceptorC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.cpp

+SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Timeout_Handler.cpp

+SOURCE=.\Profile.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Base_Transport_Property.cpp

+SOURCE=.\Protocol_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\BiDir_Adapter.cpp

+SOURCE=.\Protocols_Hooks.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Bind_Dispatcher_Guard.cpp

+SOURCE=.\Queued_Message.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Block_Flushing_Strategy.cpp

+SOURCE=.\Queued_Message.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\BoundsC.cpp

+SOURCE=.\Reactive_Flushing_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Buffering_Constraint_Policy.cpp

+SOURCE=.\Remote_Object_Proxy_Broker.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cache_Entries.cpp

+SOURCE=.\Remote_Object_Proxy_Impl.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR.cpp

+SOURCE=.\Reply_Dispatcher.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Encaps_Codec.cpp

+SOURCE=.\RequestInfo_Util.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Func_Registry.cpp

+SOURCE=.\Resource_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Client_Strategy_Factory.cpp

+SOURCE=.\Resume_Handle.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ClientInterceptorAdapter.cpp

+SOURCE=.\Resume_Handle.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\ClientRequestInfo.cpp

+SOURCE=.\sequence.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory.cpp

+SOURCE=.\Server_Strategy_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory_ORBInitializer.cpp

+SOURCE=.\Service_Callbacks.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Handler.cpp

+SOURCE=.\Service_Context.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connection_Purging_Strategy.cpp

+SOURCE=.\Services.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Impl.cpp

+SOURCE=.\Services_Activate.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Connector_Registry.cpp

+SOURCE=.\singletons.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.cpp

+SOURCE=.\StringSeqC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBA_String.cpp

+SOURCE=.\stub.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.cpp

+SOURCE=.\Stub_Factory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBALOC_Parser.cpp

+SOURCE=.\Sync_Strategies.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CORBANAME_Parser.cpp

+SOURCE=.\Synch_Queued_Message.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CurrentC.cpp

+SOURCE=.\Synch_Reply_Dispatcher.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\debug.cpp

+SOURCE=.\Tagged_Components.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_client.cpp

+SOURCE=.\Tagged_Profile.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Endpoint_Selector_Factory.cpp

+SOURCE=.\TAO_Export.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Protocols_Hooks.cpp

+SOURCE=.\TAO_Internal.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.cpp

+SOURCE=.\TAO_Server_Request.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_server.cpp

+SOURCE=.\TAO_Singleton_Manager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Default_Stub_Factory.cpp

+SOURCE=.\TAOC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DLL_ORB.cpp

+SOURCE=.\target_specification.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DLL_Parser.cpp

+SOURCE=.\Thread_Lane_Resources.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.cpp

+SOURCE=.\Thread_Lane_Resources_Manager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Dynamic_Adapter.cpp

+SOURCE=.\Collocation_Resolver.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DynamicC.cpp

+SOURCE=.\TimeBaseC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Encodable.cpp

+SOURCE=.\Timeprobe.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Endpoint.cpp

+SOURCE=.\Transport.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Endpoint_Selector_Factory.cpp

+SOURCE=.\Transport.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Environment.cpp

+SOURCE=.\Transport_Cache_Manager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Exception.cpp

+SOURCE=.\Transport_Descriptor_Interface.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Exclusive_TMS.cpp

+SOURCE=.\Transport_Mux_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Fault_Tolerance_Service.cpp

+SOURCE=.\Transport_Timer.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\FILE_Parser.cpp

+SOURCE=.\try_macros.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Flushing_Strategy.cpp

+SOURCE=.\typecode.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Base.cpp

+SOURCE=.\TypeCodeFactory_Adapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser.cpp

+SOURCE=.\ValueBase.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_10.cpp

+SOURCE=.\ValueFactory.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_11.cpp

+SOURCE=.\ValueFactory_Map.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_12.cpp

+SOURCE=.\varbase.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Generator_Parser_Impl.cpp

+SOURCE=.\Wait_On_Leader_Follower.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Lite.cpp

+SOURCE=.\Wait_On_Reactor.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Locate_Header.cpp

+SOURCE=.\Wait_On_Read.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_State.cpp

+SOURCE=.\Wait_Strategy.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Message_Version.cpp

+SOURCE=.\WrongTransactionC.h

 # End Source File

-# Begin Source File

+# End Group

+# Begin Group "Inline Files"

 

-SOURCE=.\GIOP_Utils.cpp

-# End Source File

+# PROP Default_Filter "i"

 # Begin Source File

 

-SOURCE=.\GIOPC.cpp

+SOURCE=.\Acceptor_Filter.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IFR_Client_Adapter.cpp

+SOURCE=.\Acceptor_Registry.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IFR_TypeCodes.cpp

+SOURCE=.\Adapter.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Acceptor.cpp

+SOURCE=.\any.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Connection_Handler.cpp

+SOURCE=.\Asynch_Invocation.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Connector.cpp

+SOURCE=.\Asynch_Reply_Dispatcher.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Endpoint.cpp

+SOURCE=.\Base_Transport_Property.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\iiop_endpoints.cpp

+SOURCE=.\Bind_Dispatcher_Guard.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Factory.cpp

+SOURCE=.\BoundsC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Lite_Factory.cpp

+SOURCE=.\Buffering_Constraint_Policy.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.cpp

+SOURCE=.\Cache_Entries.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Transport.cpp

+SOURCE=.\cdr.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOPC.cpp

+SOURCE=.\ClientInterceptorAdapter.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Incoming_Message_Queue.cpp

+SOURCE=.\Connection_Handler.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Interceptor_List.cpp

+SOURCE=.\Connection_Purging_Strategy.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.cpp

+SOURCE=.\CONV_FRAMEC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation_Endpoint_Selectors.cpp

+SOURCE=.\CORBA_String.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.cpp

+SOURCE=.\corbafwd.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_Parser.cpp

+SOURCE=.\CORBALOC_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\IORInfo.cpp

+SOURCE=.\CORBANAME_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower.cpp

+SOURCE=.\CurrentC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower_Flushing_Strategy.cpp

+SOURCE=.\default_client.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event.cpp

+SOURCE=.\Default_Protocols_Hooks.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Binder.cpp

+SOURCE=.\default_resource.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Event_Loop_Thread_Helper.cpp

+SOURCE=.\default_server.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower.cpp

+SOURCE=.\Default_Thread_Lane_Resources_Manager.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Adder.cpp

+SOURCE=.\Default_Collocation_Resolver.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Follower_Auto_Ptr.cpp

+SOURCE=.\DLL_ORB.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy.cpp

+SOURCE=.\DLL_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LF_Strategy_Complete.cpp

+SOURCE=.\DomainC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LocalObject.cpp

+SOURCE=.\DynamicC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\LRU_Connection_Purging_Strategy.cpp

+SOURCE=.\Endpoint.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Types.cpp

+SOURCE=.\Environment.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Marshal.cpp

+SOURCE=.\Exception.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\MCAST_Parser.cpp

+SOURCE=.\Fault_Tolerance_Service.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_ORBInitializer.cpp

+SOURCE=.\FILE_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_Policy_i.cpp

+SOURCE=.\giop.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_PolicyFactory.cpp

+SOURCE=.\GIOP_Message_Base.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.cpp

+SOURCE=.\GIOP_Message_Generator_Parser.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\MProfile.cpp

+SOURCE=.\GIOP_Message_Generator_Parser_10.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Muxed_TMS.cpp

+SOURCE=.\GIOP_Message_Generator_Parser_11.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\NVList.cpp

+SOURCE=.\GIOP_Message_Generator_Parser_12.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object.cpp

+SOURCE=.\GIOP_Message_Generator_Parser_Impl.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_KeyC.cpp

+SOURCE=.\GIOP_Message_Lite.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.cpp

+SOURCE=.\GIOP_Message_Locate_Header.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Proxy_Broker.cpp

+SOURCE=.\GIOP_Message_State.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Proxy_Impl.cpp

+SOURCE=.\GIOP_Message_Version.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Ref_Table.cpp

+SOURCE=.\GIOP_Utils.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.cpp

+SOURCE=.\GIOPC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\OctetSeqC.cpp

+SOURCE=.\IIOP_Acceptor.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\operation_details.cpp

+SOURCE=.\IIOP_Connection_Handler.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB.cpp

+SOURCE=.\IIOP_Endpoint.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Core.cpp

+SOURCE=.\iiop_endpoints.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Table.cpp

+SOURCE=.\IIOP_Profile.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORBInitializer_Registry.cpp

+SOURCE=.\IIOP_Transport.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ORBInitInfo.cpp

+SOURCE=.\IIOPC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\params.cpp

+SOURCE=.\Interceptor_List.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Parser_Registry.cpp

+SOURCE=.\Invocation.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable.cpp

+SOURCE=.\Invocation_Endpoint_Selectors.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable_Messaging.cpp

+SOURCE=.\IOPC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pluggable_Messaging_Utils.cpp

+SOURCE=.\IOR_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\POA_Extension_Initializer.cpp

+SOURCE=.\Leader_Follower.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.cpp

+SOURCE=.\Linear_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Set.cpp

+SOURCE=.\LocalObject.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyC.cpp

+SOURCE=.\Managed_Types.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyFactory_Registry.cpp

+SOURCE=.\Marshal.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\PollableC.cpp

+SOURCE=.\MCAST_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableInterceptorC.cpp

+SOURCE=.\Messaging_Policy_i.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Principal.cpp

+SOURCE=.\MessagingC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Profile.cpp

+SOURCE=.\MProfile.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Protocol_Factory.cpp

+SOURCE=.\NVList.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Protocols_Hooks.cpp

+SOURCE=.\object.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Queued_Message.cpp

+SOURCE=.\Object_KeyC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactive_Flushing_Strategy.cpp

+SOURCE=.\Object_Loader.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Registry.cpp

+SOURCE=.\ObjectIDList.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Remote_Object_Proxy_Broker.cpp

+SOURCE=.\OctetSeqC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Remote_Object_Proxy_Impl.cpp

+SOURCE=.\operation_details.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reply_Dispatcher.cpp

+SOURCE=.\ORB.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\RequestInfo_Util.cpp

+SOURCE=.\orb_core.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Resource_Factory.cpp

+SOURCE=.\ORB_Table.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Resume_Handle.cpp

+SOURCE=.\ORBInitializer_Registry.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sequence.cpp

+SOURCE=.\params.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Server_Strategy_Factory.cpp

+SOURCE=.\Parser_Registry.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Callbacks.cpp

+SOURCE=.\Pluggable.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Context.cpp

+SOURCE=.\Pluggable_Messaging.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.cpp

+SOURCE=.\Pluggable_Messaging_Utils.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services_Activate.cpp

+SOURCE=.\Policy_Manager.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Single_Reactor.cpp

+SOURCE=.\Policy_Set.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\skip.cpp

+SOURCE=.\PolicyC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\StringSeqC.cpp

+SOURCE=.\PollableC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Stub.cpp

+SOURCE=.\PortableInterceptor.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Stub_Factory.cpp

+SOURCE=.\PortableInterceptorC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sync_Strategies.cpp

+SOURCE=.\Principal.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Synch_Queued_Message.cpp

+SOURCE=.\Profile.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Synch_Reply_Dispatcher.cpp

+SOURCE=.\Reply_Dispatcher.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.cpp

+SOURCE=.\sequence.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Profile.cpp

+SOURCE=.\Service_Callbacks.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Internal.cpp

+SOURCE=.\Service_Context.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Server_Request.cpp

+SOURCE=.\Services.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO_Singleton_Manager.cpp

+SOURCE=.\StringSeqC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAOC.cpp

+SOURCE=.\stub.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\target_specification.cpp

+SOURCE=.\Sync_Strategies.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.cpp

+SOURCE=.\Tagged_Components.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseS.cpp

+SOURCE=.\Tagged_Profile.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport.cpp

+SOURCE=.\TAO_Internal.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Cache_Manager.cpp

+SOURCE=.\TAO_Server_Request.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Descriptor_Interface.cpp

+SOURCE=.\TAO_Singleton_Manager.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Mux_Strategy.cpp

+SOURCE=.\TAOC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Transport_Timer.cpp

+SOURCE=.\target_specification.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Typecode.cpp

+SOURCE=.\Thread_Lane_Resources.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Typecode_Constants.cpp

+SOURCE=.\Thread_Lane_Resources_Manager.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.cpp

+SOURCE=.\Collocation_Resolver.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory.cpp

+SOURCE=.\TimeBaseC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory_Map.cpp

+SOURCE=.\Transport_Cache_Manager.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_On_Leader_Follower.cpp

+SOURCE=.\Transport_Descriptor_Interface.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_On_Reactor.cpp

+SOURCE=.\typecode.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_On_Read.cpp

+SOURCE=.\ValueBase.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Wait_Strategy.cpp

+SOURCE=.\ValueFactory.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\WrongTransactionC.cpp

+SOURCE=.\ValueFactory_Map.i

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index 454895089c5..7f64dc761c1 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -3,6 +3,7 @@
 #include "tao/Tagged_Profile.h"
 #include "tao/ORB_Core.h"
 #include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/Pluggable.h"
 #include "tao/debug.h"
 
@@ -12,27 +13,27 @@
 
 ACE_RCSID(tao, Tagged_Profile, "$Id$")
 
-CORBA::Boolean 
-TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile) 
+CORBA::Boolean
+TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
 {
   // Get our Acceptor registry
-  TAO_Acceptor_Registry  *acceptor_registry = 
-    this->orb_core_->acceptor_registry ();
-  
+  TAO_Acceptor_Registry &acceptor_registry =
+    this->orb_core_->lane_resources ().acceptor_registry ();
+
   // Get the right acceptor for the tag in the TaggedProfile
-  TAO_Acceptor *acceptor = 
-    acceptor_registry->get_acceptor (profile.tag);
-  
+  TAO_Acceptor *acceptor =
+    acceptor_registry.get_acceptor (profile.tag);
+
   if (acceptor)
     {
       // Get the object key
-      int retval = 
+      int retval =
         acceptor->object_key (profile,
                               this->object_key_);
       if (retval == -1)
         return 0;
     }
-  else 
+  else
     {
       if (TAO_debug_level > 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
new file mode 100644
index 00000000000..eaf5a081533
--- /dev/null
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -0,0 +1,191 @@
+// $Id$
+
+#include "tao/Thread_Lane_Resources.h"
+
+ACE_RCSID(tao, Thread_Lane_Resources, "$Id$")
+
+#include "tao/ORB_Core.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/Leader_Follower.h"
+#include "ace/Reactor.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Thread_Lane_Resources.i"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core,
+                                                      TAO_New_Leader_Generator *new_leader_generator)
+  : orb_core_ (orb_core),
+    acceptor_registry_ (0),
+    transport_cache_ (0),
+    leader_follower_ (0),
+    new_leader_generator_ (new_leader_generator)
+{
+  // Create the transport cache.
+  ACE_NEW (this->transport_cache_,
+           TAO_Transport_Cache_Manager (orb_core));
+
+}
+
+TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources (void)
+{
+}
+
+TAO_Transport_Cache_Manager &
+TAO_Thread_Lane_Resources::transport_cache (void)
+{
+  return *this->transport_cache_;
+}
+
+int
+TAO_Thread_Lane_Resources::has_acceptor_registry_been_created (void) const
+{
+  return this->acceptor_registry_ != 0;
+}
+
+int
+TAO_Thread_Lane_Resources::is_collocated (const TAO_MProfile& mprofile)
+{
+  if (!this->has_acceptor_registry_been_created ())
+    return 0;
+
+  return this->acceptor_registry ().is_collocated (mprofile);
+}
+
+TAO_Acceptor_Registry &
+TAO_Thread_Lane_Resources::acceptor_registry (void)
+{
+  // Double check.
+  if (this->acceptor_registry_ == 0)
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, *this->acceptor_registry_);
+      if (this->acceptor_registry_ == 0)
+        {
+          // Get the resource factory.
+          TAO_Resource_Factory &resource_factory =
+            *this->orb_core_.resource_factory ();
+
+          // Ask it to create a new acceptor registry.
+          this->acceptor_registry_ =
+            resource_factory.get_acceptor_registry ();
+        }
+    }
+
+  return *this->acceptor_registry_;
+}
+
+TAO_Leader_Follower &
+TAO_Thread_Lane_Resources::leader_follower (void)
+{
+  // Double check.
+  if (this->leader_follower_ == 0)
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, *this->leader_follower_);
+      if (this->leader_follower_ == 0)
+        {
+          // Create a new Leader Follower object.
+          ACE_NEW_RETURN (this->leader_follower_,
+                          TAO_Leader_Follower (&this->orb_core_,
+                                               this->new_leader_generator_),
+                          *this->leader_follower_);
+        }
+    }
+
+  return *this->leader_follower_;
+}
+
+int
+TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address,
+                                                   CORBA::Environment &ACE_TRY_ENV)
+{
+  /// Access the acceptor registry.
+  TAO_Acceptor_Registry &ar =
+    this->acceptor_registry ();
+
+  // Open it.
+  int result =
+    ar.open (&this->orb_core_,
+             this->leader_follower ().reactor (),
+             ignore_address,
+             ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  return result;
+}
+
+void
+TAO_Thread_Lane_Resources::finalize (void)
+{
+  // Ask the registry to close all registered acceptors.
+  if (this->acceptor_registry_ != 0)
+    {
+      this->acceptor_registry_->close_all ();
+      delete this->acceptor_registry_;
+    }
+
+  // Set of file descriptors corresponding to open connections.  This
+  // handle set is used to explicitly deregister the connection event
+  // handlers from the Reactor.  This is particularly important for
+  // dynamically loaded ORBs where an application level reactor, such
+  // as the Singleton reactor, is used instead of an ORB created one.
+  ACE_Handle_Set handle_set;
+  TAO_EventHandlerSet unregistered;
+
+  // Close the transport cache and return the handle set that needs
+  // to be de-registered from the reactor.
+  this->transport_cache_->close (handle_set, unregistered);
+
+  // Shutdown all open connections that are registered with the ORB
+  // Core.  Note that the ACE_Event_Handler::DONT_CALL mask is NOT
+  // used here since the reactor should invoke each handle's
+  // corresponding ACE_Event_Handler::handle_close() method to ensure
+  // that the connection is shutdown gracefully prior to destroying
+  // the ORB Core.
+  if (handle_set.num_set () > 0)
+    (void) this->leader_follower ().reactor ()->remove_handler (handle_set,
+                                                                ACE_Event_Handler::ALL_EVENTS_MASK);
+  if (!unregistered.is_empty ())
+    {
+      ACE_Event_Handler** eh;
+      for (TAO_EventHandlerSetIterator iter(unregistered);
+           iter.next (eh);
+           iter.advance())
+        {
+          (*eh)->handle_close (ACE_INVALID_HANDLE,
+                               ACE_Event_Handler::ALL_EVENTS_MASK);
+        }
+    }
+
+  delete this->transport_cache_;
+  delete this->leader_follower_;
+}
+
+void
+TAO_Thread_Lane_Resources::shutdown_reactor (void)
+{
+  TAO_Leader_Follower &leader_follower =
+    this->leader_follower ();
+
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             ace_mon,
+             leader_follower.lock ());
+
+  // Wakeup all the threads waiting blocked in the event loop, this
+  // does not guarantee that they will all go away, but reduces the
+  // load on the POA....
+  ACE_Reactor *reactor =
+    leader_follower.reactor ();
+
+  reactor->wakeup_all_threads ();
+
+  // If there are some client threads running we have to wait until
+  // they finish, when the last one does it will shutdown the reactor
+  // for us.  Meanwhile no new requests will be accepted because the
+  // POA will not process them.
+  if (!leader_follower.has_clients ())
+    {
+      // Wake up all waiting threads in the reactor.
+      reactor->end_reactor_event_loop ();
+    }
+}
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
new file mode 100644
index 00000000000..9635b8d0293
--- /dev/null
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -0,0 +1,103 @@
+//=============================================================================
+/**
+ *  @file    Thread_Lane_Resources.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_THREAD_LANE_RESOURCES_H
+#define TAO_THREAD_LANE_RESOURCES_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corbafwd.h"
+
+class TAO_ORB_Core;
+class TAO_Acceptor_Registry;
+class TAO_Transport_Cache_Manager;
+class TAO_Leader_Follower;
+class TAO_MProfile;
+class TAO_New_Leader_Generator;
+
+/**
+ * @class TAO_Thread_Lane_Resources
+ *
+ * @brief Class representing a thread lane's resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Thread_Lane_Resources
+{
+public:
+  /// Constructor.
+  TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core,
+                             TAO_New_Leader_Generator *new_leader_generator = 0);
+
+  /// Destructor.
+  ~TAO_Thread_Lane_Resources (void);
+
+  // Does <mprofile> belong to us?
+  int is_collocated (const TAO_MProfile &mprofile);
+
+  /// Open the acceptor registry.
+  int open_acceptor_registry (int ignore_address,
+                              CORBA::Environment &ACE_TRY_ENV);
+
+  /// Finalize resources.
+  void finalize (void);
+
+  /// Shutdown the reactor.
+  void shutdown_reactor (void);
+
+  /// @name Accessors
+  // @{
+
+  TAO_Acceptor_Registry &acceptor_registry (void);
+
+  TAO_Transport_Cache_Manager &transport_cache (void);
+
+  TAO_Leader_Follower &leader_follower (void);
+
+  // @}
+
+private:
+
+  /// Checks if the acceptor registry has been created.
+  int has_acceptor_registry_been_created (void) const;
+
+  /// ORB_Core related to this thread lane.
+  TAO_ORB_Core &orb_core_;
+
+  /// The registry which maintains a list of acceptor factories for
+  /// each loaded protocol.
+  TAO_Acceptor_Registry *acceptor_registry_;
+
+  /// Transport cache.
+  TAO_Transport_Cache_Manager *transport_cache_;
+
+  /// The leader/followers management class for this lane.
+  TAO_Leader_Follower *leader_follower_;
+
+  /// Synchronization.
+  TAO_SYNCH_MUTEX lock_;
+
+  /// Generator of new leader threads.
+  TAO_New_Leader_Generator *new_leader_generator_;
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Thread_Lane_Resources.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_THREAD_LANE_RESOURCES_H */
diff --git a/TAO/tao/Thread_Lane_Resources.i b/TAO/tao/Thread_Lane_Resources.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/Thread_Lane_Resources.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
new file mode 100644
index 00000000000..2aebbcfb090
--- /dev/null
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -0,0 +1,45 @@
+// $Id$
+
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "tao/Leader_Follower.h"
+#include "tao/LF_Strategy.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID(tao, Thread_Lane_Resources_Manager, "$Id$")
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Thread_Lane_Resources_Manager.i"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
+  : orb_core_ (&orb_core),
+    lf_strategy_ (0)
+{
+  this->lf_strategy_ =
+    this->orb_core_->resource_factory ()->create_lf_strategy ();
+}
+
+TAO_Thread_Lane_Resources_Manager::~TAO_Thread_Lane_Resources_Manager (void)
+{
+  delete this->lf_strategy_;
+}
+
+TAO_LF_Strategy &
+TAO_Thread_Lane_Resources_Manager::lf_strategy (void)
+{
+  return *this->lf_strategy_;
+}
+
+TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Factory (void)
+{
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<TAO_Thread_Lane_Resources_Manager_Factory>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<TAO_Thread_Lane_Resources_Manager_Factory>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
new file mode 100644
index 00000000000..d5fbde980b1
--- /dev/null
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -0,0 +1,105 @@
+//=============================================================================
+/**
+ *  @file    Thread_Lane_Resources_Manager.h
+ *
+ *  $Id$
+ *
+ *  @author  Irfan Pyarali
+ */
+// ===================================================================
+
+#ifndef TAO_THREAD_LANE_RESOURCES_MANAGER_H
+#define TAO_THREAD_LANE_RESOURCES_MANAGER_H
+
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corbafwd.h"
+#include "ace/Service_Object.h"
+
+class TAO_ORB_Core;
+class TAO_Thread_Lane_Resources;
+class TAO_LF_Strategy;
+class TAO_MProfile;
+
+/**
+ * @class TAO_Thread_Lane_Resources_Manager
+ *
+ * @brief This class is a manager for thread resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Thread_Lane_Resources_Manager
+{
+public:
+
+  /// Constructor.
+  TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
+
+  /// Destructor.
+  virtual ~TAO_Thread_Lane_Resources_Manager (void);
+
+  /// Finalize resources.
+  virtual void finalize (void) = 0;
+
+  /// Open default resources.
+  virtual int open_default_resources (CORBA_Environment &ACE_TRY_ENV) = 0;
+
+  /// Shutdown reactor.
+  virtual void shutdown_reactor (void) = 0;
+
+  // Does <mprofile> belong to us?
+  virtual int is_collocated (const TAO_MProfile& mprofile) = 0;
+
+  /// @name Accessors
+  // @{
+
+  virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0;
+
+  virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0;
+
+  TAO_LF_Strategy &lf_strategy (void);
+
+  // @}
+
+protected:
+  /// The ORB Core.
+  TAO_ORB_Core *orb_core_;
+
+  /// The leader follower strategy
+  TAO_LF_Strategy *lf_strategy_;
+};
+
+/**
+ * @class TAO_Thread_Lane_Resources_Manager_Factory
+ *
+ * @brief This class is a factory for managers of thread resources.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory
+  : public ACE_Service_Object
+{
+public:
+
+  /// Virtual destructor.
+  virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void);
+
+  /// Factory method.
+  virtual TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0;
+
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Thread_Lane_Resources_Manager.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.i b/TAO/tao/Thread_Lane_Resources_Manager.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/Thread_Lane_Resources_Manager.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 22caec17403..c9d46e8b993 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -16,6 +16,7 @@
 #include "Asynch_Queued_Message.h"
 #include "Flushing_Strategy.h"
 #include "Transport_Cache_Manager.h"
+#include "Thread_Lane_Resources.h"
 #include "debug.h"
 #include "Resume_Handle.h"
 
@@ -27,7 +28,6 @@
 
 ACE_RCSID(tao, Transport, "$Id$")
 
-
 TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount)
   : ACE_Refcountable (refcount)
   , refcount_lock_ (lock)
@@ -118,7 +118,7 @@ TAO_Transport::~TAO_Transport (void)
     // outside the TAO_Transport.
     if (this->cache_map_entry_ != 0)
       {
-        this->orb_core_->transport_cache ()->purge_entry (
+        this->orb_core_->lane_resources ().transport_cache ().purge_entry (
           this->cache_map_entry_);
       }
 }
@@ -602,12 +602,12 @@ int
 TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
 {
   // First purge our entry
-  this->orb_core_->transport_cache ()->purge_entry (
+  this->orb_core_->lane_resources ().transport_cache ().purge_entry (
     this->cache_map_entry_);
 
   // Then add ourselves to the cache
-  return this->orb_core_->transport_cache ()->cache_transport (desc,
-                                                               this);
+  return this->orb_core_->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                this);
 }
 
 void
@@ -615,8 +615,7 @@ TAO_Transport::purge_entry (void)
 {
   if (this->cache_map_entry_ != 0)
     {
-      (void) this->orb_core_->transport_cache ()->purge_entry (
-               this->cache_map_entry_);
+      (void) this->orb_core_->lane_resources ().transport_cache ().purge_entry (this->cache_map_entry_);
     }
 }
 
@@ -625,7 +624,7 @@ TAO_Transport::make_idle (void)
 {
   if (this->cache_map_entry_ != 0)
     {
-      return this->orb_core_->transport_cache ()->make_idle (
+      return this->orb_core_->lane_resources ().transport_cache ().make_idle (
                this->cache_map_entry_);
     }
   return -1;
@@ -639,7 +638,7 @@ TAO_Transport::close_connection (void)
   // Purge the entry
   if (this->cache_map_entry_ != 0)
     {
-      this->orb_core_->transport_cache ()->purge_entry (
+      this->orb_core_->lane_resources ().transport_cache ().purge_entry (
         this->cache_map_entry_);
     }
 }
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 8056d2f26b1..e6887fd19cf 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -18,17 +18,14 @@ ACE_RCSID (TAO,
            Transport_Cache_Manager,
            "$Id$")
 
-
-TAO_Transport_Cache_Manager::TAO_Transport_Cache_Manager (
-                                         TAO_Resource_Factory* rf)
-  : percent_ (rf->purge_percentage ()),
-    purging_strategy_ (rf->create_purging_strategy ()),
+TAO_Transport_Cache_Manager::TAO_Transport_Cache_Manager (TAO_ORB_Core &orb_core)
+  : percent_ (orb_core.resource_factory ()->purge_percentage ()),
+    purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ()),
     cache_map_ (),
-    cache_lock_ (0)
+    cache_lock_ (orb_core.resource_factory ()->create_cached_connection_lock ())
 {
 }
 
-
 TAO_Transport_Cache_Manager::~TAO_Transport_Cache_Manager (void)
 {
   // Delete the lock that we have
@@ -39,32 +36,6 @@ TAO_Transport_Cache_Manager::~TAO_Transport_Cache_Manager (void)
 }
 
 int
-TAO_Transport_Cache_Manager::open (TAO_ORB_Core *orb_core,
-                                    size_t size)
-{
-  if (this->purging_strategy_ == 0)
-    {
-      return -1;
-    }
-
-  // Create the cache_lock
-  this->cache_lock_ =
-    orb_core->resource_factory ()->create_cached_connection_lock ();
-
-  if (this->cache_lock_ == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ERROR TAO_Transport_Cache_Manager::open: "),
-                         ACE_TEXT ("Lock creation error\n")),
-                        -1);
-    }
-
-  // Now open the cache map
-  return this->cache_map_.open (size);
-}
-
-
-int
 TAO_Transport_Cache_Manager::bind_i (TAO_Cache_ExtId &ext_id,
                                      TAO_Cache_IntId &int_id)
 {
diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h
index 92a73ef2330..818bc643a42 100644
--- a/TAO/tao/Transport_Cache_Manager.h
+++ b/TAO/tao/Transport_Cache_Manager.h
@@ -82,7 +82,7 @@ public:
   // == Public methods
 
   /// Constructor
-  TAO_Transport_Cache_Manager (TAO_Resource_Factory* rf);
+  TAO_Transport_Cache_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor
   virtual ~TAO_Transport_Cache_Manager (void);
@@ -98,10 +98,6 @@ public:
   int find_transport (TAO_Transport_Descriptor_Interface *prop,
                       TAO_Transport *&transport);
 
-  /// Initialize a <HASH_MAP> with <size> elements.
-  int open (TAO_ORB_Core *orb_core,
-            size_t size = ACE_DEFAULT_MAP_SIZE);
-
   /// Remove entries from the cache depending upon the strategy.
   int purge (void);
 
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index d8862d89761..4f2a6ea7c5a 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -8,7 +8,6 @@
 
 #include "tao/Acceptor_Registry.h"
 #include "tao/Connector_Registry.h"
-#include "tao/Single_Reactor.h"
 
 #include "tao/Reactive_Flushing_Strategy.h"
 #include "tao/Block_Flushing_Strategy.h"
@@ -684,7 +683,7 @@ TAO_Default_Resource_Factory::get_protocol_factories (void)
   return &protocol_factories_;
 }
 
-TAO_Acceptor_Registry*
+TAO_Acceptor_Registry *
 TAO_Default_Resource_Factory::get_acceptor_registry (void)
 {
   TAO_Acceptor_Registry *ar = 0;
@@ -696,7 +695,7 @@ TAO_Default_Resource_Factory::get_acceptor_registry (void)
   return ar;
 }
 
-TAO_Connector_Registry*
+TAO_Connector_Registry *
 TAO_Default_Resource_Factory::get_connector_registry (void)
 {
   TAO_Connector_Registry *cr = 0;
@@ -708,17 +707,6 @@ TAO_Default_Resource_Factory::get_connector_registry (void)
   return cr;
 }
 
-TAO_Reactor_Registry *
-TAO_Default_Resource_Factory::get_reactor_registry (void)
-{
-  TAO_Reactor_Registry *reactor_registry = 0;
-
-  ACE_NEW_RETURN (reactor_registry,
-                  TAO_Single_Reactor,
-                  0);
-  return reactor_registry;
-}
-
 ACE_Reactor_Impl*
 TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
 {
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index b31086ebe96..e7097046bef 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -92,20 +92,12 @@ public:
     TAO_ALLOCATOR_THREAD_LOCK
   };
 
-  // = Reactor mappings strategy
-  enum
-  {
-    TAO_SINGLE_REACTOR,
-    TAO_REACTOR_PER_PRIORITY
-  };
-
   /// Modify and get the source for the CDR allocators
   int cdr_allocator_source (void);
 
   // = Resource Retrieval
   virtual int use_tss_resources (void) const;
   virtual int use_locked_data_blocks (void) const;
-  virtual TAO_Reactor_Registry *get_reactor_registry (void);
   virtual ACE_Reactor *get_reactor (void);
   virtual void reclaim_reactor (ACE_Reactor *);
   virtual TAO_Acceptor_Registry  *get_acceptor_registry (void);
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index a5491da6cec..a559eee4581 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -22,7 +22,9 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
     cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
     use_lite_protocol_ (0),
     use_dotted_decimal_addresses_ (0),
-    std_profile_components_ (1)
+    std_profile_components_ (1),
+    sched_policy_ (THR_SCHED_DEFAULT),
+    scope_policy_ (THR_SCOPE_PROCESS)
 {
   for (int i=0; i<= NO_OF_MCAST_SERVICES; i++)
     this->service_port_[i] = 0;
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 09a976de7ae..661bc64b482 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -133,6 +133,14 @@ public:
   int std_profile_components (void) const;
   void std_profile_components (int x);
 
+  /// Thread scheduling policy.
+  long sched_policy (void) const;
+  void sched_policy (long x);
+
+  /// Thread scope policy.
+  long scope_policy (void) const;
+  void scope_policy (long x);
+
 private:
   // Each "endpoint" is of the form:
   //
@@ -192,6 +200,12 @@ private:
 
   /// If true then the standard OMG components are not generated.
   int std_profile_components_;
+
+  /// Thread scheduling policy.
+  long sched_policy_;
+
+  /// Thread scope policy.
+  long scope_policy_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 450d9b93b47..86efd40b62c 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -165,3 +165,27 @@ TAO_ORB_Parameters::nodelay (int x)
 {
   this->nodelay_ = x;
 }
+
+ACE_INLINE long
+TAO_ORB_Parameters::sched_policy (void) const
+{
+  return this->sched_policy_;
+}
+
+ACE_INLINE void
+TAO_ORB_Parameters::sched_policy (long x)
+{
+  this->sched_policy_ = x;
+}
+
+ACE_INLINE long
+TAO_ORB_Parameters::scope_policy (void) const
+{
+  return this->scope_policy_;
+}
+
+ACE_INLINE void
+TAO_ORB_Parameters::scope_policy (long x)
+{
+  this->scope_policy_ = x;
+}